|
 |
4d8e186 |
From 04ba35a12bc5065bfa6f8b3257abf1578707ac56 Mon Sep 17 00:00:00 2001
|
|
|
4d8e186 |
Message-Id: <04ba35a12bc5065bfa6f8b3257abf1578707ac56.1351081950.git.crobinso@redhat.com>
|
|
|
4d8e186 |
In-Reply-To: <6f95a37c1dd600f05b6678d1c142d38050eddf73.1351081950.git.crobinso@redhat.com>
|
|
|
4d8e186 |
References: <6f95a37c1dd600f05b6678d1c142d38050eddf73.1351081950.git.crobinso@redhat.com>
|
|
|
4d8e186 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
4d8e186 |
Date: Sun, 14 Oct 2012 00:00:38 -0400
|
|
|
4d8e186 |
Subject: [PATCH 2/3] domain: Handle PMSUSPENDED status
|
|
|
4d8e186 |
|
|
|
4d8e186 |
And add a catchall
|
|
|
4d8e186 |
|
|
|
4d8e186 |
https://bugzilla.redhat.com/show_bug.cgi?id=850954
|
|
|
4d8e186 |
(cherry picked from commit 63ba65d374d0cb46d02093d96580f5b53b947005)
|
|
|
4d8e186 |
---
|
|
|
4d8e186 |
src/virtManager/domain.py | 16 +++++++++++-----
|
|
|
4d8e186 |
1 file changed, 11 insertions(+), 5 deletions(-)
|
|
|
4d8e186 |
|
|
|
4d8e186 |
diff --git a/src/virtManager/domain.py b/src/virtManager/domain.py
|
|
|
4d8e186 |
index 82680b8..d536f77 100644
|
|
|
4d8e186 |
--- a/src/virtManager/domain.py
|
|
|
4d8e186 |
+++ b/src/virtManager/domain.py
|
|
|
4d8e186 |
@@ -1371,19 +1371,25 @@ class vmmDomain(vmmLibvirtObject):
|
|
|
4d8e186 |
self.vcpu_max_count()
|
|
|
4d8e186 |
|
|
|
4d8e186 |
def run_status(self):
|
|
|
4d8e186 |
- if self.status() == libvirt.VIR_DOMAIN_RUNNING:
|
|
|
4d8e186 |
+ status = self.status()
|
|
|
4d8e186 |
+
|
|
|
4d8e186 |
+ if status == libvirt.VIR_DOMAIN_RUNNING:
|
|
|
4d8e186 |
return _("Running")
|
|
|
4d8e186 |
- elif self.status() == libvirt.VIR_DOMAIN_PAUSED:
|
|
|
4d8e186 |
+ elif status == libvirt.VIR_DOMAIN_PAUSED:
|
|
|
4d8e186 |
return _("Paused")
|
|
|
4d8e186 |
- elif self.status() == libvirt.VIR_DOMAIN_SHUTDOWN:
|
|
|
4d8e186 |
+ elif status == libvirt.VIR_DOMAIN_SHUTDOWN:
|
|
|
4d8e186 |
return _("Shutting Down")
|
|
|
4d8e186 |
- elif self.status() == libvirt.VIR_DOMAIN_SHUTOFF:
|
|
|
4d8e186 |
+ elif status == libvirt.VIR_DOMAIN_SHUTOFF:
|
|
|
4d8e186 |
if self.hasSavedImage():
|
|
|
4d8e186 |
return _("Saved")
|
|
|
4d8e186 |
else:
|
|
|
4d8e186 |
return _("Shutoff")
|
|
|
4d8e186 |
- elif self.status() == libvirt.VIR_DOMAIN_CRASHED:
|
|
|
4d8e186 |
+ elif status == libvirt.VIR_DOMAIN_CRASHED:
|
|
|
4d8e186 |
return _("Crashed")
|
|
|
4d8e186 |
+ elif (hasattr(libvirt, "VIR_DOMAIN_PMSUSPENDED") and
|
|
|
4d8e186 |
+ status == libvirt.VIR_DOMAIN_PMSUSPENDED):
|
|
|
4d8e186 |
+ return _("Suspended")
|
|
|
4d8e186 |
+ return _("Unknown")
|
|
|
4d8e186 |
|
|
|
4d8e186 |
def _normalize_status(self, status):
|
|
|
4d8e186 |
if status == libvirt.VIR_DOMAIN_NOSTATE:
|
|
|
4d8e186 |
--
|
|
|
4d8e186 |
1.7.11.7
|
|
|
4d8e186 |
|