From 80ce6eb1d3eecd6c767df99edc35241a7e719190 Mon Sep 17 00:00:00 2001 From: Dmitry Rozhkov Date: Mon, 20 Feb 2017 12:39:00 +0200 Subject: meta-intel: Don't override default qemu slirp options The latest OE's runqemu script by default uses the following SLIRP options -netdev user,id=net0,hostfwd=tcp::2222-:22,hostfwd=tcp::2323-:23 which are suitable for meta-intel too. And what is more important they don't follow the deprecated syntax currently present in the option values overriden by meta-intel. The patch drops the meta-intel specific overrides. Signed-off-by: Dmitry Rozhkov Signed-off-by: California Sullivan --- conf/machine/include/qemuboot-intel.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/include/qemuboot-intel.inc b/conf/machine/include/qemuboot-intel.inc index 82a72aca..cb52330b 100644 --- a/conf/machine/include/qemuboot-intel.inc +++ b/conf/machine/include/qemuboot-intel.inc @@ -17,4 +17,3 @@ QB_AUDIO_OPT = "-soundhw ac97,es1370" QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" -QB_SLIRP_OPT = "-net nic,model=e1000 -net user,hostfwd=tcp::2222-:22" -- cgit v1.2.3-54-g00ecf