From: Peter Krempa <pkre...@redhat.com>
Signed-off-by: Peter Krempa <pkre...@redhat.com>
---
.../caps_10.0.0_x86_64+amdsev.replies | 199 ++++++++++--------
.../caps_10.0.0_x86_64+amdsev.xml | 9 +-
2 files changed, 113 insertions(+), 95 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies
b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies
index e8a0346fb1..d781b12ed2 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies
@@ -16,11 +16,11 @@
{
"return": {
"qemu": {
- "micro": 50,
- "minor": 2,
- "major": 9
+ "micro": 0,
+ "minor": 0,
+ "major": 10
},
- "package": "v9.2.0-2369-g98c7362b1e"
+ "package": "v10.0.0"
},
"id": "libvirt-2"
}
@@ -24223,7 +24223,7 @@
"parent": "pci-device"
},
{
- "name": "ClearwaterForest-v1-x86_64-cpu",
+ "name": "max-x86_64-cpu",
"parent": "x86_64-cpu"
},
{
@@ -24231,7 +24231,7 @@
"parent": "generic-pc-machine"
},
{
- "name": "Haswell-v1-x86_64-cpu",
+ "name": "ClearwaterForest-v1-x86_64-cpu",
"parent": "x86_64-cpu"
},
{
@@ -24274,6 +24274,10 @@
"name": "pci-ipmi-bt",
"parent": "pci-device"
},
+ {
+ "name": "core2duo-x86_64-cpu",
+ "parent": "x86_64-cpu"
+ },
{
"name": "filter-buffer",
"parent": "netfilter"
@@ -24291,8 +24295,8 @@
"parent": "pci-vga"
},
{
- "name": "kvm-pit",
- "parent": "pit-common"
+ "name": "Haswell-v1-x86_64-cpu",
+ "parent": "x86_64-cpu"
},
{
"name": "tpm-crb",
@@ -24302,14 +24306,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"
@@ -24319,8 +24323,8 @@
"parent": "generic-pc-machine"
},
{
- "name": "cxl-rp",
- "parent": "pcie-root-port-base"
+ "name": "kvm-pit",
+ "parent": "pit-common"
},
{
"name": "virtio-crypto-device",
@@ -24383,8 +24387,8 @@
"parent": "virtio-9p-pci-base"
},
{
- "name": "chardev-pty",
- "parent": "chardev"
+ "name": "chardev-serial",
+ "parent": "chardev-fd"
},
{
"name": "virtio-blk-device",
@@ -24406,10 +24410,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"
@@ -24427,8 +24427,8 @@
"parent": "sys-bus-device"
},
{
- "name": "PCIE",
- "parent": "PCI"
+ "name": "pc-q35-6.2-machine",
+ "parent": "generic-pc-machine"
},
{
"name": "ich9-usb-uhci2",
@@ -24439,8 +24439,8 @@
"parent": "generic-pc-machine"
},
{
- "name": "chardev-serial",
- "parent": "chardev-fd"
+ "name": "Cooperlake-x86_64-cpu",
+ "parent": "x86_64-cpu"
},
{
"name": "resettable-container",
@@ -24451,8 +24451,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",
@@ -24475,8 +24475,8 @@
"parent": "pci-device"
},
{
- "name": "kvmclock",
- "parent": "sys-bus-device"
+ "name": "PCIE",
+ "parent": "PCI"
},
{
"name": "pc-i440fx-8.2-machine",
@@ -24546,14 +24546,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"
@@ -24631,8 +24631,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",
@@ -24674,6 +24674,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"
@@ -24683,12 +24687,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",
@@ -24699,8 +24699,8 @@
"parent": "PCIE"
},
{
- "name": "xen-gnttab",
- "parent": "sys-bus-device"
+ "name": "ich9-usb-ehci2",
+ "parent": "pci-ehci-usb"
},
{
"name": "isa-debug-exit",
@@ -25422,10 +25422,6 @@
"name": "xen-bus",
"parent": "bus"
},
- {
- "name": "tls-creds-x509",
- "parent": "tls-creds"
- },
{
"name": "Penryn-v1-x86_64-cpu",
"parent": "x86_64-cpu"
@@ -25515,8 +25511,8 @@
"parent": "object"
},
{
- "name": "qio-channel-command",
- "parent": "qio-channel"
+ "name": "tls-creds-x509",
+ "parent": "tls-creds"
},
{
"name": "isapc-machine",
@@ -25619,8 +25615,8 @@
"parent": "ide-device"
},
{
- "name": "virtio-pmem",
- "parent": "virtio-device"
+ "name": "qio-channel-command",
+ "parent": "qio-channel"
},
{
"name": "Snowridge-v2-x86_64-cpu",
@@ -25630,6 +25626,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"
@@ -25650,10 +25650,6 @@
"name": "dbus-vmstate",
"parent": "object"
},
- {
- "name": "acpi-generic-initiator",
- "parent": "object"
- },
{
"name": "pc-i440fx-4.1-machine",
"parent": "generic-pc-machine"
@@ -25667,8 +25663,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",
@@ -25678,6 +25674,10 @@
"name": "usb-ccid",
"parent": "usb-device"
},
+ {
+ "name": "host-iommu-device-iommufd-vfio",
+ "parent": "host-iommu-device-iommufd"
+ },
{
"name": "x-remote-iommu",
"parent": "object"
@@ -26618,10 +26618,6 @@
"name": "virtio-net-pci",
"parent": "virtio-net-pci-base"
},
- {
- "name": "virtio-vga",
- "parent": "virtio-vga-base-type"
- },
{
"name": "i82558a",
"parent": "pci-device"
@@ -26658,6 +26654,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"
@@ -26906,6 +26906,10 @@
"name": "sd-bus",
"parent": "bus"
},
+ {
+ "name": "virtio-vga",
+ "parent": "virtio-vga-base-type"
+ },
{
"name": "filter-dump",
"parent": "netfilter"
@@ -26926,10 +26930,6 @@
"name": "smbus-ipmi",
"parent": "smbus-device"
},
- {
- "name": "authz-pam",
- "parent": "authz"
- },
{
"name": "Skylake-Server-v1-x86_64-cpu",
"parent": "x86_64-cpu"
@@ -26975,8 +26975,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",
@@ -28170,6 +28170,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",
@@ -28388,7 +28393,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"
},
{
@@ -28449,18 +28454,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",
@@ -28512,6 +28517,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",
@@ -28546,6 +28557,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",
@@ -35022,31 +35039,31 @@
},
{
"hotpluggable-cpus": true,
- "name": "pc-q35-7.2",
+ "name": "pc-i440fx-6.0",
"numa-mem-supported": false,
"default-cpu-type": "qemu64-x86_64-cpu",
"acpi": true,
- "cpu-max": 288,
- "deprecated": false,
+ "cpu-max": 255,
+ "deprecated": true,
"default-ram-id": "pc.ram"
},
{
"hotpluggable-cpus": true,
- "name": "pc-q35-4.0",
- "numa-mem-supported": true,
+ "name": "pc-q35-7.2",
+ "numa-mem-supported": false,
"default-cpu-type": "qemu64-x86_64-cpu",
"acpi": true,
"cpu-max": 288,
- "deprecated": true,
+ "deprecated": false,
"default-ram-id": "pc.ram"
},
{
"hotpluggable-cpus": true,
- "name": "pc-i440fx-6.0",
- "numa-mem-supported": false,
+ "name": "pc-q35-4.0",
+ "numa-mem-supported": true,
"default-cpu-type": "qemu64-x86_64-cpu",
"acpi": true,
- "cpu-max": 255,
+ "cpu-max": 288,
"deprecated": true,
"default-ram-id": "pc.ram"
},
@@ -44408,31 +44425,31 @@
},
{
"hotpluggable-cpus": true,
- "name": "pc-q35-7.2",
+ "name": "pc-i440fx-6.0",
"numa-mem-supported": false,
"default-cpu-type": "qemu64-x86_64-cpu",
"acpi": true,
- "cpu-max": 288,
- "deprecated": false,
+ "cpu-max": 255,
+ "deprecated": true,
"default-ram-id": "pc.ram"
},
{
"hotpluggable-cpus": true,
- "name": "pc-q35-4.0",
- "numa-mem-supported": true,
+ "name": "pc-q35-7.2",
+ "numa-mem-supported": false,
"default-cpu-type": "qemu64-x86_64-cpu",
"acpi": true,
"cpu-max": 288,
- "deprecated": true,
+ "deprecated": false,
"default-ram-id": "pc.ram"
},
{
"hotpluggable-cpus": true,
- "name": "pc-i440fx-6.0",
- "numa-mem-supported": false,
+ "name": "pc-q35-4.0",
+ "numa-mem-supported": true,
"default-cpu-type": "qemu64-x86_64-cpu",
"acpi": true,
- "cpu-max": 255,
+ "cpu-max": 288,
"deprecated": true,
"default-ram-id": "pc.ram"
},
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
index 12825aabe6..00afc61a5b 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
@@ -204,9 +204,10 @@
<flag name='migrate-incoming.exit-on-error'/>
<flag name='blockdev-set-active'/>
<flag name='shim'/>
- <version>9002050</version>
+ <flag name='virtio-scsi.iothread-mapping'/>
+ <version>10000000</version>
<microcodeVersion>43100285</microcodeVersion>
- <package>v9.2.0-2369-g98c7362b1e</package>
+ <package>v10.0.0</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
<property name='avx-ne-convert' type='boolean' value='false'/>
@@ -1288,9 +1289,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'/>
@@ -3329,9 +3330,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'/>
--
2.49.0
