[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5740/8267] runqemu: support virtio drive type

[Emmanuele Bassi <ebassi src gnome org>]

commit 1fb309447fa8e66f88a6dfe4e65807d23dd18342
Author: Patrick Ohly <patrick ohly intel com>
Date:   Thu Apr 13 22:32:51 2017 +0200

    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>

 scripts/runqemu |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/scripts/runqemu b/scripts/runqemu
index 605bcf2..f0ddeea 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -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)
-
-                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)
+                        # 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)
+
+                # 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'))