[libvirt] [PATCH v2 05/25] qemu: command: Make vhost-scsi device string depend on address

[Cole Robinson]

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

Signed-off-by: Cole Robinson <crobinso at redhat.com>
---
 src/qemu/qemu_command.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index bbc85e75f0..a1d991cefc 100644
--- 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");
-- 
2.20.1