runqemu: support virtio drive type

Setting QB_DRIVE_TYPE=/dev/vd selects virtio without triggering any
warnings. Previously, that was only possible by setting an unknown
value and relying on the fallback to virtio, which caused some
warnings to be printed.

(From OE-Core rev: 5cbf102662dde6f706a19fa133cfd1e7475eb8c1)

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Patrick Ohly 2017-04-13 22:32:51 +02:00 committed by Richard Purdie
parent ba9e1066b0
commit 1fb309447f
1 changed files with 8 additions and 5 deletions

View File

@ -992,12 +992,15 @@ class BaseConfig(object):
logger.info('Using ide drive')
vm_drive = "%s,format=%s" % (self.rootfs, rootfs_format)
else:
logger.warn("Unknown QB_DRIVE_TYPE: %s" % drive_type)
# virtio might have been selected explicitly (just use it), or
# is used as fallback (then warn about that).
if not drive_type.startswith("/dev/vd"):
logger.warn("Unknown QB_DRIVE_TYPE: %s" % drive_type)
logger.warn("Failed to figure out drive type, consider define or fix QB_DRIVE_TYPE")
logger.warn('Trying to use virtio block drive')
vm_drive = '-drive if=virtio,file=%s,format=%s' % (self.rootfs, rootfs_format)
if not vm_drive:
logger.warn("Failed to figure out drive type, consider define or fix QB_DRIVE_TYPE")
logger.warn('Trying to use virtio block drive')
vm_drive = '-drive if=virtio,file=%s,format=%s' % (self.rootfs, rootfs_format)
# All branches above set vm_drive.
self.rootfs_options = '%s -no-reboot' % vm_drive
self.kernel_cmdline = 'root=%s rw highres=off' % (self.get('QB_KERNEL_ROOT'))