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

hyperv: enable usage of g_autoptr for hypervInvokeParamsList 

Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Matt Coleman 2020-10-21 04:46:05 -04:00 committed by Michal Privoznik
parent f76848a7c1
commit 5140f97bcc
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hyperv/hyperv_driver.c
View File

@ -1619,7 +1619,7 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset,
Msvm_ComputerSystem *computerSystem = NULL; Msvm_ComputerSystem *computerSystem = NULL;
Msvm_Keyboard *keyboard = NULL; Msvm_Keyboard *keyboard = NULL;
g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
hypervInvokeParamsListPtr params = NULL; g_autoptr(hypervInvokeParamsList) params = NULL;
char keycodeStr[VIR_INT64_STR_BUFLEN]; char keycodeStr[VIR_INT64_STR_BUFLEN];
virCheckFlags(0, -1); virCheckFlags(0, -1);
@ -1672,10 +1672,8 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset,
goto cleanup; goto cleanup;
} }
if (hypervAddSimpleParam(params, "keyCode", keycodeStr) < 0) { if (hypervAddSimpleParam(params, "keyCode", keycodeStr) < 0)
hypervFreeInvokeParams(params);
goto cleanup; goto cleanup;
}
if (hypervInvokeMethod(priv, &params, NULL) < 0) { if (hypervInvokeMethod(priv, &params, NULL) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not press key %d"), virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not press key %d"),
@ -1699,10 +1697,8 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset,
goto cleanup; goto cleanup;
} }
if (hypervAddSimpleParam(params, "keyCode", keycodeStr) < 0) { if (hypervAddSimpleParam(params, "keyCode", keycodeStr) < 0)
hypervFreeInvokeParams(params);
goto cleanup; goto cleanup;
}
if (hypervInvokeMethod(priv, &params, NULL) < 0) { if (hypervInvokeMethod(priv, &params, NULL) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not release key %s"), virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not release key %s"),
@ -1730,7 +1726,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
char uuid_string[VIR_UUID_STRING_BUFLEN]; char uuid_string[VIR_UUID_STRING_BUFLEN];
hypervPrivate *priv = domain->conn->privateData; hypervPrivate *priv = domain->conn->privateData;
char *memory_str = NULL; char *memory_str = NULL;
hypervInvokeParamsListPtr params = NULL; g_autoptr(hypervInvokeParamsList) params = NULL;
unsigned long memory_mb = VIR_ROUND_UP(VIR_DIV_UP(memory, 1024), 2); unsigned long memory_mb = VIR_ROUND_UP(VIR_DIV_UP(memory, 1024), 2);
Msvm_VirtualSystemSettingData *vssd = NULL; Msvm_VirtualSystemSettingData *vssd = NULL;
Msvm_MemorySettingData *memsd = NULL; Msvm_MemorySettingData *memsd = NULL;
@ -1814,7 +1810,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
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;
} }

3
src/hyperv/hyperv_wmi.c
View File

@ -788,7 +788,7 @@ hypervInvokeMethod(hypervPrivate *priv,
hypervInvokeParamsListPtr *paramsPtr, hypervInvokeParamsListPtr *paramsPtr,
WsXmlDocH *res) WsXmlDocH *res)
{ {
hypervInvokeParamsListPtr params = *paramsPtr; g_autoptr(hypervInvokeParamsList) params = *paramsPtr;
int result = -1; int result = -1;
size_t i = 0; size_t i = 0;
int returnCode; int returnCode;
@ -963,7 +963,6 @@ hypervInvokeMethod(hypervPrivate *priv,
VIR_FREE(returnValue); VIR_FREE(returnValue);
VIR_FREE(instanceID); VIR_FREE(instanceID);
hypervFreeObject(priv, (hypervObject *)job); hypervFreeObject(priv, (hypervObject *)job);
hypervFreeInvokeParams(params);
*paramsPtr = NULL; *paramsPtr = NULL;
return result; return result;
} }

1
src/hyperv/hyperv_wmi.h
View File

@ -135,6 +135,7 @@ hypervInvokeParamsListPtr hypervCreateInvokeParamsList(hypervPrivate *priv,
const char *method, const char *selector, hypervWmiClassInfoListPtr obj); const char *method, const char *selector, hypervWmiClassInfoListPtr obj);
void hypervFreeInvokeParams(hypervInvokeParamsListPtr params); void hypervFreeInvokeParams(hypervInvokeParamsListPtr params);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(hypervInvokeParamsList, hypervFreeInvokeParams);
int hypervAddSimpleParam(hypervInvokeParamsListPtr params, const char *name, int hypervAddSimpleParam(hypervInvokeParamsListPtr params, const char *name,
const char *value); const char *value);