diff options
| author | Chen Hanxiao <chenhanxiao@cn.fujitsu.com> | 2014-01-14 11:45:36 +0800 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2014-01-14 09:58:09 -0500 |
| commit | 2bee4a128d0489e01639a60b4cb4568ad62b569a (patch) | |
| tree | db2bb1f27e4bade9fe139cdc0627ca5bfab25bf8 | |
| parent | 6db30432a5627280c1f15cbda34ae53c09334172 (diff) | |
| download | virt-manager-2bee4a128d0489e01639a60b4cb4568ad62b569a.tar.gz | |
panic notifier: display default value if not set
If we didn't set values for @type and @iobase in
XML, libvirt will use the default value.
Currently, virt-manager will display "-" if we don't
set any values.
This patch will use default value for display.
And update test case to cover this scenario.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
| -rw-r--r-- | tests/xmlparse.py | 4 | ||||
| -rw-r--r-- | virtManager/details.py | 3 | ||||
| -rw-r--r-- | virtinst/devicepanic.py | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/tests/xmlparse.py b/tests/xmlparse.py index 4567bb8f..0bf0637b 100644 --- a/tests/xmlparse.py +++ b/tests/xmlparse.py @@ -787,8 +787,8 @@ class XMLParseTest(unittest.TestCase): dev1 = guest.get_devices("panic")[0] check = self._make_checker(dev1) - check("type", "isa", "isa") - check("iobase", "0x505", "0x506") + check("type", "isa", None, "isa") + check("iobase", "0x505", None, "0x506") self._alter_compare(guest.get_xml_config(), outfile) def testAddRemoveDevices(self): diff --git a/virtManager/details.py b/virtManager/details.py index 51573f69..72fbc98e 100644 --- a/virtManager/details.py +++ b/virtManager/details.py @@ -3110,6 +3110,9 @@ class vmmDetails(vmmGObjectUI): widgetname = "panic-" + param.replace("_", "-") if not val: val = getattr(dev, param) + if not val: + propername = param.upper() + "_DEFAULT" + val = getattr(virtinst.VirtualPanicDevice, propername, "-").upper() uihelpers.set_grid_row_visible(self.widget(widgetname), True) self.widget(widgetname).set_text(val or "-") diff --git a/virtinst/devicepanic.py b/virtinst/devicepanic.py index 5f7cbd83..a41af947 100644 --- a/virtinst/devicepanic.py +++ b/virtinst/devicepanic.py @@ -26,6 +26,7 @@ class VirtualPanicDevice(VirtualDevice): virtual_device_type = VirtualDevice.VIRTUAL_DEV_PANIC ADDRESS_TYPE_ISA = "isa" + TYPE_DEFAULT = ADDRESS_TYPE_ISA TYPES = [ADDRESS_TYPE_ISA] IOBASE_DEFAULT = "0x505" |