NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

devices: panic: drop DeviceAddress wrapper opts

Browse Source 
Just use regular address handling to represent 'type' and 'iobase'.
Add address handling to the command line
This commit is contained in:
Cole Robinson 2019-05-12 09:18:36 -04:00
parent 913c9de29b
commit 3c57b13322
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cli-test-xml/compare/virt-install-many-devices.xml
View File

@ -415,7 +415,7 @@
</backend> </backend>
</rng> </rng>
<panic model="isa"> <panic model="isa">
<address iobase="507" type="isa"/> <address type="isa" iobase="507"/>
</panic> </panic>
<vsock model="virtio"> <vsock model="virtio">
<cid address="17"/> <cid address="17"/>

4
tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
View File

@ -179,7 +179,7 @@
</backend> </backend>
</rng> </rng>
<panic model="isa"> <panic model="isa">
<address iobase="0x506" type="isa"/> <address type="isa" iobase="0x506"/>
</panic> </panic>
</devices> </devices>
<seclabel type="static" model="selinux" relabel="yes"> <seclabel type="static" model="selinux" relabel="yes">
@ -374,7 +374,7 @@
</backend> </backend>
</rng> </rng>
<panic model="isa"> <panic model="isa">
<address iobase="0x506" type="isa"/> <address type="isa" iobase="0x506"/>
</panic> </panic>
</devices> </devices>
<seclabel type="static" model="selinux" relabel="yes"> <seclabel type="static" model="selinux" relabel="yes">

4
tests/xmlparse.py
View File

@ -1051,8 +1051,8 @@ class XMLParseTest(unittest.TestCase):
dev1 = guest.devices.panic[0] dev1 = guest.devices.panic[0]
check = self._make_checker(dev1) check = self._make_checker(dev1)
check("type", "isa", None, "isa") check("address.type", "isa", None, "isa")
check("iobase", "0x505", None, "0x506") check("address.iobase", "0x505", None, "0x506")
self._alter_compare(guest.get_xml(), outfile) self._alter_compare(guest.get_xml(), outfile)
def testQEMUXMLNS(self): def testQEMUXMLNS(self):

5
virtinst/cli.py
View File

@ -2937,7 +2937,7 @@ class ParserPanic(VirtCLIParser):
def set_model_cb(self, inst, val, virtarg): def set_model_cb(self, inst, val, virtarg):
if self.compat_mode and val.startswith("0x"): if self.compat_mode and val.startswith("0x"):
inst.model = DevicePanic.MODEL_ISA inst.model = DevicePanic.MODEL_ISA
inst.iobase = val inst.address.iobase = val
else: else:
inst.model = val inst.model = val
@ -2950,9 +2950,10 @@ class ParserPanic(VirtCLIParser):
@classmethod @classmethod
def _init_class(cls, **kwargs): def _init_class(cls, **kwargs):
VirtCLIParser._init_class(**kwargs) VirtCLIParser._init_class(**kwargs)
_add_device_address_args(cls)
cls.add_arg("model", "model", cb=cls.set_model_cb, cls.add_arg("model", "model", cb=cls.set_model_cb,
ignore_default=True) ignore_default=True)
cls.add_arg("iobase", "iobase") cls.add_arg("iobase", "address.iobase")
################### ###################

6
virtinst/devices/panic.py
View File

@ -41,8 +41,6 @@ class DevicePanic(Device):
return [] return []
model = XMLProperty("./@model") model = XMLProperty("./@model")
type = XMLProperty("./address/@type")
iobase = XMLProperty("./address/@iobase")
################## ##################
@ -57,7 +55,7 @@ class DevicePanic(Device):
return None return None
def set_defaults(self, guest): def set_defaults(self, guest):
if not self.type and self.iobase: if not self.address.type and self.address.iobase:
self.type = "isa" self.address.type = "isa"
if not self.model: if not self.model:
self.model = self.get_default_model(guest) self.model = self.get_default_model(guest)