From 7684246b75c99fe85829a3ad92205ab4d6e29305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sat, 16 Aug 2025 15:16:31 +0200
Subject: d/t/vbmc-qemu-vm-session.xml: Fix test

---
 ...mu-vm-session.xml-Drop-unsupported-machin.patch | 41 ++++++++++++++++++++++
 debian/changelog                                   |  8 +++++
 debian/tests/vbmc-qemu-vm-session.xml              |  2 +-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 debian/0001-d-t-vbmc-qemu-vm-session.xml-Drop-unsupported-machin.patch

diff --git a/debian/0001-d-t-vbmc-qemu-vm-session.xml-Drop-unsupported-machin.patch b/debian/0001-d-t-vbmc-qemu-vm-session.xml-Drop-unsupported-machin.patch
new file mode 100644
index 0000000..951cdb4
--- /dev/null
+++ b/debian/0001-d-t-vbmc-qemu-vm-session.xml-Drop-unsupported-machin.patch
@@ -0,0 +1,41 @@
+From a7935cc899f8bb6504d6328dd668568ec63971f1 Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Date: Fri, 15 Aug 2025 08:34:49 +0200
+Subject: [PATCH] d/t/vbmc-qemu-vm-session.xml: Drop unsupported machine type
+
+Qemu dropped some very old machine types.
+This conflicts with the config used in the ipmitools test
+
+debian/tests/vbmc-qemu-vm-session.xml:7:
+  <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
+
+Causing the tests to fail now:
+
+ 94s autopkgtest [02:57:18]: test qemuvbmc: [-----------------------
+ 94s debian/tests/vbmc-qemu-vm-session.xml validates
+ 95s
+ 95s error: Failed to define domain from debian/tests/vbmc-qemu-vm-session.xml
+ 95s error: unsupported configuration: Emulator '/usr/bin/qemu-system-x86_64'
+     does not support machine type 'pc-i440fx-2.5'
+
+Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+---
+ debian/tests/vbmc-qemu-vm-session.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/debian/tests/vbmc-qemu-vm-session.xml b/debian/tests/vbmc-qemu-vm-session.xml
+index f345b8b..7e4bc2d 100644
+--- a/debian/tests/vbmc-qemu-vm-session.xml
++++ b/debian/tests/vbmc-qemu-vm-session.xml
+@@ -4,7 +4,7 @@
+   <currentMemory unit='KiB'>256000</currentMemory>
+   <vcpu>1</vcpu>
+   <os>
+-    <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
++    <type arch='x86_64' machine='pc'>hvm</type>
+     <kernel>/boot/vmlinuz</kernel>
+     <initrd>/boot/initrd.img</initrd>
+     <cmdline> console=ttyS0 quiet loglevel=0 edd=off printk.time=1 noreplace-smp cgroup_disable=memory pci=noearly noapic panic=-1 selinux=0</cmdline>
+-- 
+2.43.0
+
diff --git a/debian/changelog b/debian/changelog
index 2d9311f..b44f22b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ipmitool (1.8.19-10) UNRELEASED; urgency=medium
+
+  * debian/tests/vbmc-qemu-vm-session.xml: Fix impitool tests
+    (Closes: #1111145).
+    Thanks to Christian Ehrhardt <christian.ehrhardt@canonical.com>
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 16 Aug 2025 15:11:33 +0200
+
 ipmitool (1.8.19-9) unstable; urgency=medium
 
   * debian/control: 
diff --git a/debian/tests/vbmc-qemu-vm-session.xml b/debian/tests/vbmc-qemu-vm-session.xml
index f345b8b..7e4bc2d 100644
--- a/debian/tests/vbmc-qemu-vm-session.xml
+++ b/debian/tests/vbmc-qemu-vm-session.xml
@@ -4,7 +4,7 @@
   <currentMemory unit='KiB'>256000</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <kernel>/boot/vmlinuz</kernel>
     <initrd>/boot/initrd.img</initrd>
     <cmdline> console=ttyS0 quiet loglevel=0 edd=off printk.time=1 noreplace-smp cgroup_disable=memory pci=noearly noapic panic=-1 selinux=0</cmdline>
-- 
cgit v1.2.3