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 adc8ebbd1964ed07e0a91fd7fd2ee86143457d86..d355999e942f9ca37de5f77fe9acaf5f56d159a8 100644 (file)
--- 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 5c4c6a0a0a8e2377b2c6aad4ba19b798b01d703d..8d863e894995b9c38494ac3141236f10806c5ada 100644 (file)
--- 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 91f7f9ed62a593e0e56bf6b3a4cf2f5779a7f84b..e4157f631d4714df300e29789cca82357c663342 100644 (file)
--- 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 fdc868912c1ba34295d90c226bd5a536908e5088..7df440ee4345294fcd312e7a6974aaff5b9046da 100644 (file)
--- 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;
     }