shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-22 13:34:07 +03:00
Code Issues Projects Releases Wiki Activity

devices: panic: let libvirt fill in model default

Browse Source 
Currently `--panic default` for aarch64 doesn't even request
a `<panic/>` device due to quirky xmlbuilder behavior. Fix that,
but more generally just leave model empty and let libvirt fill it
in for us.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2024-11-12 09:44:37 -05:00
parent afa8231525
commit ebeb80073e
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/data/cli/compare/virt-install-aarch64-kvm-import.xml
View File

@ -64,5 +64,6 @@
<rng model="virtio"> <rng model="virtio">
<backend model="random">/dev/urandom</backend> <backend model="random">/dev/urandom</backend>
</rng> </rng>
<panic model="pvpanic"/>
</devices> </devices>
</domain> </domain>

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

@ -941,7 +941,7 @@
</backend> </backend>
<rate bytes="1234" period="1000"/> <rate bytes="1234" period="1000"/>
</rng> </rng>
<panic model="isa"> <panic>
<address type="isa" iobase="0x500" irq="5"/> <address type="isa" iobase="0x500" irq="5"/>
</panic> </panic>
<shmem name="shmem0" role="master"> <shmem name="shmem0" role="master">

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

@ -91,7 +91,7 @@
<rng model="virtio"> <rng model="virtio">
<backend model="random">/dev/urandom</backend> <backend model="random">/dev/urandom</backend>
</rng> </rng>
<panic model="isa"/> <panic/>
<vsock model="virtio"> <vsock model="virtio">
<cid auto="yes"/> <cid auto="yes"/>
</vsock> </vsock>
@ -191,7 +191,7 @@
<rng model="virtio"> <rng model="virtio">
<backend model="random">/dev/urandom</backend> <backend model="random">/dev/urandom</backend>
</rng> </rng>
<panic model="isa"/> <panic/>
<vsock model="virtio"> <vsock model="virtio">
<cid auto="yes"/> <cid auto="yes"/>
</vsock> </vsock>

4
virtinst/devices/panic.py
View File

@ -18,6 +18,7 @@ class DevicePanic(Device):
MODEL_S390 = "s390" MODEL_S390 = "s390"
model = XMLProperty("./@model") model = XMLProperty("./@model")
set_stub = XMLProperty(".", is_bool=True)
################## ##################
@ -46,4 +47,5 @@ class DevicePanic(Device):
if not self.address.type and self.address.iobase: if not self.address.type and self.address.iobase:
self.address.type = "isa" self.address.type = "isa"
if not self.model: if not self.model:
self.model = DevicePanic.get_default_model(guest) # This asks libvirt to fill in a default
self.set_stub = True