diff options
-rw-r--r-- | meta/conf/machine/include/qemuboot-x86.inc | 1 | ||||
-rwxr-xr-x | scripts/runqemu | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 06ac983d4d..08702948e4 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc | |||
@@ -13,3 +13,4 @@ QB_AUDIO_OPT = "-soundhw ac97,es1370" | |||
13 | QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1" | 13 | QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1" |
14 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 14 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
15 | QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" | 15 | QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" |
16 | QB_SLIRP_OPT = "-net nic,model=e1000 -net user,hostfwd=tcp::2222-:22" | ||
diff --git a/scripts/runqemu b/scripts/runqemu index dbe17abfc5..6952f3210b 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -542,7 +542,8 @@ class BaseConfig(object): | |||
542 | def check_and_set(self): | 542 | def check_and_set(self): |
543 | """Check configs sanity and set when needed""" | 543 | """Check configs sanity and set when needed""" |
544 | self.validate_paths() | 544 | self.validate_paths() |
545 | check_tun() | 545 | if not self.slirp_enabled: |
546 | check_tun() | ||
546 | # Check audio | 547 | # Check audio |
547 | if self.audio_enabled: | 548 | if self.audio_enabled: |
548 | if not self.get('QB_AUDIO_DRV'): | 549 | if not self.get('QB_AUDIO_DRV'): |