From f59e729f98ef9b506b0cfdc415567e03ec87f2a9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 22 Aug 2017 22:58:02 +0100 Subject: [PATCH] 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. Signed-off-by: Richard Purdie --- 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 8805a3837e..1991be7d0c 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 fd2717ec87..1131324ccc 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"): -- 2.40.1