summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2016-09-27 01:33:57 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-28 10:16:03 +0100
commitde4fffe5581301ed5b3f6611f3a0c749b0945c0e (patch)
treef2a5f9b35228401afd64b3857c97b88c83a59b12 /meta/conf/machine/include
parent72dc833d992f8bb6480d43be3efa13f0e575a014 (diff)
downloadpoky-de4fffe5581301ed5b3f6611f3a0c749b0945c0e.tar.gz
machine/qemu*: Add comment regarding the reason for virtio-rng-pci
Bring across the comment that was in runqemu regarding why the virtio-rng-pci device was needed. This comment is added to each location where the virtio-rng-pci device is added. (From OE-Core rev: bc5d1fdea674e842e4b0c45b38782930ec133051) Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include')
-rw-r--r--meta/conf/machine/include/qemuboot-mips.inc1
-rw-r--r--meta/conf/machine/include/qemuboot-x86.inc1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc
index 01f8f8bb3b..0c60cf297f 100644
--- a/meta/conf/machine/include/qemuboot-mips.inc
+++ b/meta/conf/machine/include/qemuboot-mips.inc
@@ -3,5 +3,6 @@ IMAGE_CLASSES += "qemuboot"
3QB_MEM = "-m 256" 3QB_MEM = "-m 256"
4QB_MACHINE = "-machine malta" 4QB_MACHINE = "-machine malta"
5QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" 5QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty"
6# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
6QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" 7QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -usbdevice tablet -device virtio-rng-pci"
7QB_SYSTEM_NAME = "qemu-system-${TUNE_ARCH}" 8QB_SYSTEM_NAME = "qemu-system-${TUNE_ARCH}"
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc
index 20e90716db..06ac983d4d 100644
--- a/meta/conf/machine/include/qemuboot-x86.inc
+++ b/meta/conf/machine/include/qemuboot-x86.inc
@@ -11,4 +11,5 @@ QB_CPU_KVM_x86-64 = "-cpu kvm64"
11QB_AUDIO_DRV = "alsa" 11QB_AUDIO_DRV = "alsa"
12QB_AUDIO_OPT = "-soundhw ac97,es1370" 12QB_AUDIO_OPT = "-soundhw ac97,es1370"
13QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1" 13QB_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
14QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" 15QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci"