[PATCH 17/55] hyperv: use g_autoptr for Msvm_ComputerSystem in hypervDomainResume
Signed-off-by: Matt Coleman <matt(a)datto.com>
---
src/hyperv/hyperv_driver.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index dd5c42c45b..1eb3dbd48e 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -1717,8 +1717,7 @@ hypervDomainSuspend(virDomainPtr domain)
static int
hypervDomainResume(virDomainPtr domain)
{
- int result = -1;
- Msvm_ComputerSystem *computerSystem = NULL;
+ g_autoptr(Msvm_ComputerSystem) computerSystem = NULL;
if (hypervMsvmComputerSystemFromDomain(domain, &computerSystem) < 0)
return -1;
@@ -1726,16 +1725,11 @@ hypervDomainResume(virDomainPtr domain)
if (computerSystem->data->EnabledState !=
MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_QUIESCE) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("Domain is not paused"));
- goto cleanup;
+ return -1;
}
- result = hypervInvokeMsvmComputerSystemRequestStateChange(domain,
-
MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_ENABLED);
-
- cleanup:
- hypervFreeObject((hypervObject *)computerSystem);
-
- return result;
+ return hypervInvokeMsvmComputerSystemRequestStateChange(domain,
+
MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_ENABLED);
}
--
2.30.0