From ebeb80073e255873cf1fdbdedb3a564881137ec2 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 12 Nov 2024 09:44:37 -0500
Subject: [PATCH] devices: panic: let libvirt fill in model default

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>
---
 tests/data/cli/compare/virt-install-aarch64-kvm-import.xml | 1 +
 tests/data/cli/compare/virt-install-many-devices.xml       | 2 +-
 tests/data/cli/compare/virt-install-singleton-config-2.xml | 4 ++--
 virtinst/devices/panic.py                                  | 4 +++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/data/cli/compare/virt-install-aarch64-kvm-import.xml b/tests/data/cli/compare/virt-install-aarch64-kvm-import.xml
index cc3ca5da8..340d1ee93 100644
--- a/tests/data/cli/compare/virt-install-aarch64-kvm-import.xml
+++ b/tests/data/cli/compare/virt-install-aarch64-kvm-import.xml
@@ -64,5 +64,6 @@
     <rng model="virtio">
       <backend model="random">/dev/urandom</backend>
     </rng>
+    <panic model="pvpanic"/>
   </devices>
 </domain>
diff --git a/tests/data/cli/compare/virt-install-many-devices.xml b/tests/data/cli/compare/virt-install-many-devices.xml
index a32908108..b6331395d 100644
--- a/tests/data/cli/compare/virt-install-many-devices.xml
+++ b/tests/data/cli/compare/virt-install-many-devices.xml
@@ -941,7 +941,7 @@
       </backend>
       <rate bytes="1234" period="1000"/>
     </rng>
-    <panic model="isa">
+    <panic>
       <address type="isa" iobase="0x500" irq="5"/>
     </panic>
     <shmem name="shmem0" role="master">
diff --git a/tests/data/cli/compare/virt-install-singleton-config-2.xml b/tests/data/cli/compare/virt-install-singleton-config-2.xml
index 27c69c11a..6b7e523c4 100644
--- a/tests/data/cli/compare/virt-install-singleton-config-2.xml
+++ b/tests/data/cli/compare/virt-install-singleton-config-2.xml
@@ -91,7 +91,7 @@
     <rng model="virtio">
       <backend model="random">/dev/urandom</backend>
     </rng>
-    <panic model="isa"/>
+    <panic/>
     <vsock model="virtio">
       <cid auto="yes"/>
     </vsock>
@@ -191,7 +191,7 @@
     <rng model="virtio">
       <backend model="random">/dev/urandom</backend>
     </rng>
-    <panic model="isa"/>
+    <panic/>
     <vsock model="virtio">
       <cid auto="yes"/>
     </vsock>
diff --git a/virtinst/devices/panic.py b/virtinst/devices/panic.py
index 4c764ab45..86a0056fe 100644
--- a/virtinst/devices/panic.py
+++ b/virtinst/devices/panic.py
@@ -18,6 +18,7 @@ class DevicePanic(Device):
     MODEL_S390 = "s390"
 
     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:
             self.address.type = "isa"
         if not self.model:
-            self.model = DevicePanic.get_default_model(guest)
+            # This asks libvirt to fill in a default
+            self.set_stub = True