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>

5 files changed, 5 insertions, 10 deletions

diff --git a/conf/machine/ep108-zynqmp.conf b/conf/machine/ep108-zynqmp.conf
index 3b08248e..a15ef669 100644
--- a/conf/machine/ep108-zynqmp.conf
+++ b/conf/machine/ep108-zynqmp.conf
@@ -23,6 +23,5 @@ EXTRA_IMAGEDEPENDS += "arm-trusted-firmware"
 QB_MACHINE = "-machine xlnx-ep108"
 QB_MEM = "-m 2048"
 QB_OPT_APPEND = "-nographic -serial mon:stdio -serial null"
-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"
+QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
 
diff --git a/conf/machine/ml605-qemu-microblazeel.conf b/conf/machine/ml605-qemu-microblazeel.conf
index 38364a83..a0ef7d3e 100644
--- a/conf/machine/ml605-qemu-microblazeel.conf
+++ b/conf/machine/ml605-qemu-microblazeel.conf
@@ -20,6 +20,5 @@ FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
 QB_MEM = "-m 256"
 QB_MACHINE = "-machine petalogix-ml605"
 QB_OPT_APPEND = "-nographic -serial mon:stdio"
-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"
+QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
 
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"
 QB_MEM = "-m 1024"
 QB_MACHINE = "-machine xilinx-zynq-a9"
 QB_OPT_APPEND = "-nographic -serial null -serial mon:stdio"
-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"
+QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
 
diff --git a/conf/machine/s3adsp1800-qemu-microblazeeb.conf b/conf/machine/s3adsp1800-qemu-microblazeeb.conf
index d76ed17f..2577faab 100644
--- a/conf/machine/s3adsp1800-qemu-microblazeeb.conf
+++ b/conf/machine/s3adsp1800-qemu-microblazeeb.conf
@@ -19,6 +19,5 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS_remove = "device-tree"
 QB_MEM = "-m 256"
 QB_MACHINE = "-machine petalogix-s3adsp1800"
 QB_OPT_APPEND = "-nographic -serial mon:stdio"
-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"
+QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
 
diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf
index 3dd2cb3b..10b85754 100644
--- a/conf/machine/zcu102-zynqmp.conf
+++ b/conf/machine/zcu102-zynqmp.conf
@@ -27,8 +27,7 @@ EXTRA_IMAGEDEPENDS += "\
 QB_MACHINE = "-machine xlnx-zcu102"
 QB_MEM = "-m 2048"
 QB_OPT_APPEND = "-nographic -serial mon:stdio -serial null"
-QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
-QB_SLIRP_OPT = "-netdev user,id=net0 -net nic -net nic -net nic -net nic,netdev=net0"
+QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
 
 # Xilinx QEMU options
 QB_OPT_APPEND_append_qemuboot-xilinx = " -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/zcu102-arm.dtb "