diff options
Diffstat (limited to 'meta/conf/machine')
-rw-r--r-- | meta/conf/machine/include/qemuboot-mips.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/qemuboot-x86.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 1 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index 1c2b532b48..978820a2e0 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc | |||
@@ -2,6 +2,6 @@ | |||
2 | IMAGE_CLASSES += "qemuboot" | 2 | IMAGE_CLASSES += "qemuboot" |
3 | QB_MACHINE = "-machine malta" | 3 | QB_MACHINE = "-machine malta" |
4 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" | 4 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" |
5 | QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet" | 5 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" |
6 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 6 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
7 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 7 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 3931b0f0fb..495418fa04 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc | |||
@@ -9,7 +9,7 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" | |||
9 | QB_AUDIO_DRV = "alsa" | 9 | QB_AUDIO_DRV = "alsa" |
10 | QB_AUDIO_OPT = "-soundhw ac97,es1370" | 10 | QB_AUDIO_OPT = "-soundhw ac97,es1370" |
11 | QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" | 11 | QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" |
12 | QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet" | 12 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" |
13 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 13 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
14 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 14 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
15 | 15 | ||
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index e7979997f2..648cf2fe8f 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf | |||
@@ -27,6 +27,7 @@ XSERVER = "xserver-xorg \ | |||
27 | xf86-video-fbdev \ | 27 | xf86-video-fbdev \ |
28 | xf86-video-vmware \ | 28 | xf86-video-vmware \ |
29 | xf86-video-modesetting \ | 29 | xf86-video-modesetting \ |
30 | xf86-video-vesa \ | ||
30 | xserver-xorg-module-libint10 \ | 31 | xserver-xorg-module-libint10 \ |
31 | " | 32 | " |
32 | 33 | ||
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 3832302f07..8e0da82076 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf | |||
@@ -24,6 +24,7 @@ XSERVER = "xserver-xorg \ | |||
24 | xf86-video-fbdev \ | 24 | xf86-video-fbdev \ |
25 | xf86-video-vmware \ | 25 | xf86-video-vmware \ |
26 | xf86-video-modesetting \ | 26 | xf86-video-modesetting \ |
27 | xf86-video-vesa \ | ||
27 | xserver-xorg-module-libint10 \ | 28 | xserver-xorg-module-libint10 \ |
28 | " | 29 | " |
29 | 30 | ||