From d2414079f7cb895106454803c39e0fa630b1ef90 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 11 Feb 2025 17:50:36 +0100
Subject: [PATCH] qemucapabilitiestest: Update 'caps_10.0.0_x86_64' to
 v9.2.0-2799-g0462a32b4f
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Notable changes:
 - 'virtio-scsi' supports 'iothread-vq-mapping'
 - 'vfio-pci' device gained two unstable options 'x-igd-legacy-mode'
   and 'x-igd-lpc'

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 .../caps_10.0.0_x86_64.replies                | 197 ++++++++++--------
 .../caps_10.0.0_x86_64.xml                    |   6 +-
 2 files changed, 110 insertions(+), 93 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
index aea8060984..bbb14a06c8 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies
@@ -20,7 +20,7 @@
       "minor": 2,
       "major": 9
     },
-    "package": "v9.2.0-2369-g98c7362b1e"
+    "package": "v9.2.0-2799-g0462a32b4f"
   },
   "id": "libvirt-2"
 }
@@ -24148,7 +24148,7 @@
       "parent": "pci-device"
     },
     {
-      "name": "ClearwaterForest-v1-x86_64-cpu",
+      "name": "max-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
@@ -24156,7 +24156,7 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "Haswell-v1-x86_64-cpu",
+      "name": "ClearwaterForest-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
@@ -24199,6 +24199,10 @@
       "name": "pci-ipmi-bt",
       "parent": "pci-device"
     },
+    {
+      "name": "core2duo-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "filter-buffer",
       "parent": "netfilter"
@@ -24216,8 +24220,8 @@
       "parent": "pci-vga"
     },
     {
-      "name": "kvm-pit",
-      "parent": "pit-common"
+      "name": "Haswell-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "tpm-crb",
@@ -24227,14 +24231,14 @@
       "name": "rtl8139",
       "parent": "pci-device"
     },
-    {
-      "name": "core2duo-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "pci-bridge",
       "parent": "base-pci-bridge"
     },
+    {
+      "name": "cxl-rp",
+      "parent": "pcie-root-port-base"
+    },
     {
       "name": "pc-q35-2.5-machine",
       "parent": "generic-pc-machine"
@@ -24244,8 +24248,8 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "cxl-rp",
-      "parent": "pcie-root-port-base"
+      "name": "kvm-pit",
+      "parent": "pit-common"
     },
     {
       "name": "virtio-crypto-device",
@@ -24308,8 +24312,8 @@
       "parent": "virtio-9p-pci-base"
     },
     {
-      "name": "chardev-pty",
-      "parent": "chardev"
+      "name": "chardev-serial",
+      "parent": "chardev-fd"
     },
     {
       "name": "virtio-blk-device",
@@ -24331,10 +24335,6 @@
       "name": "virtio-gpu-gl-device",
       "parent": "virtio-gpu-device"
     },
-    {
-      "name": "pc-q35-6.2-machine",
-      "parent": "generic-pc-machine"
-    },
     {
       "name": "Westmere-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -24352,8 +24352,8 @@
       "parent": "sys-bus-device"
     },
     {
-      "name": "PCIE",
-      "parent": "PCI"
+      "name": "pc-q35-6.2-machine",
+      "parent": "generic-pc-machine"
     },
     {
       "name": "ich9-usb-uhci2",
@@ -24364,8 +24364,8 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "chardev-serial",
-      "parent": "chardev-fd"
+      "name": "Cooperlake-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "resettable-container",
@@ -24376,8 +24376,8 @@
       "parent": "vhost-user-vsock-pci-base"
     },
     {
-      "name": "Cooperlake-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "kvmclock",
+      "parent": "sys-bus-device"
     },
     {
       "name": "ich9-usb-uhci1",
@@ -24400,8 +24400,8 @@
       "parent": "pci-device"
     },
     {
-      "name": "kvmclock",
-      "parent": "sys-bus-device"
+      "name": "PCIE",
+      "parent": "PCI"
     },
     {
       "name": "pc-i440fx-8.2-machine",
@@ -24471,14 +24471,14 @@
       "name": "ps2-mouse",
       "parent": "ps2-device"
     },
-    {
-      "name": "tulip",
-      "parent": "pci-device"
-    },
     {
       "name": "xen-xenstore",
       "parent": "sys-bus-device"
     },
+    {
+      "name": "tulip",
+      "parent": "pci-device"
+    },
     {
       "name": "piix3-ide",
       "parent": "pci-ide"
@@ -24556,8 +24556,8 @@
       "parent": "pci-device"
     },
     {
-      "name": "pc-i440fx-6.0-machine",
-      "parent": "generic-pc-machine"
+      "name": "vhost-vsock-pci-non-transitional",
+      "parent": "vhost-vsock-pci-base"
     },
     {
       "name": "virtio-9p-device",
@@ -24599,6 +24599,10 @@
       "name": "pc-q35-7.2-machine",
       "parent": "generic-pc-machine"
     },
