|
 |
ce88c89 |
From f55c0cefba2a71d4e44003802ac4ca59db0542ad Mon Sep 17 00:00:00 2001
|
|
|
ce88c89 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
ce88c89 |
Date: Mon, 29 Oct 2012 18:55:51 -0400
|
|
|
ce88c89 |
Subject: [PATCH] domain: Fix more backtraces from PMSUSPEND status (cherry
|
|
|
ce88c89 |
picked from commit
|
|
|
ce88c89 |
538420e03239da7870b5b051c043072109f68fda)
|
|
|
ce88c89 |
|
|
|
ce88c89 |
---
|
|
|
ce88c89 |
src/virtManager/domain.py | 11 ++++++++++-
|
|
|
ce88c89 |
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
ce88c89 |
|
|
|
ce88c89 |
diff --git a/src/virtManager/domain.py b/src/virtManager/domain.py
|
|
|
ce88c89 |
index d536f77..56087b4 100644
|
|
|
ce88c89 |
--- a/src/virtManager/domain.py
|
|
|
ce88c89 |
+++ b/src/virtManager/domain.py
|
|
|
ce88c89 |
@@ -1389,6 +1389,8 @@ class vmmDomain(vmmLibvirtObject):
|
|
|
ce88c89 |
elif (hasattr(libvirt, "VIR_DOMAIN_PMSUSPENDED") and
|
|
|
ce88c89 |
status == libvirt.VIR_DOMAIN_PMSUSPENDED):
|
|
|
ce88c89 |
return _("Suspended")
|
|
|
ce88c89 |
+
|
|
|
ce88c89 |
+ logging.debug("Unknown status %d, returning 'Unknown'")
|
|
|
ce88c89 |
return _("Unknown")
|
|
|
ce88c89 |
|
|
|
ce88c89 |
def _normalize_status(self, status):
|
|
|
ce88c89 |
@@ -1429,9 +1431,16 @@ class vmmDomain(vmmLibvirtObject):
|
|
|
ce88c89 |
libvirt.VIR_DOMAIN_SHUTDOWN: "state_shutoff",
|
|
|
ce88c89 |
libvirt.VIR_DOMAIN_SHUTOFF: "state_shutoff",
|
|
|
ce88c89 |
libvirt.VIR_DOMAIN_NOSTATE: "state_running",
|
|
|
ce88c89 |
+ # VIR_DOMAIN_PMSUSPENDED
|
|
|
ce88c89 |
+ 7: "state_paused",
|
|
|
ce88c89 |
}
|
|
|
ce88c89 |
|
|
|
ce88c89 |
- return status_icons[self.status()]
|
|
|
ce88c89 |
+ status = self.status()
|
|
|
ce88c89 |
+ if status not in status_icons:
|
|
|
ce88c89 |
+ logging.debug("Unknown status %d, using NOSTATE")
|
|
|
ce88c89 |
+ status = libvirt.VIR_DOMAIN_NOSTATE
|
|
|
ce88c89 |
+
|
|
|
ce88c89 |
+ return status_icons[status]
|
|
|
ce88c89 |
|
|
|
ce88c89 |
def force_update_status(self):
|
|
|
ce88c89 |
"""
|
|
|
ce88c89 |
--
|
|
|
ce88c89 |
1.7.12.1
|
|
|
ce88c89 |
|