[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7356/8267] runqemu: Use virtio to mount cdrom drives

[Emmanuele Bassi <ebassi src gnome org>]

commit ca940601b889fde1f3ad37c13540383c3516bb96
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Tue Aug 22 22:58:02 2017 +0100

    runqemu: Use virtio to mount cdrom drives
    
    The IDE driver in the kernel is fragile and in 4.12 is causing backtraces.
    To unblock 4.12 kernel merging use the virtio CD driver instead to mount
    iso images which should be faster and more stable.
    
    (From OE-Core rev: f59e729f98ef9b506b0cfdc415567e03ec87f2a9)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/selftest/cases/runqemu.py |    2 +-
 scripts/runqemu                         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py
index 8805a38..1991be7 100644
--- a/meta/lib/oeqa/selftest/cases/runqemu.py
+++ b/meta/lib/oeqa/selftest/cases/runqemu.py
@@ -62,7 +62,7 @@ SYSLINUX_TIMEOUT = "10"
         cmd = "%s %s iso" % (self.cmd_common, self.machine)
         with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu:
             with open(qemu.qemurunnerlog) as f:
-                self.assertTrue(' -cdrom ' in f.read(), "Failed: %s" % cmd)
+                self.assertTrue('media=cdrom' in f.read(), "Failed: %s" % cmd)
 
     @OETestID(2004)
     def test_boot_recipe_image(self):
diff --git a/scripts/runqemu b/scripts/runqemu
index fd2717e..1131324 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1005,7 +1005,7 @@ class BaseConfig(object):
             vm_drive = ''
             if self.fstype in self.vmtypes:
                 if self.fstype == 'iso':
-                    vm_drive = '-cdrom %s' % self.rootfs
+                    vm_drive = '-drive file=%s,if=virtio,media=cdrom' % self.rootfs
                 elif self.get('QB_DRIVE_TYPE'):
                     drive_type = self.get('QB_DRIVE_TYPE')
                     if drive_type.startswith("/dev/sd"):