diff options
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runqemu.py | 2 | ||||
-rwxr-xr-x | 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" | |||
62 | cmd = "%s %s iso" % (self.cmd_common, self.machine) | 62 | cmd = "%s %s iso" % (self.cmd_common, self.machine) |
63 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: | 63 | with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: |
64 | with open(qemu.qemurunnerlog) as f: | 64 | with open(qemu.qemurunnerlog) as f: |
65 | self.assertTrue(' -cdrom ' in f.read(), "Failed: %s" % cmd) | 65 | self.assertTrue('media=cdrom' in f.read(), "Failed: %s" % cmd) |
66 | 66 | ||
67 | @OETestID(2004) | 67 | @OETestID(2004) |
68 | def test_boot_recipe_image(self): | 68 | 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): | |||
1005 | vm_drive = '' | 1005 | vm_drive = '' |
1006 | if self.fstype in self.vmtypes: | 1006 | if self.fstype in self.vmtypes: |
1007 | if self.fstype == 'iso': | 1007 | if self.fstype == 'iso': |
1008 | vm_drive = '-cdrom %s' % self.rootfs | 1008 | vm_drive = '-drive file=%s,if=virtio,media=cdrom' % self.rootfs |
1009 | elif self.get('QB_DRIVE_TYPE'): | 1009 | elif self.get('QB_DRIVE_TYPE'): |
1010 | drive_type = self.get('QB_DRIVE_TYPE') | 1010 | drive_type = self.get('QB_DRIVE_TYPE') |
1011 | if drive_type.startswith("/dev/sd"): | 1011 | if drive_type.startswith("/dev/sd"): |