+    {
+      "name": "pc-i440fx-6.0-machine",
+      "parent": "generic-pc-machine"
+    },
     {
       "name": "qemu32-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -24608,12 +24612,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "vhost-vsock-pci-non-transitional",
-      "parent": "vhost-vsock-pci-base"
-    },
-    {
-      "name": "ich9-usb-ehci2",
-      "parent": "pci-ehci-usb"
+      "name": "xen-gnttab",
+      "parent": "sys-bus-device"
     },
     {
       "name": "usb-net",
@@ -24624,8 +24624,8 @@
       "parent": "PCIE"
     },
     {
-      "name": "xen-gnttab",
-      "parent": "sys-bus-device"
+      "name": "ich9-usb-ehci2",
+      "parent": "pci-ehci-usb"
     },
     {
       "name": "isa-debug-exit",
@@ -25347,10 +25347,6 @@
       "name": "xen-bus",
       "parent": "bus"
     },
-    {
-      "name": "tls-creds-x509",
-      "parent": "tls-creds"
-    },
     {
       "name": "Penryn-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -25440,8 +25436,8 @@
       "parent": "object"
     },
     {
-      "name": "qio-channel-command",
-      "parent": "qio-channel"
+      "name": "tls-creds-x509",
+      "parent": "tls-creds"
     },
     {
       "name": "isapc-machine",
@@ -25544,8 +25540,8 @@
       "parent": "ide-device"
     },
     {
-      "name": "virtio-pmem",
-      "parent": "virtio-device"
+      "name": "qio-channel-command",
+      "parent": "qio-channel"
     },
     {
       "name": "Snowridge-v2-x86_64-cpu",
@@ -25555,6 +25551,10 @@
       "name": "Broadwell-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "acpi-generic-initiator",
+      "parent": "object"
+    },
     {
       "name": "vhost-user-scsi-pci",
       "parent": "vhost-user-scsi-pci-base"
@@ -25575,10 +25575,6 @@
       "name": "dbus-vmstate",
       "parent": "object"
     },
-    {
-      "name": "acpi-generic-initiator",
-      "parent": "object"
-    },
     {
       "name": "pc-i440fx-4.1-machine",
       "parent": "generic-pc-machine"
@@ -25592,8 +25588,8 @@
       "parent": "e1000-base"
     },
     {
-      "name": "host-iommu-device-iommufd-vfio",
-      "parent": "host-iommu-device-iommufd"
+      "name": "virtio-pmem",
+      "parent": "virtio-device"
     },
     {
       "name": "Opteron_G3-v1-x86_64-cpu",
@@ -25603,6 +25599,10 @@
       "name": "usb-ccid",
       "parent": "usb-device"
     },
+    {
+      "name": "host-iommu-device-iommufd-vfio",
+      "parent": "host-iommu-device-iommufd"
+    },
     {
       "name": "x-remote-iommu",
       "parent": "object"
@@ -26543,10 +26543,6 @@
       "name": "virtio-net-pci",
       "parent": "virtio-net-pci-base"
     },
-    {
-      "name": "virtio-vga",
-      "parent": "virtio-vga-base-type"
-    },
     {
       "name": "i82558a",
       "parent": "pci-device"
@@ -26583,6 +26579,10 @@
       "name": "virtio-mem-pci",
       "parent": "virtio-mem-pci-base"
     },
+    {
+      "name": "chardev-pty",
+      "parent": "chardev"
+    },
     {
       "name": "SierraForest-v2-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -26831,6 +26831,10 @@
       "name": "sd-bus",
       "parent": "bus"
     },
+    {
+      "name": "virtio-vga",
+      "parent": "virtio-vga-base-type"
+    },
     {
       "name": "filter-dump",
       "parent": "netfilter"
@@ -26851,10 +26855,6 @@
       "name": "smbus-ipmi",
       "parent": "smbus-device"
     },
-    {
-      "name": "authz-pam",
-      "parent": "authz"
-    },
     {
       "name": "Skylake-Server-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -26900,8 +26900,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "max-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "authz-pam",
+      "parent": "authz"
     },
     {
       "name": "Dhyana-v2-x86_64-cpu",
@@ -28095,6 +28095,11 @@
       "description": "on/off",
       "type": "bool"
     },
