External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

hyperv: use g_autoptr for Msvm_ResourceAllocationSettingData in hypervDomainAttachPhysicalDisk

Browse Source 
Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Matt Coleman 2021-01-21 13:51:04 -05:00 committed by Laine Stump
parent e1e58cb122
commit 3836e11cec
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hyperv/hyperv_driver.c
View File

@ -533,14 +533,13 @@ hypervDomainAttachPhysicalDisk(virDomainPtr domain,
Msvm_ResourceAllocationSettingData *controller,
const char *hostname)
{
int result = -1;
hypervPrivate *priv = domain->conn->privateData;
g_autofree char *hostResource = NULL;
g_autofree char *controller__PATH = NULL;
g_auto(GStrv) matches = NULL;
ssize_t found = 0;
g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Msvm_ResourceAllocationSettingData *diskdefault = NULL;
g_autoptr(Msvm_ResourceAllocationSettingData) diskdefault = NULL;
g_autofree char *controllerInstanceIdEscaped = NULL;
g_autoptr(GHashTable) diskResource = NULL;
g_autofree char *addressString = g_strdup_printf("%u", disk->info.addr.drive.unit);
@ -584,7 +583,7 @@ hypervDomainAttachPhysicalDisk(virDomainPtr domain,
if (found < 1) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Could not get Msvm_DiskDrive default InstanceID"));
goto cleanup;
return -1;
}
hostResource = g_strdup_printf("\\\\%s\\Root\\Virtualization\\V2:"
@ -604,35 +603,30 @@ hypervDomainAttachPhysicalDisk(virDomainPtr domain,
"Msvm_ResourceAllocationSettingData.InstanceID=\"%s\"",
hostname, controllerInstanceIdEscaped);
if (!controller__PATH)
goto cleanup;
return -1;
if (hypervSetEmbeddedProperty(diskResource, "Parent", controller__PATH) < 0)
goto cleanup;
return -1;
if (hypervSetEmbeddedProperty(diskResource, "AddressOnParent", addressString) < 0)
goto cleanup;
return -1;
if (hypervSetEmbeddedProperty(diskResource, "ResourceType", resourceType) < 0)
goto cleanup;
return -1;
if (hypervSetEmbeddedProperty(diskResource, "ResourceSubType",
"Microsoft:Hyper-V:Physical Disk Drive") < 0)
goto cleanup;
return -1;
if (hypervSetEmbeddedProperty(diskResource, "HostResource", hostResource) < 0)
goto cleanup;
return -1;
if (hypervMsvmVSMSAddResourceSettings(domain, &diskResource,
Msvm_ResourceAllocationSettingData_WmiInfo,
NULL) < 0)
goto cleanup;
return -1;
result = 0;
cleanup:
hypervFreeObject((hypervObject *)diskdefault);
return result;
return 0;
}