summaryrefslogtreecommitdiffstats
path: root/conf/machine/qemu-zynq7.conf
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2017-01-23 20:08:37 +1000
committerNathan Rossi <nathan@nathanrossi.com>2017-02-01 22:46:11 +1000
commitbd9de7e964ea4a0ed32eb6b7be5c044f1a7e9b20 (patch)
tree2ad4bdfab9e3293170e411fa59a59ef0caf537d7 /conf/machine/qemu-zynq7.conf
parentb869a52678a276ce577860b806c8cfd6a245931c (diff)
downloadmeta-xilinx-bd9de7e964ea4a0ed32eb6b7be5c044f1a7e9b20.tar.gz
conf/machine/*.conf: Move to QB_NETWORK_DEVICE for QEMU targets
Move the setup of network devices to the new QB_NETWORK_DEVICE variable, this avoids the need to configure slirp or tap options from the machine configuration. Additionally this provides the benefit of letting runqemu handle the setup of tap and slirp arguments, allowing for it to provide features such as host-guest port forwarding for slirp. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Tested-by: Alistair Francis <alistair.francis@xilinx.com>
Diffstat (limited to 'conf/machine/qemu-zynq7.conf')
-rw-r--r--conf/machine/qemu-zynq7.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/conf/machine/qemu-zynq7.conf b/conf/machine/qemu-zynq7.conf
index 02b9e621..e3cd575a 100644
--- a/conf/machine/qemu-zynq7.conf
+++ b/conf/machine/qemu-zynq7.conf
@@ -20,6 +20,5 @@ FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
20QB_MEM = "-m 1024" 20QB_MEM = "-m 1024"
21QB_MACHINE = "-machine xilinx-zynq-a9" 21QB_MACHINE = "-machine xilinx-zynq-a9"
22QB_OPT_APPEND = "-nographic -serial null -serial mon:stdio" 22QB_OPT_APPEND = "-nographic -serial null -serial mon:stdio"
23QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -net nic,netdev=net0,macaddr=@MAC@" 23QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
24QB_SLIRP_OPT = "-netdev user,id=net0 -net nic,netdev=net0"
25 24