openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hyperv: Drop needless label in hypervDomainSetMemoryFlags() 

Now, that hypervInvokeMethod() clears the passed pointer we don't
need a special cleanup label ('params_cleanup') that handles
non-obvious ownership transfer.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Matt Coleman <matt@datto.com>
This commit is contained in:
Michal Privoznik 2020-10-15 15:24:36 +02:00
parent 0dbfb9c5a6
commit 49562e92e8
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hyperv/hyperv_driver.c
View File

@ -1765,7 +1765,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
if (hypervAddEprParam(params, "ComputerSystem", priv, &eprQuery, if (hypervAddEprParam(params, "ComputerSystem", priv, &eprQuery,
Msvm_ComputerSystem_WmiInfo) < 0) Msvm_ComputerSystem_WmiInfo) < 0)
goto params_cleanup; goto cleanup;
} else if (priv->wmiVersion == HYPERV_WMI_VERSION_V2) { } else if (priv->wmiVersion == HYPERV_WMI_VERSION_V2) {
params = hypervCreateInvokeParamsList(priv, "ModifyResourceSettings", params = hypervCreateInvokeParamsList(priv, "ModifyResourceSettings",
MSVM_VIRTUALSYSTEMMANAGEMENTSERVICE_SELECTOR, MSVM_VIRTUALSYSTEMMANAGEMENTSERVICE_SELECTOR,
@ -1779,31 +1779,31 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
memResource = hypervCreateEmbeddedParam(priv, Msvm_MemorySettingData_WmiInfo); memResource = hypervCreateEmbeddedParam(priv, Msvm_MemorySettingData_WmiInfo);
if (!memResource) if (!memResource)
goto params_cleanup; goto cleanup;
if (hypervSetEmbeddedProperty(memResource, "VirtualQuantity", memory_str) < 0) { if (hypervSetEmbeddedProperty(memResource, "VirtualQuantity", memory_str) < 0) {
hypervFreeEmbeddedParam(memResource); hypervFreeEmbeddedParam(memResource);
goto params_cleanup; goto cleanup;
} }
if (hypervSetEmbeddedProperty(memResource, "InstanceID", if (hypervSetEmbeddedProperty(memResource, "InstanceID",
memsd->data.common->InstanceID) < 0) { memsd->data.common->InstanceID) < 0) {
hypervFreeEmbeddedParam(memResource); hypervFreeEmbeddedParam(memResource);
goto params_cleanup; goto cleanup;
} }
if (priv->wmiVersion == HYPERV_WMI_VERSION_V1) { if (priv->wmiVersion == HYPERV_WMI_VERSION_V1) {
if (hypervAddEmbeddedParam(params, priv, "ResourceSettingData", if (hypervAddEmbeddedParam(params, priv, "ResourceSettingData",
memResource, Msvm_MemorySettingData_WmiInfo) < 0) { memResource, Msvm_MemorySettingData_WmiInfo) < 0) {
hypervFreeEmbeddedParam(memResource); hypervFreeEmbeddedParam(memResource);
goto params_cleanup; goto cleanup;
} }
} else if (priv->wmiVersion == HYPERV_WMI_VERSION_V2) { } else if (priv->wmiVersion == HYPERV_WMI_VERSION_V2) {
if (hypervAddEmbeddedParam(params, priv, "ResourceSettings", if (hypervAddEmbeddedParam(params, priv, "ResourceSettings",
memResource, Msvm_MemorySettingData_WmiInfo) < 0) { memResource, Msvm_MemorySettingData_WmiInfo) < 0) {
hypervFreeEmbeddedParam(memResource); hypervFreeEmbeddedParam(memResource);
goto params_cleanup; goto cleanup;
} }
} }
@ -1813,14 +1813,12 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
} }
result = 0; result = 0;
goto cleanup;
params_cleanup:
hypervFreeInvokeParams(params);
cleanup: cleanup:
VIR_FREE(memory_str); VIR_FREE(memory_str);
hypervFreeObject(priv, (hypervObject *)vssd); hypervFreeObject(priv, (hypervObject *)vssd);
hypervFreeObject(priv, (hypervObject *)memsd); hypervFreeObject(priv, (hypervObject *)memsd);
hypervFreeInvokeParams(params);
return result; return result;
} }