From 0956edee378c11b1543c303ee0d7cad021c4b7dd Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 5 Nov 2020 12:31:59 +0100 Subject: [PATCH] tests: qemucapabilities: Update latest qemu caps to qemu v5.2.0-rc1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Synchronize with the latest release candidate. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- .../caps_5.2.0.x86_64.replies | 552 +++++++++--------- .../caps_5.2.0.x86_64.xml | 6 +- 2 files changed, 283 insertions(+), 275 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies index 37b17afba9..140a3312a5 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 50, + "micro": 91, "minor": 1, "major": 5 }, - "package": "v5.1.0-2827-g2c6605389c" + "package": "v5.2.0-rc1" }, "id": "libvirt-2" } @@ -690,8 +690,8 @@ "parent": "pci-device" }, { - "name": "sev-guest", - "parent": "object" + "name": "chardev-stdio", + "parent": "chardev-fd" }, { "name": "usb-redir", @@ -714,8 +714,8 @@ "parent": "pci-vga" }, { - "name": "virtio-blk-pci-transitional", - "parent": "virtio-blk-pci-base" + "name": "kvm-pit", + "parent": "pit-common" }, { "name": "Haswell-v1-x86_64-cpu", @@ -738,8 +738,8 @@ "parent": "generic-pc-machine" }, { - "name": "kvm-pit", - "parent": "pit-common" + "name": "sev-guest", + "parent": "object" }, { "name": "ich9-usb-uhci5", @@ -793,10 +793,6 @@ "name": "usb-hub", "parent": "usb-device" }, - { - "name": "chardev-pty", - "parent": "chardev" - }, { "name": "virtio-blk-device", "parent": "virtio-device" @@ -838,8 +834,8 @@ "parent": "accel" }, { - "name": "kvmclock", - "parent": "sys-bus-device" + "name": "chardev-pty", + "parent": "chardev" }, { "name": "vhost-user-vsock-pci", @@ -862,21 +858,25 @@ "parent": "scsi-device" }, { - "name": "e1000e", - "parent": "pci-device" - }, - { - "name": "x3130-upstream", - "parent": "pcie-port" + "name": "kvmclock", + "parent": "sys-bus-device" }, { "name": "virtio-serial-pci-transitional", "parent": "virtio-serial-pci-base" }, + { + "name": "x3130-upstream", + "parent": "pcie-port" + }, { "name": "memory-backend-ram", "parent": "memory-backend" }, + { + "name": "e1000e", + "parent": "pci-device" + }, { "name": "PCIE", "parent": "PCI" @@ -1086,8 +1086,8 @@ "parent": "pci-device" }, { - "name": "virtio-input-host-pci", - "parent": "virtio-input-host-pci-base-type" + "name": "virtio-9p-pci-transitional", + "parent": "virtio-9p-pci-base" }, { "name": "nvdimm", @@ -1098,8 +1098,8 @@ "parent": "generic-pc-machine" }, { - "name": "virtio-9p-pci-transitional", - "parent": "virtio-9p-pci-base" + "name": "virtio-input-host-pci", + "parent": "virtio-input-host-pci-base-type" }, { "name": "Opteron_G1-x86_64-cpu", @@ -1154,12 +1154,8 @@ "parent": "sys-bus-device" }, { - "name": "chardev-memory", - "parent": "chardev-ringbuf" - }, - { - "name": "i82557a", - "parent": "pci-device" + "name": "pc-q35-2.8-machine", + "parent": "generic-pc-machine" }, { "name": "vhost-user-scsi-pci-non-transitional", @@ -1170,13 +1166,17 @@ "parent": "isa-device" }, { - "name": "pc-q35-2.8-machine", - "parent": "generic-pc-machine" + "name": "chardev-udp", + "parent": "chardev" }, { "name": "generic-sdhci", "parent": "sys-bus-device" }, + { + "name": "i82557a", + "parent": "pci-device" + }, { "name": "virtio-scsi-pci-non-transitional", "parent": "virtio-scsi-pci-base" @@ -1194,8 +1194,8 @@ "parent": "x86_64-cpu" }, { - "name": "chardev-udp", - "parent": "chardev" + "name": "chardev-memory", + "parent": "chardev-ringbuf" }, { "name": "EPYC-Rome-v1-x86_64-cpu", @@ -1266,16 +1266,16 @@ "parent": "vhost-scsi-common" }, { - "name": "usb-tablet", - "parent": "usb-hid" + "name": "sd-card", + "parent": "device" }, { "name": "sysbus-ahci", "parent": "sys-bus-device" }, { - "name": "sd-card", - "parent": "device" + "name": "usb-tablet", + "parent": "usb-hid" }, { "name": "pc-q35-4.0.1-machine", @@ -1313,10 +1313,18 @@ "name": "tcg-accel", "parent": "accel" }, + { + "name": "piix4-ide", + "parent": "pci-ide" + }, { "name": "virtio-balloon-pci", "parent": "virtio-balloon-pci-base" }, + { + "name": "Cascadelake-Server-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "qemu:memory-region", "parent": "object" @@ -1325,10 +1333,6 @@ "name": "virtio-gpu-device", "parent": "virtio-gpu-base" }, - { - "name": "Cascadelake-Server-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "e1000", "parent": "e1000-base" @@ -1345,10 +1349,6 @@ "name": "ES1370", "parent": "pci-device" }, - { - "name": "pc-i440fx-2.6-machine", - "parent": "generic-pc-machine" - }, { "name": "i82551", "parent": "pci-device" @@ -1366,8 +1366,8 @@ "parent": "x86_64-cpu" }, { - "name": "piix4-ide", - "parent": "pci-ide" + "name": "pc-i440fx-2.6-machine", + "parent": "generic-pc-machine" }, { "name": "SandyBridge-x86_64-cpu", @@ -1405,14 +1405,14 @@ "name": "kvm-apic", "parent": "apic-common" }, - { - "name": "isa-pit", - "parent": "pit-common" - }, { "name": "kvm64-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "isa-pit", + "parent": "pit-common" + }, { "name": "Broadwell-v4-x86_64-cpu", "parent": "x86_64-cpu" @@ -1485,10 +1485,6 @@ "name": "vhost-user-blk-pci-non-transitional", "parent": "vhost-user-blk-pci-base" }, - { - "name": "virtio-rng-pci-non-transitional", - "parent": "virtio-rng-pci-base" - }, { "name": "cirrus-vga", "parent": "pci-device" @@ -1505,13 +1501,17 @@ "name": "pc-i440fx-2.1-machine", "parent": "generic-pc-machine" }, + { + "name": "virtio-serial-pci", + "parent": "virtio-serial-pci-base" + }, { "name": "i82559er", "parent": "pci-device" }, { - "name": "virtio-serial-pci", - "parent": "virtio-serial-pci-base" + "name": "virtio-rng-pci-non-transitional", + "parent": "virtio-rng-pci-base" }, { "name": "Skylake-Client-x86_64-cpu", @@ -1750,11 +1750,11 @@ "parent": "base-sysbus-fdc" }, { - "name": "i82559c", + "name": "AMDVI-PCI", "parent": "pci-device" }, { - "name": "AMDVI-PCI", + "name": "i82559c", "parent": "pci-device" }, { @@ -1802,11 +1802,11 @@ "parent": "vhost-user-scsi-pci-base" }, { - "name": "i82559a", + "name": "kvaser_pci", "parent": "pci-device" }, { - "name": "kvaser_pci", + "name": "i82559a", "parent": "pci-device" }, { @@ -1830,8 +1830,8 @@ "parent": "chardev-spice" }, { - "name": "tls-creds-x509", - "parent": "tls-creds" + "name": "qio-channel-command", + "parent": "qio-channel" }, { "name": "Opteron_G3-v1-x86_64-cpu", @@ -1846,8 +1846,8 @@ "parent": "virtio-blk-pci-base" }, { - "name": "qio-channel-command", - "parent": "qio-channel" + "name": "tls-creds-x509", + "parent": "tls-creds" }, { "name": "pc-i440fx-2.4-machine", @@ -1870,8 +1870,8 @@ "parent": "x86_64-cpu" }, { - "name": "qio-channel-websock", - "parent": "qio-channel" + "name": "qio-net-listener", + "parent": "object" }, { "name": "pc-q35-4.1-machine", @@ -1894,8 +1894,8 @@ "parent": "x86_64-cpu" }, { - "name": "qio-net-listener", - "parent": "object" + "name": "qio-channel-websock", + "parent": "qio-channel" }, { "name": "edu", @@ -1973,6 +1973,10 @@ "name": "chardev-socket", "parent": "chardev" }, + { + "name": "clock", + "parent": "object" + }, { "name": "Haswell-v2-x86_64-cpu", "parent": "x86_64-cpu" @@ -1985,14 +1989,14 @@ "name": "usb-ehci", "parent": "pci-ehci-usb" }, - { - "name": "pxb", - "parent": "pci-device" - }, { "name": "pc-i440fx-2.11-machine", "parent": "generic-pc-machine" }, + { + "name": "pxb", + "parent": "pci-device" + }, { "name": "AC97", "parent": "pci-device" @@ -2006,8 +2010,8 @@ "parent": "virtio-device" }, { - "name": "clock", - "parent": "object" + "name": "nvme-bus", + "parent": "bus" }, { "name": "virtconsole", @@ -2022,8 +2026,8 @@ "parent": "isa-device" }, { - "name": "hyperv-testdev", - "parent": "isa-device" + "name": "virtio-iommu-pci-non-transitional", + "parent": "virtio-iommu-device-base" }, { "name": "scsi-hd", @@ -2070,29 +2074,29 @@ "parent": "x86_64-cpu" }, { - "name": "virtio-iommu-pci-non-transitional", - "parent": "virtio-iommu-device-base" + "name": "hyperv-testdev", + "parent": "isa-device" }, { "name": "s3c-sdhci", "parent": "generic-sdhci" }, { - "name": "tpm-tis", - "parent": "isa-device" + "name": "Westmere-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "fw_cfg_mem", "parent": "fw_cfg" }, - { - "name": "Westmere-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "ccid-card-emulated", "parent": "ccid-card" }, + { + "name": "tpm-tis", + "parent": "isa-device" + }, { "name": "pc-q35-5.1-machine", "parent": "generic-pc-machine" @@ -2281,6 +2285,10 @@ "name": "colo-compare", "parent": "object" }, + { + "name": "virtio-mmio", + "parent": "sys-bus-device" + }, { "name": "pxb-bus", "parent": "PCI" @@ -2289,10 +2297,6 @@ "name": "pentium2-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "virtio-mmio", - "parent": "sys-bus-device" - }, { "name": "Broadwell-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -2321,18 +2325,26 @@ "name": "Skylake-Server-v4-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "Nehalem-v1-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "kvmvapic", "parent": "sys-bus-device" }, + { + "name": "Nehalem-v1-x86_64-cpu", + "parent": "x86_64-cpu" + }, + { + "name": "nvme-ns", + "parent": "device" + }, { "name": "Opteron_G2-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "pc-1.1-machine", + "parent": "generic-pc-machine" + }, { "name": "megasas-gen2", "parent": "megasas-base" @@ -2365,10 +2377,6 @@ "name": "Broadwell-noTSX-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "pc-1.1-machine", - "parent": "generic-pc-machine" - }, { "name": "u2f-passthru", "parent": "u2f-key" @@ -2509,14 +2517,14 @@ "name": "vhost-user-gpu", "parent": "virtio-gpu-base" }, - { - "name": "pentium-v1-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "hda-duplex", "parent": "hda-audio" }, + { + "name": "pentium-v1-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "amd-iommu-iommu-memory-region", "parent": "qemu:iommu-memory-region" @@ -2526,25 +2534,25 @@ "parent": "object" }, { - "name": "Nehalem-IBRS-x86_64-cpu", + "name": "virtio-balloon-device", + "parent": "virtio-device" + }, + { + "name": "Cooperlake-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { "name": "Cascadelake-Server-v3-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "Nehalem-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "cfi.pflash01", "parent": "sys-bus-device" }, - { - "name": "virtio-balloon-device", - "parent": "virtio-device" - }, - { - "name": "Cooperlake-v1-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "pc-q35-2.7-machine", "parent": "generic-pc-machine" @@ -2774,8 +2782,8 @@ "parent": "x86_64-cpu" }, { - "name": "pcie-root-port", - "parent": "pcie-root-port-base" + "name": "kvm64-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "IDE", @@ -2786,8 +2794,8 @@ "parent": "x86_64-cpu" }, { - "name": "kvm64-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pcie-root-port", + "parent": "pcie-root-port-base" }, { "name": "mptsas1068", @@ -2886,8 +2894,8 @@ "parent": "qio-channel" }, { - "name": "chardev-stdio", - "parent": "chardev-fd" + "name": "virtio-blk-pci-transitional", + "parent": "virtio-blk-pci-base" }, { "name": "virtio-vga", @@ -8366,6 +8374,14 @@ "deprecated": false, "default-ram-id": "pc.ram" }, + { + "hotpluggable-cpus": false, + "name": "none", + "numa-mem-supported": false, + "cpu-max": 1, + "deprecated": false, + "default-ram-id": "ram" + }, { "hotpluggable-cpus": true, "name": "pc-1.1", @@ -8375,14 +8391,6 @@ "deprecated": true, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": false, - "name": "none", - "numa-mem-supported": false, - "cpu-max": 1, - "deprecated": false, - "default-ram-id": "ram" - }, { "hotpluggable-cpus": true, "name": "pc-i440fx-2.7", @@ -10716,140 +10724,6 @@ ], "option": "vnc" }, - { - "parameters": [ - ], - "option": "acpi" - }, - { - "parameters": [ - { - "name": "rendernode", - "type": "string" - }, - { - "name": "gl", - "type": "boolean" - }, - { - "name": "head", - "type": "number" - }, - { - "name": "display", - "type": "string" - }, - { - "name": "seamless-migration", - "type": "boolean" - }, - { - "name": "playback-compression", - "type": "boolean" - }, - { - "name": "agent-mouse", - "type": "boolean" - }, - { - "name": "streaming-video", - "type": "string" - }, - { - "name": "zlib-glz-wan-compression", - "type": "string" - }, - { - "name": "jpeg-wan-compression", - "type": "string" - }, - { - "name": "image-compression", - "type": "string" - }, - { - "name": "plaintext-channel", - "type": "string" - }, - { - "name": "tls-channel", - "type": "string" - }, - { - "name": "tls-ciphers", - "type": "string" - }, - { - "name": "x509-dh-key-file", - "type": "string" - }, - { - "name": "x509-cacert-file", - "type": "string" - }, - { - "name": "x509-cert-file", - "type": "string" - }, - { - "name": "x509-key-password", - "type": "string" - }, - { - "name": "x509-key-file", - "type": "string" - }, - { - "name": "x509-dir", - "type": "string" - }, - { - "name": "sasl", - "type": "boolean" - }, - { - "name": "disable-agent-file-xfer", - "type": "boolean" - }, - { - "name": "disable-copy-paste", - "type": "boolean" - }, - { - "name": "disable-ticketing", - "type": "boolean" - }, - { - "name": "password", - "type": "string" - }, - { - "name": "unix", - "type": "boolean" - }, - { - "name": "ipv6", - "type": "boolean" - }, - { - "name": "ipv4", - "type": "boolean" - }, - { - "name": "addr", - "type": "string" - }, - { - "name": "tls-port", - "type": "number" - }, - { - "name": "port", - "type": "number" - } - ], - "option": "spice" - }, { "parameters": [ { @@ -11041,8 +10915,132 @@ }, { "parameters": [ + { + "name": "rendernode", + "type": "string" + }, + { + "name": "gl", + "type": "boolean" + }, + { + "name": "head", + "type": "number" + }, + { + "name": "display", + "type": "string" + }, + { + "name": "seamless-migration", + "type": "boolean" + }, + { + "name": "playback-compression", + "type": "boolean" + }, + { + "name": "agent-mouse", + "type": "boolean" + }, + { + "name": "streaming-video", + "type": "string" + }, + { + "name": "zlib-glz-wan-compression", + "type": "string" + }, + { + "name": "jpeg-wan-compression", + "type": "string" + }, + { + "name": "image-compression", + "type": "string" + }, + { + "name": "plaintext-channel", + "type": "string" + }, + { + "name": "tls-channel", + "type": "string" + }, + { + "name": "tls-ciphers", + "type": "string" + }, + { + "name": "x509-dh-key-file", + "type": "string" + }, + { + "name": "x509-cacert-file", + "type": "string" + }, + { + "name": "x509-cert-file", + "type": "string" + }, + { + "name": "x509-key-password", + "type": "string" + }, + { + "name": "x509-key-file", + "type": "string" + }, + { + "name": "x509-dir", + "type": "string" + }, + { + "name": "sasl", + "type": "boolean" + }, + { + "name": "disable-agent-file-xfer", + "type": "boolean" + }, + { + "name": "disable-copy-paste", + "type": "boolean" + }, + { + "name": "disable-ticketing", + "type": "boolean" + }, + { + "name": "password", + "type": "string" + }, + { + "name": "unix", + "type": "boolean" + }, + { + "name": "ipv6", + "type": "boolean" + }, + { + "name": "ipv4", + "type": "boolean" + }, + { + "name": "addr", + "type": "string" + }, + { + "name": "tls-port", + "type": "number" + }, + { + "name": "port", + "type": "number" + } ], - "option": "smbios" + "option": "spice" }, { "parameters": [ @@ -11069,6 +11067,16 @@ ], "option": "sandbox" }, + { + "parameters": [ + ], + "option": "acpi" + }, + { + "parameters": [ + ], + "option": "smbios" + }, { "parameters": [ { @@ -24745,12 +24753,12 @@ "type": "str" }, { - "name": "tight", + "name": "abstract", "default": null, "type": "bool" }, { - "name": "abstract", + "name": "tight", "default": null, "type": "bool" } @@ -26652,7 +26660,7 @@ "sse4.1": true, "family": 23, "vmx-vmwrite-vmexit-fields": false, - "kvm-asyncpf-int": false, + "kvm-asyncpf-int": true, "vmx-vnmi": false, "vmx-true-ctls": false, "vmx-ept-execonly": false, @@ -26975,7 +26983,7 @@ "sse4.1": true, "family": 23, "vmx-vmwrite-vmexit-fields": false, - "kvm-asyncpf-int": false, + "kvm-asyncpf-int": true, "vmx-vnmi": false, "vmx-true-ctls": false, "vmx-ept-execonly": false, @@ -30357,6 +30365,14 @@ "deprecated": false, "default-ram-id": "pc.ram" }, + { + "hotpluggable-cpus": false, + "name": "none", + "numa-mem-supported": false, + "cpu-max": 1, + "deprecated": false, + "default-ram-id": "ram" + }, { "hotpluggable-cpus": true, "name": "pc-1.1", @@ -30366,14 +30382,6 @@ "deprecated": true, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": false, - "name": "none", - "numa-mem-supported": false, - "cpu-max": 1, - "deprecated": false, - "default-ram-id": "ram" - }, { "hotpluggable-cpus": true, "name": "pc-i440fx-2.7", diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 94a1945639..6706a8b8d4 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -249,10 +249,10 @@ - 5001050 + 5001091 0 43100243 - v5.1.0-2827-g2c6605389c + v5.2.0-rc1 x86_64 @@ -286,7 +286,7 @@ - +