hyperv: fix domainSuspend and domainResume on Hyper-V V2

Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 22d9bbb27caa38ad47680ee926e0105abdf117f6..81f4845e4e39bd1f456b187dec65796ed334e5f3 100644 (file)
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -896,19 +896,26 @@ hypervDomainSuspend(virDomainPtr domain)
     int result = -1;
     hypervPrivate *priv = domain->conn->privateData;
     Msvm_ComputerSystem *computerSystem = NULL;
+    int requestedState = -1;
+
+    switch (priv->wmiVersion) {
+    case HYPERV_WMI_VERSION_V1:
+        requestedState = MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_PAUSED;
+        break;
+    case HYPERV_WMI_VERSION_V2:
+        requestedState = MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_QUIESCE;
+        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"));
+    if (computerSystem->data.common->EnabledState != MSVM_COMPUTERSYSTEM_ENABLEDSTATE_ENABLED) {
+        virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not active"));
         goto cleanup;
     }
 
-    result = hypervInvokeMsvmComputerSystemRequestStateChange
-               (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_PAUSED);
+    result = hypervInvokeMsvmComputerSystemRequestStateChange(domain, requestedState);
 
  cleanup:
     hypervFreeObject(priv, (hypervObject *)computerSystem);
@@ -924,12 +931,21 @@ hypervDomainResume(virDomainPtr domain)
     int result = -1;
     hypervPrivate *priv = domain->conn->privateData;
     Msvm_ComputerSystem *computerSystem = NULL;
+    int expectedState = -1;
+
+    switch (priv->wmiVersion) {
+    case HYPERV_WMI_VERSION_V1:
+        expectedState = MSVM_COMPUTERSYSTEM_ENABLEDSTATE_PAUSED;
+        break;
+    case HYPERV_WMI_VERSION_V2:
+        expectedState = MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_QUIESCE;
+        break;
+    }
 
     if (hypervMsvmComputerSystemFromDomain(domain, &computerSystem) < 0)
-        goto cleanup;
+        return -1;
 
-    if (computerSystem->data.common->EnabledState !=
-        MSVM_COMPUTERSYSTEM_ENABLEDSTATE_PAUSED) {
+    if (computerSystem->data.common->EnabledState != expectedState) {
         virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                        _("Domain is not paused"));
         goto cleanup;

diff --git a/src/hyperv/hyperv_wmi_classes.h b/src/hyperv/hyperv_wmi_classes.h
index 7f4159dd8e655700d4d3ab9d4722368a1e89006d..0074d8889efe2cdcb53cab8873bda7097a1030f2 100644 (file)
--- a/src/hyperv/hyperv_wmi_classes.h
+++ b/src/hyperv/hyperv_wmi_classes.h
@@ -73,6 +73,7 @@ enum _Msvm_ComputerSystem_EnabledState {
 enum _Msvm_ComputerSystem_RequestedState {
     MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_ENABLED = 2,
     MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_DISABLED = 3,
+    MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_QUIESCE = 9,
     MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_REBOOT = 10,
     MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_RESET = 11,
     MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_PAUSED = 32768,