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 <[email protected]> --- conf/machine/ep108-zynqmp.conf | 3 +-- conf/machine/ml605-qemu-microblazeel.conf | 3 +-- conf/machine/qemu-zynq7.conf | 3 +-- conf/machine/s3adsp1800-qemu-microblazeeb.conf | 3 +-- conf/machine/zcu102-zynqmp.conf | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/conf/machine/ep108-zynqmp.conf b/conf/machine/ep108-zynqmp.conf index 3b08248e02..a15ef669a7 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 38364a839d..a0ef7d3e16 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 02b9e62106..e3cd575ae2 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 d76ed17f57..2577faabc0 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 3dd2cb3bc4..10b8575425 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 " -- 2.11.0 -- _______________________________________________ meta-xilinx mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-xilinx
