diff options
| author | Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com> | 2017-02-20 12:39:00 +0200 |
|---|---|---|
| committer | California Sullivan <california.l.sullivan@intel.com> | 2017-02-28 16:05:01 -0800 |
| commit | 80ce6eb1d3eecd6c767df99edc35241a7e719190 (patch) | |
| tree | 680954e1e09466a9772fb3a4bb4c0b0374d35be7 /conf/machine/include | |
| parent | 5153dad2fa695bbb579c03ff795ef649269e8420 (diff) | |
| download | meta-intel-80ce6eb1d3eecd6c767df99edc35241a7e719190.tar.gz | |
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 <dmitry.rozhkov@linux.intel.com>
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/qemuboot-intel.inc | 1 |
1 files changed, 0 insertions, 1 deletions
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" | |||
| 17 | QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1" | 17 | QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1" |
| 18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
| 19 | QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" | 19 | QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" |
| 20 | QB_SLIRP_OPT = "-net nic,model=e1000 -net user,hostfwd=tcp::2222-:22" | ||