mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 03:21:19 +00:00
hyperv: consistent names for SettingData functions
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:
parent
87e062415f
commit
d2ab8a530c
@ -985,14 +985,14 @@ hypervDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
|
|||||||
&virtualSystemSettingData) < 0)
|
&virtualSystemSettingData) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
if (hypervGetProcSDByVSSDInstanceId(priv,
|
if (hypervGetProcessorSD(priv,
|
||||||
virtualSystemSettingData->data.common->InstanceID,
|
virtualSystemSettingData->data.common->InstanceID,
|
||||||
&processorSettingData) < 0)
|
&processorSettingData) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
if (hypervGetMsvmMemorySettingDataFromVSSD(priv,
|
if (hypervGetMemorySD(priv,
|
||||||
virtualSystemSettingData->data.common->InstanceID,
|
virtualSystemSettingData->data.common->InstanceID,
|
||||||
&memorySettingData) < 0)
|
&memorySettingData) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
/* Fill struct */
|
/* Fill struct */
|
||||||
@ -1068,14 +1068,14 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
|
|||||||
&virtualSystemSettingData) < 0)
|
&virtualSystemSettingData) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
if (hypervGetProcSDByVSSDInstanceId(priv,
|
if (hypervGetProcessorSD(priv,
|
||||||
virtualSystemSettingData->data.common->InstanceID,
|
virtualSystemSettingData->data.common->InstanceID,
|
||||||
&processorSettingData) < 0)
|
&processorSettingData) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
if (hypervGetMsvmMemorySettingDataFromVSSD(priv,
|
if (hypervGetMemorySD(priv,
|
||||||
virtualSystemSettingData->data.common->InstanceID,
|
virtualSystemSettingData->data.common->InstanceID,
|
||||||
&memorySettingData) < 0)
|
&memorySettingData) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
/* Fill struct */
|
/* Fill struct */
|
||||||
@ -1817,8 +1817,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
|
|||||||
if (hypervGetMsvmVirtualSystemSettingDataFromUUID(priv, uuid_string, &vssd) < 0)
|
if (hypervGetMsvmVirtualSystemSettingDataFromUUID(priv, uuid_string, &vssd) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
if (hypervGetMsvmMemorySettingDataFromVSSD(priv, vssd->data.common->InstanceID,
|
if (hypervGetMemorySD(priv, vssd->data.common->InstanceID, &memsd) < 0)
|
||||||
&memsd) < 0)
|
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
if (priv->wmiVersion == HYPERV_WMI_VERSION_V1) {
|
if (priv->wmiVersion == HYPERV_WMI_VERSION_V1) {
|
||||||
|
@ -1571,9 +1571,9 @@ hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv,
|
|||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv,
|
hypervGetProcessorSD(hypervPrivate *priv,
|
||||||
const char *id,
|
const char *id,
|
||||||
Msvm_ProcessorSettingData **data)
|
Msvm_ProcessorSettingData **data)
|
||||||
{
|
{
|
||||||
g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
|
g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
|
||||||
virBufferEscapeSQL(&query,
|
virBufferEscapeSQL(&query,
|
||||||
@ -1597,9 +1597,9 @@ hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv,
|
|||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv,
|
hypervGetMemorySD(hypervPrivate *priv,
|
||||||
const char *vssd_instanceid,
|
const char *vssd_instanceid,
|
||||||
Msvm_MemorySettingData **list)
|
Msvm_MemorySettingData **list)
|
||||||
{
|
{
|
||||||
g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
|
g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
|
||||||
|
|
||||||
|
@ -250,10 +250,10 @@ int hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv,
|
|||||||
const char *uuid_string,
|
const char *uuid_string,
|
||||||
Msvm_VirtualSystemSettingData **list);
|
Msvm_VirtualSystemSettingData **list);
|
||||||
|
|
||||||
int hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv,
|
int hypervGetProcessorSD(hypervPrivate *priv,
|
||||||
const char *id,
|
const char *id,
|
||||||
Msvm_ProcessorSettingData **data);
|
Msvm_ProcessorSettingData **data);
|
||||||
|
|
||||||
int hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv,
|
int hypervGetMemorySD(hypervPrivate *priv,
|
||||||
const char *vssd_instanceid,
|
const char *vssd_instanceid,
|
||||||
Msvm_MemorySettingData **list);
|
Msvm_MemorySettingData **list);
|
||||||
|
Loading…
Reference in New Issue
Block a user