]> xenbits.xensource.com Git - libvirt.git/commitdiff
hyperv: Use hypervRequestStateChange() in hypervDomainSuspend()
authorMichal Privoznik <mprivozn@redhat.com>
Wed, 21 Oct 2020 12:36:16 +0000 (14:36 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 22 Oct 2020 14:11:56 +0000 (16:11 +0200)
A few commits ago, hypervRequestStateChange() helper was
introduced which has exactly the same code as a part of
hypervDomainSuspend(). Deduplicate by calling the helper.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Matt Coleman <matt@datto.com>
src/hyperv/hyperv_driver.c

index 4b198f5b958f900ff9c18e7d9bd176a815f6f45d..d08b6cff2efa3c2f7c8c6d1e0229db5e53c82a41 100644 (file)
@@ -893,9 +893,7 @@ hypervDomainLookupByName(virConnectPtr conn, const char *name)
 static int
 hypervDomainSuspend(virDomainPtr domain)
 {
-    int result = -1;
     hypervPrivate *priv = domain->conn->privateData;
-    Msvm_ComputerSystem *computerSystem = NULL;
     int requestedState = -1;
 
     switch (priv->wmiVersion) {
@@ -907,20 +905,7 @@ hypervDomainSuspend(virDomainPtr domain)
         break;
     }
 
-    if (hypervMsvmComputerSystemFromDomain(domain, &computerSystem) < 0)
-        goto cleanup;
-
-    if (computerSystem->data.common->EnabledState != MSVM_COMPUTERSYSTEM_ENABLEDSTATE_ENABLED) {
-        virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not active"));
-        goto cleanup;
-    }
-
-    result = hypervInvokeMsvmComputerSystemRequestStateChange(domain, requestedState);
-
- cleanup:
-    hypervFreeObject(priv, (hypervObject *)computerSystem);
-
-    return result;
+    return hypervRequestStateChange(domain, requestedState);
 }