From: Cole Robinson <crobinso@redhat.com>
Date: Sun, 15 May 2016 20:33:27 +0000 (-0400)
Subject: qemu: command: Ignore QEMU_CAPS_DEVICE when building drive alias
X-Git-Tag: v1.3.5-rc1~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7d6c13989932d32257b78b9062f1a39dcc83385;p=thirdparty%2Flibvirt.git

qemu: command: Ignore QEMU_CAPS_DEVICE when building drive alias

QEMU_CAPS_DEVICE is always set nowadays, so we can drop the
non-DEVICE code paths
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 7e17521f39..61c446e2b4 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -377,17 +377,13 @@ qemuBuildObjectCommandlineFromJSON(const char *type,
 }
 
 
-char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
-                               virQEMUCapsPtr qemuCaps)
+char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk)
 {
     char *ret;
 
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
-        ignore_value(virAsprintf(&ret, "%s%s", QEMU_DRIVE_HOST_PREFIX,
-                                 disk->info.alias));
-    } else {
-        ignore_value(VIR_STRDUP(ret, disk->info.alias));
-    }
+    if (virAsprintf(&ret, "%s%s",
+                    QEMU_DRIVE_HOST_PREFIX, disk->info.alias) < 0)
+        return NULL;
     return ret;
 }
 
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index d5ad1b2b93..c777701458 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -96,8 +96,7 @@ char *qemuBuildNicDevStr(virDomainDefPtr def,
                          size_t vhostfdSize,
                          virQEMUCapsPtr qemuCaps);
 
-char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
-                               virQEMUCapsPtr qemuCaps);
+char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk);
 
 /* Both legacy & current support */
 char *qemuBuildDriveStr(virDomainDiskDefPtr disk,
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index f40b34d9c7..f8ab0953e9 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -192,7 +192,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
     if (qemuDomainPrepareDisk(driver, vm, disk, newsrc, false) < 0)
         goto cleanup;
 
-    if (!(driveAlias = qemuDeviceDriveHostAlias(disk, priv->qemuCaps)))
+    if (!(driveAlias = qemuDeviceDriveHostAlias(disk)))
         goto error;
 
     do {
@@ -376,7 +376,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn,
     if (!(drivestr = qemuBuildDriveStr(disk, false, priv->qemuCaps)))
         goto error;
 
-    if (!(drivealias = qemuDeviceDriveHostAlias(disk, priv->qemuCaps)))
+    if (!(drivealias = qemuDeviceDriveHostAlias(disk)))
         goto error;
 
     if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps)))