diff options
| author | Laurent Vivier <laurent@vivier.eu> | 2021-03-23 16:53:04 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2021-03-24 14:25:48 +0000 |
| commit | 9db1d3a2be9bfeb5ef3459a636e7545bf8f9b81b (patch) | |
| tree | 23f440c3b548132c33c09b456dd69dbeae5402f1 | |
| parent | 4c5806a56b9dc2683d518e477d0a648ab7469722 (diff) | |
| download | focaccia-qemu-9db1d3a2be9bfeb5ef3459a636e7545bf8f9b81b.tar.gz focaccia-qemu-9db1d3a2be9bfeb5ef3459a636e7545bf8f9b81b.zip | |
blockdev: with -drive if=virtio, use generic virtio-blk
Rather than checking if the machine is an s390x to use virtio-blk-ccw instead of virtio-blk-pci, use the alias virtio-blk that is set to the expected target. This also enables the use of virtio-blk-device for targets without PCI or CCW. Signed-off-by: Laurent Vivier <laurent@vivier.eu> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20210319202335.2397060-4-laurent@vivier.eu> Message-Id: <20210323165308.15244-19-alex.bennee@linaro.org>
Diffstat (limited to '')
| -rw-r--r-- | blockdev.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/blockdev.c b/blockdev.c index 621cc3b7c4..a57590aae4 100644 --- a/blockdev.c +++ b/blockdev.c @@ -962,11 +962,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type, QemuOpts *devopts; devopts = qemu_opts_create(qemu_find_opts("device"), NULL, 0, &error_abort); - if (arch_type == QEMU_ARCH_S390X) { - qemu_opt_set(devopts, "driver", "virtio-blk-ccw", &error_abort); - } else { - qemu_opt_set(devopts, "driver", "virtio-blk-pci", &error_abort); - } + qemu_opt_set(devopts, "driver", "virtio-blk", &error_abort); qemu_opt_set(devopts, "drive", qdict_get_str(bs_opts, "id"), &error_abort); } |