diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2016-09-27 01:33:57 +1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-28 10:16:03 +0100 |
commit | de4fffe5581301ed5b3f6611f3a0c749b0945c0e (patch) | |
tree | f2a5f9b35228401afd64b3857c97b88c83a59b12 /meta | |
parent | 72dc833d992f8bb6480d43be3efa13f0e575a014 (diff) | |
download | poky-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')
-rw-r--r-- | meta/conf/machine/include/qemuboot-mips.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/qemuboot-x86.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm.conf | 1 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm64.conf | 1 | ||||
-rw-r--r-- | meta/conf/machine/qemuppc.conf | 1 |
5 files changed, 5 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" | |||
3 | QB_MEM = "-m 256" | 3 | QB_MEM = "-m 256" |
4 | QB_MACHINE = "-machine malta" | 4 | QB_MACHINE = "-machine malta" |
5 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" | 5 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" |
6 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | ||
6 | QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" | 7 | QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" |
7 | QB_SYSTEM_NAME = "qemu-system-${TUNE_ARCH}" | 8 | QB_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" | |||
11 | QB_AUDIO_DRV = "alsa" | 11 | QB_AUDIO_DRV = "alsa" |
12 | QB_AUDIO_OPT = "-soundhw ac97,es1370" | 12 | 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 | 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" |
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index ff1ab7d48f..17402ef3b3 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf | |||
@@ -14,6 +14,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0 115200;ttyAMA1" | |||
14 | QB_SYSTEM_NAME = "qemu-system-arm" | 14 | QB_SYSTEM_NAME = "qemu-system-arm" |
15 | QB_MACHINE = "-machine versatilepb" | 15 | QB_MACHINE = "-machine versatilepb" |
16 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" | 16 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" |
17 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | ||
17 | QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci" | 18 | QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci" |
18 | PREFERRED_VERSION_linux-yocto ??= "4.8%" | 19 | PREFERRED_VERSION_linux-yocto ??= "4.8%" |
19 | QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" | 20 | QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index a0920fe0e4..d0750624a8 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf | |||
@@ -15,6 +15,7 @@ QB_MEM = "-m 512" | |||
15 | QB_MACHINE = "-machine virt" | 15 | QB_MACHINE = "-machine virt" |
16 | QB_CPU = "-cpu cortex-a57" | 16 | QB_CPU = "-cpu cortex-a57" |
17 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,38400" | 17 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,38400" |
18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | ||
18 | QB_OPT_APPEND = "-show-cursor -device virtio-rng-pci" | 19 | QB_OPT_APPEND = "-show-cursor -device virtio-rng-pci" |
19 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -device virtio-net-device,netdev=net0,mac=@MAC@" | 20 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -device virtio-net-device,netdev=net0,mac=@MAC@" |
20 | QB_SLIRP_OPT = "-netdev user,id=net0 -device virtio-net-device,netdev=net0" | 21 | QB_SLIRP_OPT = "-netdev user,id=net0 -device virtio-net-device,netdev=net0" |
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf index 3ae33088ea..8703c2086a 100644 --- a/meta/conf/machine/qemuppc.conf +++ b/meta/conf/machine/qemuppc.conf | |||
@@ -16,5 +16,6 @@ QB_SYSTEM_NAME = "qemu-system-ppc" | |||
16 | QB_MACHINE = "-machine mac99" | 16 | QB_MACHINE = "-machine mac99" |
17 | QB_CPU = "-cpu G4" | 17 | QB_CPU = "-cpu G4" |
18 | QB_KERNEL_CMDLINE_APPEND = "console=tty console=ttyS0" | 18 | QB_KERNEL_CMDLINE_APPEND = "console=tty console=ttyS0" |
19 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | ||
19 | QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci" | 20 | QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci" |
20 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -device virtio-net-pci,netdev=net0,mac=@MAC@" | 21 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -device virtio-net-pci,netdev=net0,mac=@MAC@" |