External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: domain: Remove pointless alias check

Browse Source 
When attaching the disks, aliases are always generated.
This commit is contained in:
Peter Krempa 2017-10-20 15:12:49 +02:00
parent d565877312
commit beb1661f3d
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_domain.c
View File

@ -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)

3
src/qemu/qemu_domain.h
View File

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

2
src/qemu/qemu_hotplug.c
View File

@ -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 &&

2
src/qemu/qemu_process.c
View File

@ -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;
}