External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

hyperv: consistent names for SettingData functions

Browse Source 
Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Matt Coleman 2020-11-02 19:22:06 -05:00 committed by Michal Privoznik
parent 87e062415f
commit d2ab8a530c
3 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/hyperv/hyperv_driver.c
View File

@ -985,14 +985,14 @@ hypervDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
&virtualSystemSettingData) < 0)
goto cleanup;
if (hypervGetProcSDByVSSDInstanceId(priv,
virtualSystemSettingData->data.common->InstanceID,
&processorSettingData) < 0)
if (hypervGetProcessorSD(priv,
virtualSystemSettingData->data.common->InstanceID,
&processorSettingData) < 0)
goto cleanup;
if (hypervGetMsvmMemorySettingDataFromVSSD(priv,
virtualSystemSettingData->data.common->InstanceID,
&memorySettingData) < 0)
if (hypervGetMemorySD(priv,
virtualSystemSettingData->data.common->InstanceID,
&memorySettingData) < 0)
goto cleanup;
/* Fill struct */
@ -1068,14 +1068,14 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
&virtualSystemSettingData) < 0)
goto cleanup;
if (hypervGetProcSDByVSSDInstanceId(priv,
virtualSystemSettingData->data.common->InstanceID,
&processorSettingData) < 0)
if (hypervGetProcessorSD(priv,
virtualSystemSettingData->data.common->InstanceID,
&processorSettingData) < 0)
goto cleanup;
if (hypervGetMsvmMemorySettingDataFromVSSD(priv,
virtualSystemSettingData->data.common->InstanceID,
&memorySettingData) < 0)
if (hypervGetMemorySD(priv,
virtualSystemSettingData->data.common->InstanceID,
&memorySettingData) < 0)
goto cleanup;
/* Fill struct */
@ -1817,8 +1817,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
if (hypervGetMsvmVirtualSystemSettingDataFromUUID(priv, uuid_string, &vssd) < 0)
goto cleanup;
if (hypervGetMsvmMemorySettingDataFromVSSD(priv, vssd->data.common->InstanceID,
&memsd) < 0)
if (hypervGetMemorySD(priv, vssd->data.common->InstanceID, &memsd) < 0)
goto cleanup;
if (priv->wmiVersion == HYPERV_WMI_VERSION_V1) {

12
src/hyperv/hyperv_wmi.c
View File

@ -1571,9 +1571,9 @@ hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv,
int
hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv,
const char *id,
Msvm_ProcessorSettingData **data)
hypervGetProcessorSD(hypervPrivate *priv,
const char *id,
Msvm_ProcessorSettingData **data)
{
g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
virBufferEscapeSQL(&query,
@ -1597,9 +1597,9 @@ hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv,
int
hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv,
const char *vssd_instanceid,
Msvm_MemorySettingData **list)
hypervGetMemorySD(hypervPrivate *priv,
const char *vssd_instanceid,
Msvm_MemorySettingData **list)
{
g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;

12
src/hyperv/hyperv_wmi.h
View File

@ -250,10 +250,10 @@ int hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv,
const char *uuid_string,
Msvm_VirtualSystemSettingData **list);
int hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv,
const char *id,
Msvm_ProcessorSettingData **data);
int hypervGetProcessorSD(hypervPrivate *priv,
const char *id,
Msvm_ProcessorSettingData **data);
int hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv,
const char *vssd_instanceid,
Msvm_MemorySettingData **list);
int hypervGetMemorySD(hypervPrivate *priv,
const char *vssd_instanceid,
Msvm_MemorySettingData **list);