qemu: command: Make vhost-scsi device string depend on address

The vhost-scsi device string should depend on the requested
address type, not strictly on the emulated arch. This is the
same logic used by qemuBuildVirtioDevStr, and this particular
path is already tested in the hostdev-scsi-vhost-scsi-ccw tests

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index bbc85e75f06dc54e6c4de97f7c8f2362bcd31863..a1d991cefc0ceaf990cad1bbf14182f50f8feb43 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4925,7 +4925,7 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *def,
         goto cleanup;
     }
 
-    if (ARCH_IS_S390(def->os.arch))
+    if (dev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)
         virBufferAddLit(&buf, "vhost-scsi-ccw");
     else
         virBufferAddLit(&buf, "vhost-scsi-pci");