From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 20 Oct 2017 13:12:49 +0000 (+0200)
Subject: qemu: domain: Remove pointless alias check
X-Git-Tag: v3.10.0-rc1~244
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beb1661f3d661fac295f315eb1c84a316351703e;p=thirdparty%2Flibvirt.git

qemu: domain: Remove pointless alias check

When attaching the disks, aliases are always generated.
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index adc8ebbd19..d355999e94 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7868,7 +7868,6 @@ qemuDomainPrepareChardevSource(virDomainDefPtr def,
 
 /* qemuProcessPrepareDiskSourceTLS:
  * @source: pointer to host interface data for disk device
- * @diskAlias: alias use for the disk device
  * @cfg: driver configuration
  *
  * Updates host interface TLS encryption setting based on qemu.conf
@@ -7879,7 +7878,6 @@ qemuDomainPrepareChardevSource(virDomainDefPtr def,
  */
 int
 qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr src,
-                               const char *diskAlias,
                                virQEMUDriverConfigPtr cfg)
 {
 
@@ -7898,12 +7896,6 @@ qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr src,
         }
 
         if (src->haveTLS == VIR_TRISTATE_BOOL_YES) {
-            if (!diskAlias) {
-                virReportError(VIR_ERR_INVALID_ARG, "%s",
-                               _("disk does not have an alias"));
-                return -1;
-            }
-
             /* Grab the vxhsTLSx509certdir and set the verify/listen values.
              * NB: tlsAlias filled in during qemuDomainGetTLSObjects. */
             if (VIR_STRDUP(src->tlsCertdir, cfg->vxhsTLSx509certdir) < 0)
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 5c4c6a0a0a..8d863e8949 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -887,9 +887,8 @@ void qemuDomainPrepareChardevSource(virDomainDefPtr def,
 
 int
 qemuDomainPrepareDiskSourceTLS(virStorageSourcePtr src,
-                               const char *diskAlias,
                                virQEMUDriverConfigPtr cfg)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
 int qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem)
     ATTRIBUTE_NONNULL(1);
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 91f7f9ed62..e4157f631d 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -394,7 +394,7 @@ qemuDomainAttachDiskGeneric(virConnectPtr conn,
     if (encinfo && qemuBuildSecretInfoProps(encinfo, &encobjProps) < 0)
         goto error;
 
-    if (qemuDomainPrepareDiskSourceTLS(disk->src, disk->info.alias, cfg) < 0)
+    if (qemuDomainPrepareDiskSourceTLS(disk->src, cfg) < 0)
         goto error;
 
     if (disk->src->haveTLS &&
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index fdc868912c..7df440ee43 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5306,7 +5306,7 @@ qemuProcessPrepareDomainStorage(virConnectPtr conn,
             continue;
         }
 
-        if (qemuDomainPrepareDiskSourceTLS(disk->src, disk->info.alias, cfg) < 0)
+        if (qemuDomainPrepareDiskSourceTLS(disk->src, cfg) < 0)
             return -1;
     }