+    {
+      "name": "iothread-vq-mapping",
+      "description": "IOThread virtqueue mapping list [{\"iothread\":\"<id>\", \"vqs\":[1,2,3,...]},...]",
+      "type": "IOThreadVirtQueueMappingList"
+    },
     {
       "default-value": 4294967295,
       "name": "num_queues",
@@ -28313,7 +28318,7 @@
     {
       "default-value": "on",
       "name": "x-device-dirty-page-tracking",
-      "description": "Disable device dirty page tracking and use container-based dirty page tracking (DEBUG)",
+      "description": "Disable device dirty page tracking and use container-based dirty page tracking",
       "type": "OnOffAuto"
     },
     {
@@ -28374,18 +28379,18 @@
       "description": "Disable MMAP for device. Allows to trace MMIO accesses (DEBUG)",
       "type": "bool"
     },
-    {
-      "default-value": true,
-      "name": "x-req",
-      "description": "Disable device request notification support (DEBUG)",
-      "type": "bool"
-    },
     {
       "default-value": "off",
       "name": "x-msix-relocation",
       "description": "Specify MSI-X MMIO relocation to the end of specified existing BAR or new BAR to avoid virtualization overhead due to adjacent device registers",
       "type": "OffAutoPCIBAR"
     },
+    {
+      "default-value": true,
+      "name": "x-req",
+      "description": "Disable device request notification support (DEBUG)",
+      "type": "bool"
+    },
     {
       "default-value": false,
       "name": "x-no-kvm-ioeventfd",
@@ -28437,6 +28442,12 @@
       "description": "Specify UUID VF token. Required for VF when PF is owned by another VFIO driver",
       "type": "str"
     },
+    {
+      "default-value": false,
+      "name": "x-igd-lpc",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "default-value": 0,
       "name": "yres",
@@ -28471,6 +28482,12 @@
       "description": "Host PCI address [domain:]<bus:slot.function> of assigned device",
       "type": "str"
     },
+    {
+      "default-value": "auto",
+      "name": "x-igd-legacy-mode",
+      "description": "on/off/auto",
+      "type": "OnOffAuto"
+    },
     {
       "default-value": false,
       "name": "x-no-geforce-quirks",
@@ -34949,6 +34966,16 @@
       "deprecated": true,
       "default-ram-id": "pc.ram"
     },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-6.0",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "acpi": true,
+      "cpu-max": 255,
+      "deprecated": true,
+      "default-ram-id": "pc.ram"
+    },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-7.2",
@@ -34969,16 +34996,6 @@
       "deprecated": true,
       "default-ram-id": "pc.ram"
     },
-    {
-      "hotpluggable-cpus": true,
-      "name": "pc-i440fx-6.0",
-      "numa-mem-supported": false,
-      "default-cpu-type": "qemu64-x86_64-cpu",
-      "acpi": true,
-      "cpu-max": 255,
-      "deprecated": true,
-      "default-ram-id": "pc.ram"
-    },
     {
       "hotpluggable-cpus": false,
       "name": "microvm",
@@ -45188,6 +45205,16 @@
       "deprecated": true,
       "default-ram-id": "pc.ram"
     },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-6.0",
+      "numa-mem-supported": false,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "acpi": true,
+      "cpu-max": 255,
+      "deprecated": true,
+      "default-ram-id": "pc.ram"
+    },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-7.2",
@@ -45208,16 +45235,6 @@
       "deprecated": true,
       "default-ram-id": "pc.ram"
     },
-    {
-      "hotpluggable-cpus": true,
-      "name": "pc-i440fx-6.0",
-      "numa-mem-supported": false,
-      "default-cpu-type": "qemu64-x86_64-cpu",
-      "acpi": true,
-      "cpu-max": 255,
-      "deprecated": true,
-      "default-ram-id": "pc.ram"
-    },
     {
       "hotpluggable-cpus": false,
       "name": "microvm",
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
index 24509f6a0a..3a272c8002 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
@@ -208,7 +208,7 @@
   <flag name='shim'/>
   <version>9002050</version>
   <microcodeVersion>43100285</microcodeVersion>
-  <package>v9.2.0-2369-g98c7362b1e</package>
+  <package>v9.2.0-2799-g0462a32b4f</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
     <property name='avx-ne-convert' type='boolean' value='false'/>
@@ -2146,9 +2146,9 @@
   <machine type='kvm' name='pc-q35-9.2' hotplugCpus='yes' maxCpus='4096' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
   <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
   <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
+  <machine type='kvm' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
   <machine type='kvm' name='pc-q35-7.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
   <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-  <machine type='kvm' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
   <machine type='kvm' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram' acpi='yes'/>
   <machine type='kvm' name='pc-q35-8.2' hotplugCpus='yes' maxCpus='1024' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
   <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
@@ -4187,9 +4187,9 @@
   <machine type='tcg' name='pc-q35-9.2' hotplugCpus='yes' maxCpus='4096' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
   <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
   <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
+  <machine type='tcg' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
   <machine type='tcg' name='pc-q35-7.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
   <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
-  <machine type='tcg' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>
   <machine type='tcg' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram' acpi='yes'/>
   <machine type='tcg' name='pc-q35-8.2' hotplugCpus='yes' maxCpus='1024' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram' acpi='yes'/>
   <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram' deprecated='yes' acpi='yes'/>