External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: domain: Prepare qemuDomainDiskGetBackendAlias for -blockdev

Browse Source 
Pass in the node name as the backend alias when -blockdev is used. As
copy-on-read is expressed by a separate -blockdev backing chain member
we need to decide which node name to use here.

For empty cdroms when using -blockdev there is no backend at all so NULL
is returned.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-07-18 13:58:59 +02:00
parent 9843f22c2a
commit f79f0e1e91
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_domain.c
View File

@ -8691,12 +8691,29 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver,
*/
int
qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr disk,
virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED,
virQEMUCapsPtr qemuCaps,
char **backendAlias)
{
qemuDomainDiskPrivatePtr priv = QEMU_DOMAIN_DISK_PRIVATE(disk);
const char *nodename = NULL;
*backendAlias = NULL;
if (!(*backendAlias = qemuAliasDiskDriveFromDisk(disk)))
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
if (!(*backendAlias = qemuAliasDiskDriveFromDisk(disk)))
return -1;
return 0;
}
if (virStorageSourceIsEmpty(disk->src))
return 0;
if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON)
nodename = priv->nodeCopyOnRead;
else
nodename = disk->src->nodeformat;
if (VIR_STRDUP(*backendAlias, nodename) < 0)
return -1;
return 0;