From 48604bfb375e73b32abaa9f2b172f80549f0d949 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 4 Sep 2017 18:44:56 +0200 Subject: [PATCH] devicepanic: don't set default iobase This is not required and it's correctly handled by libvirt and QEMU. Signed-off-by: Pavel Hrdina --- tests/cli-test-xml/compare/virt-install-panic-default.xml | 4 +--- tests/cli-test-xml/compare/virt-install-panic-isa.xml | 4 +--- .../cli-test-xml/compare/virt-install-singleton-config-1.xml | 4 +--- virtinst/devicepanic.py | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/cli-test-xml/compare/virt-install-panic-default.xml b/tests/cli-test-xml/compare/virt-install-panic-default.xml index 9b7ddfd5d..b391a2908 100644 --- a/tests/cli-test-xml/compare/virt-install-panic-default.xml +++ b/tests/cli-test-xml/compare/virt-install-panic-default.xml @@ -28,8 +28,6 @@ /usr/bin/qemu-kvm - -
- + diff --git a/tests/cli-test-xml/compare/virt-install-panic-isa.xml b/tests/cli-test-xml/compare/virt-install-panic-isa.xml index 9b7ddfd5d..b391a2908 100644 --- a/tests/cli-test-xml/compare/virt-install-panic-isa.xml +++ b/tests/cli-test-xml/compare/virt-install-panic-isa.xml @@ -28,8 +28,6 @@ /usr/bin/qemu-kvm - -
- + diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml b/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml index 5c38036c8..fc22e0ac6 100644 --- a/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml +++ b/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml @@ -63,9 +63,7 @@ /dev/random - -
- + diff --git a/virtinst/devicepanic.py b/virtinst/devicepanic.py index 69f728889..2463b0113 100644 --- a/virtinst/devicepanic.py +++ b/virtinst/devicepanic.py @@ -30,7 +30,6 @@ class VirtualPanicDevice(VirtualDevice): MODELS = [MODEL_ISA] ISA_ADDRESS_TYPE = "isa" - IOBASE_DEFAULT = "0x505" @staticmethod def get_pretty_model(panic_model): @@ -48,7 +47,6 @@ class VirtualPanicDevice(VirtualDevice): default_name=MODEL_DEFAULT) type = XMLProperty("./address/@type", default_cb=_get_default_address_type) - iobase = XMLProperty("./address/@iobase", - default_cb=lambda s: s.IOBASE_DEFAULT) + iobase = XMLProperty("./address/@iobase") VirtualPanicDevice.register_type()