From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 22 Jan 2019 19:20:06 +0000 (-0500)
Subject: qemu: command: Make vhost-scsi device string depend on address
X-Git-Tag: v5.1.0-rc1~379
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ac9889a696cac33c945243cb78e263c4f91f1e7;p=thirdparty%2Flibvirt.git

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 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");