NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-07-31 08:38:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

hyperv: return void from hypervAddEmbeddedParam

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko
2026-06-25 10:43:05 +02:00
parent ae2809ddd8
commit 8b8514fc83
3 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hyperv/hyperv_driver.c
+6 -9
View File
@@ -3054,9 +3054,8 @@ hypervDomainDefineXMLFlags(virConnectPtr conn,
}
}
if (hypervAddEmbeddedParam(params, "SystemSettings",
&defineSystemParam, Msvm_VirtualSystemSettingData_WmiInfo) < 0)
goto error;
hypervAddEmbeddedParam(params, "SystemSettings",
&defineSystemParam, Msvm_VirtualSystemSettingData_WmiInfo);
/* create the VM */
if (hypervInvokeMethod(priv, &params, NULL) < 0)
@@ -3312,9 +3311,8 @@ hypervDomainSetAutostart(virDomainPtr domain, int autostart)
if (hypervSetEmbeddedProperty(autostartParam, "InstanceID", vssd->data->InstanceID) < 0)
return -1;
if (hypervAddEmbeddedParam(params, "SystemSettings",
&autostartParam, Msvm_VirtualSystemSettingData_WmiInfo) < 0)
return -1;
hypervAddEmbeddedParam(params, "SystemSettings",
&autostartParam, Msvm_VirtualSystemSettingData_WmiInfo);
if (hypervInvokeMethod(priv, &params, NULL) < 0)
return -1;
@@ -4250,9 +4248,8 @@ hypervDomainSnapshotCreateXML(virDomainPtr domain,
HYPERV_SNAPSHOT_CONSISTENCY_CRASH_CONSISTENT) < 0)
return NULL;
if (hypervAddEmbeddedParam(params, "SnapshotSettings", &snapshotSettings,
Msvm_VirtualSystemSnapshotSettingData_WmiInfo) < 0)
return NULL;
hypervAddEmbeddedParam(params, "SnapshotSettings", &snapshotSettings,
Msvm_VirtualSystemSnapshotSettingData_WmiInfo);
hypervAddSimpleParam(params, "SnapshotType", HYPERV_SNAPSHOT_TYPE_FULL);
src/hyperv/hyperv_wmi.c
+4 -14
View File
@@ -314,11 +314,9 @@ hypervSetEmbeddedProperty(GHashTable *table,
* Add a GHashTable containing object properties as an embedded param to
* an invocation list.
*
* Upon successful return the @table is consumed and the pointer is cleared out.
*
* Returns -1 on failure, 0 on success.
* Upon return the @table is consumed and the pointer is cleared out.
*/
int
void
hypervAddEmbeddedParam(hypervInvokeParamsList *params,
const char *name,
GHashTable **table,
@@ -334,8 +332,6 @@ hypervAddEmbeddedParam(hypervInvokeParamsList *params,
p->embedded.table = g_steal_pointer(table);
p->embedded.info = classInfo;
params->nbParams++;
return 0;
}
@@ -1731,10 +1727,7 @@ hypervMsvmVSMSAddResourceSettings(virDomainPtr domain,
hypervAddEprParam(params, "AffectedConfiguration",
&eprQuery, Msvm_VirtualSystemSettingData_WmiInfo);
if (hypervAddEmbeddedParam(params, "ResourceSettings", &resourceSettings, wmiInfo) < 0) {
hypervFreeEmbeddedParam(resourceSettings);
return -1;
}
hypervAddEmbeddedParam(params, "ResourceSettings", &resourceSettings, wmiInfo);
if (hypervInvokeMethod(priv, &params, response) < 0)
return -1;
@@ -1760,10 +1753,7 @@ hypervMsvmVSMSModifyResourceSettings(hypervPrivate *priv,
if (!params)
return -1;
if (hypervAddEmbeddedParam(params, "ResourceSettings", &resourceSettings, wmiInfo) < 0) {
hypervFreeEmbeddedParam(resourceSettings);
return -1;
}
hypervAddEmbeddedParam(params, "ResourceSettings", &resourceSettings, wmiInfo);
if (hypervInvokeMethod(priv, &params, NULL) < 0)
return -1;
src/hyperv/hyperv_wmi.h
+4 -4
View File
@@ -155,10 +155,10 @@ int hypervSetEmbeddedProperty(GHashTable *table,
const char *name,
const char *value);
int hypervAddEmbeddedParam(hypervInvokeParamsList *params,
const char *name,
GHashTable **table,
hypervWmiClassInfo *info);
void hypervAddEmbeddedParam(hypervInvokeParamsList *params,
const char *name,
GHashTable **table,
hypervWmiClassInfo *info);
void hypervFreeEmbeddedParam(GHashTable *p);