External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 22:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

hyperv: remove duplicate function hypervGetMemSDByVSSDInstanceId()

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-10-22 12:38:21 -04:00 committed by Michal Privoznik
parent e08393e339
commit a7fc186fd2
1 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/hyperv/hyperv_driver.c
View File

@ -246,31 +246,6 @@ hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv, const char *id,
}
static int
hypervGetMemSDByVSSDInstanceId(hypervPrivate *priv, const char *id,
Msvm_MemorySettingData **data)
{
g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
virBufferEscapeSQL(&query,
"ASSOCIATORS OF {Msvm_VirtualSystemSettingData.InstanceID='%s'} "
"WHERE AssocClass = Msvm_VirtualSystemSettingDataComponent "
"ResultClass = Msvm_MemorySettingData",
id);
if (hypervGetWmiClass(Msvm_MemorySettingData, data) < 0)
return -1;
if (!*data) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not look up memory setting data with virtual system instance ID '%s'"),
id);
return -1;
}
return 0;
}
static int
hypervRequestStateChange(virDomainPtr domain, int state)
{
@ -1082,11 +1057,10 @@ hypervDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
goto cleanup;
}
if (hypervGetMemSDByVSSDInstanceId(priv,
virtualSystemSettingData->data.common->InstanceID,
&memorySettingData) < 0) {
if (hypervGetMsvmMemorySettingDataFromVSSD(priv,
virtualSystemSettingData->data.common->InstanceID,
&memorySettingData) < 0)
goto cleanup;
}
/* Fill struct */
info->state = hypervMsvmComputerSystemEnabledStateToDomainState(computerSystem);
@ -1167,11 +1141,10 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
goto cleanup;
}
if (hypervGetMemSDByVSSDInstanceId(priv,
virtualSystemSettingData->data.common->InstanceID,
&memorySettingData) < 0) {
if (hypervGetMsvmMemorySettingDataFromVSSD(priv,
virtualSystemSettingData->data.common->InstanceID,
&memorySettingData) < 0)
goto cleanup;
}
/* Fill struct */
def->virtType = VIR_DOMAIN_VIRT_HYPERV;