qemuzynq, qemumicroblaze: Improve runqemu support

 * Handle slirp/tap networking separately.
 * Force the use of serial port and always disable graphics since the
   qemuzynq and qemumicroblaze targets do not support any graphics

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>

2 files changed, 10 insertions, 4 deletions

diff --git a/conf/machine/qemumicroblaze.conf b/conf/machine/qemumicroblaze.conf
index d3708dd1..067b6d0c 100644
--- a/conf/machine/qemumicroblaze.conf
+++ b/conf/machine/qemumicroblaze.conf
@@ -20,7 +20,11 @@ FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
 # For runqemu
 IMAGE_CLASSES += "qemuboot"
 QB_SYSTEM_NAME = "qemu-system-microblazeel"
+QB_MEM = "-m 256"
 QB_MACHINE = "-machine petalogix-ml605"
+QB_OPT_APPEND = "-nographic -serial mon:stdio"
 QB_DEFAULT_FSTYPE = "cpio"
-QB_KERNEL_CMDLINE_APPEND = "console=ttyPS0 earlyprintk"
-QB_MEM = "-m 256"
+QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 earlyprintk"
+QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -net nic,netdev=net0,macaddr=@MAC@"
+QB_SLIRP_OPT = "-netdev user,id=net0 -net nic,netdev=net0"
+
diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf
index 894fee81..e9767d98 100644
--- a/conf/machine/qemuzynq.conf
+++ b/conf/machine/qemuzynq.conf
@@ -23,7 +23,9 @@ QB_SYSTEM_NAME = "qemu-system-arm"
 QB_MEM = "-m 1024"
 QB_MACHINE = "-machine xilinx-zynq-a9"
 QB_DTB = "${MACHINE}.dtb"
-QB_SERIAL_OPT = "-serial null -serial mon:stdio"
-QB_OPT_APPEND = "-net nic -net nic -usb -usbdevice tablet"
+QB_OPT_APPEND = "-nographic -serial null -serial mon:stdio"
 QB_DEFAULT_FSTYPE = "cpio"
 QB_KERNEL_CMDLINE_APPEND = "console=ttyPS0"
+QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -net nic,netdev=net0,macaddr=@MAC@"
+QB_SLIRP_OPT = "-netdev user,id=net0 -net nic,netdev=net0"
+