[PATCH] tests: qemucapabilities: Update qemu caps dump for the qemu-7.0.0 release on x86_64
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property - 'cocoa' display and corresponding props (not present in this build) Changes in build: - dbus display driver re-enabled - gtk display support re-disabled - xen support re-disabled Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../caps_7.0.0.x86_64.replies | 583 ++++++++---------- .../caps_7.0.0.x86_64.xml | 10 +- 2 files changed, 257 insertions(+), 336 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies index d1f453dcca..620442704a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 92, - "minor": 2, - "major": 6 + "micro": 0, + "minor": 0, + "major": 7 }, - "package": "v7.0.0-rc2" + "package": "v7.0.0" }, "id": "libvirt-2" } @@ -5119,10 +5119,6 @@ "name": "135", "tag": "type", "variants": [ - { - "case": "gtk", - "type": "358" - }, { "case": "curses", "type": "360" @@ -5131,6 +5127,10 @@ "case": "egl-headless", "type": "361" }, + { + "case": "dbus", + "type": "362" + }, { "case": "default", "type": "0" @@ -10498,6 +10498,10 @@ "case": "qemu-vdagent", "type": "518" }, + { + "case": "dbus", + "type": "519" + }, { "case": "vc", "type": "520" @@ -11756,9 +11760,6 @@ { "name": "none" }, - { - "name": "gtk" - }, { "name": "sdl" }, @@ -11770,17 +11771,20 @@ }, { "name": "spice-app" + }, + { + "name": "dbus" } ], "meta-type": "enum", "values": [ "default", "none", - "gtk", "sdl", "egl-headless", "curses", - "spice-app" + "spice-app", + "dbus" ] }, { @@ -16067,6 +16071,9 @@ { "name": "qemu-vdagent" }, + { + "name": "dbus" + }, { "name": "vc" }, @@ -16097,6 +16104,7 @@ "spicevmc", "spiceport", "qemu-vdagent", + "dbus", "vc", "ringbuf", "memory" @@ -16202,6 +16210,16 @@ ], "meta-type": "object" }, + { + "name": "519", + "members": [ + { + "name": "data", + "type": "618" + } + ], + "meta-type": "object" + }, { "name": "520", "members": [ @@ -18460,6 +18478,26 @@ ], "meta-type": "object" }, + { + "name": "618", + "members": [ + { + "name": "logfile", + "default": null, + "type": "str" + }, + { + "name": "logappend", + "default": null, + "type": "bool" + }, + { + "name": "name", + "type": "str" + } + ], + "meta-type": "object" + }, { "name": "619", "members": [ @@ -20363,10 +20401,6 @@ "name": "acpi-erst", "parent": "pci-device" }, - { - "name": "virtio-crypto-device", - "parent": "virtio-device" - }, { "name": "isa-applesmc", "parent": "isa-device" @@ -20379,49 +20413,53 @@ "name": "vhost-user-input-pci", "parent": "vhost-user-input-pci-base-type" }, + { + "name": "usb-redir", + "parent": "usb-device" + }, { "name": "floppy-bus", "parent": "bus" }, { - "name": "Denverton-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-crypto-device", + "parent": "virtio-device" }, { "name": "chardev-testdev", "parent": "chardev" }, { - "name": "usb-wacom-tablet", - "parent": "usb-device" + "name": "Denverton-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "Icelake-Server-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pci-ipmi-bt", + "parent": "pci-device" }, { "name": "chardev-stdio", "parent": "chardev-fd" }, { - "name": "pci-ipmi-bt", - "parent": "pci-device" + "name": "usb-wacom-tablet", + "parent": "usb-device" }, { "name": "filter-buffer", "parent": "netfilter" }, { - "name": "secondary-vga", - "parent": "pci-vga" + "name": "Icelake-Server-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "ich9-usb-uhci6", "parent": "pci-uhci-usb" }, { - "name": "usb-redir", - "parent": "usb-device" + "name": "secondary-vga", + "parent": "pci-vga" }, { "name": "kvm-pit", @@ -20451,14 +20489,14 @@ "name": "sev-guest", "parent": "confidential-guest-support" }, - { - "name": "core2duo-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "ich9-usb-uhci5", "parent": "pci-uhci-usb" }, + { + "name": "core2duo-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "pcm3680_pci", "parent": "pci-device" @@ -20619,10 +20657,6 @@ "name": "pxb-host", "parent": "pci-host-bridge" }, - { - "name": "virtio-scsi-pci", - "parent": "virtio-scsi-pci-base" - }, { "name": "virtio-input-host-pci", "parent": "virtio-input-host-pci-base-type" @@ -20744,8 +20778,8 @@ "parent": "virtio-device" }, { - "name": "xenfv-4.2-machine", - "parent": "generic-pc-machine" + "name": "virtio-scsi-pci", + "parent": "virtio-scsi-pci-base" }, { "name": "ipmi-bmc-extern", @@ -20855,10 +20889,6 @@ "name": "pr-manager-helper", "parent": "pr-manager" }, - { - "name": "virtio-scsi-device", - "parent": "virtio-scsi-common" - }, { "name": "pc-i440fx-2.10-machine", "parent": "generic-pc-machine" @@ -20872,20 +20902,16 @@ "parent": "pci-device" }, { - "name": "xen-pci-passthrough", - "parent": "pci-device" - }, - { - "name": "Haswell-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-scsi-device", + "parent": "virtio-scsi-common" }, { "name": "pxb-pcie", "parent": "pci-device" }, { - "name": "cpu-cluster", - "parent": "device" + "name": "Haswell-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "vhost-user-i2c-pci", @@ -20896,7 +20922,7 @@ "parent": "object" }, { - "name": "xen-backend", + "name": "cpu-cluster", "parent": "device" }, { @@ -20904,16 +20930,16 @@ "parent": "sys-bus-device" }, { - "name": "Haswell-v3-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "i82557a", + "parent": "pci-device" }, { "name": "vhost-user-scsi-pci-non-transitional", "parent": "vhost-user-scsi-pci-base" }, { - "name": "i82557a", - "parent": "pci-device" + "name": "vmmouse", + "parent": "isa-device" }, { "name": "chardev-udp", @@ -20932,8 +20958,8 @@ "parent": "virtio-scsi-pci-base" }, { - "name": "vmmouse", - "parent": "isa-device" + "name": "Haswell-v3-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "migration", @@ -20976,8 +21002,8 @@ "parent": "x86_64-cpu" }, { - "name": "vhost-vsock-device", - "parent": "vhost-vsock-common" + "name": "chardev-dbus", + "parent": "chardev-socket" }, { "name": "Broadwell-v2-x86_64-cpu", @@ -20995,10 +21021,6 @@ "name": "EPYC-IBPB-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "Skylake-Server-v5-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "ib700", "parent": "isa-device" @@ -21008,7 +21030,7 @@ "parent": "x86-iommu" }, { - "name": "Nehalem-v2-x86_64-cpu", + "name": "Skylake-Server-v5-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -21016,16 +21038,16 @@ "parent": "virtio-9p-pci-base" }, { - "name": "igd-passthrough-i440FX", - "parent": "i440FX" + "name": "Nehalem-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "memory-backend-file", "parent": "memory-backend" }, { - "name": "xen-disk", - "parent": "xen-block" + "name": "vhost-vsock-device", + "parent": "vhost-vsock-common" }, { "name": "isa-pcspk", @@ -21036,25 +21058,21 @@ "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", "parent": "generic-pc-machine" }, - { - "name": "IvyBridge-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "virtio-blk-pci-non-transitional", "parent": "virtio-blk-pci-base" @@ -21064,13 +21082,17 @@ "parent": "device" }, { - "name": "ne2k_pci", - "parent": "pci-device" + "name": "IvyBridge-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "isabus-bridge", "parent": "sys-bus-device" }, + { + "name": "ne2k_pci", + "parent": "pci-device" + }, { "name": "usb-bus", "parent": "bus" @@ -21087,18 +21109,10 @@ "name": "tcg-accel", "parent": "accel" }, - { - "name": "i82551", - "parent": "pci-device" - }, { "name": "virtio-balloon-pci", "parent": "virtio-balloon-pci-base" }, - { - "name": "Cascadelake-Server-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "virtio-gpu-device", "parent": "virtio-gpu-base" @@ -21107,6 +21121,10 @@ "name": "e1000", "parent": "e1000-base" }, + { + "name": "Cascadelake-Server-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "athlon-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -21124,8 +21142,8 @@ "parent": "generic-pc-machine" }, { - "name": "xen-apic", - "parent": "apic-common" + "name": "i82551", + "parent": "pci-device" }, { "name": "EPYC-v1-x86_64-cpu", @@ -21159,14 +21177,14 @@ "name": "pc-q35-6.0-machine", "parent": "generic-pc-machine" }, - { - "name": "mioe3680_pci", - "parent": "pci-device" - }, { "name": "vhost-user-backend", "parent": "object" }, + { + "name": "mioe3680_pci", + "parent": "pci-device" + }, { "name": "vmxnet3", "parent": "pci-device" @@ -21204,24 +21222,24 @@ "parent": "smbus-device" }, { - "name": "virtio-serial-device", - "parent": "virtio-device" + "name": "dbus-display", + "parent": "object" }, { - "name": "virtio-serial-pci", - "parent": "virtio-serial-pci-base" + "name": "vhost-user-gpu-pci", + "parent": "vhost-user-gpu-pci-base-type" }, { - "name": "Denverton-v2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-serial-pci", + "parent": "virtio-serial-pci-base" }, { - "name": "xen-bridge", - "parent": "sys-bus-device" + "name": "virtio-serial-device", + "parent": "virtio-device" }, { - "name": "vhost-user-gpu-pci", - "parent": "vhost-user-gpu-pci-base-type" + "name": "Denverton-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "iothread", @@ -21243,14 +21261,14 @@ "name": "ati-vga", "parent": "pci-device" }, - { - "name": "pentium3-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "kvm-i8259", "parent": "pic-common" }, + { + "name": "pentium3-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "isa-serial", "parent": "isa-device" @@ -21311,18 +21329,10 @@ "name": "Opteron_G3-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "xen-cdrom", - "parent": "xen-block" - }, { "name": "Cooperlake-v2-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "EPYC-v3-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "isa-ide", "parent": "isa-device" @@ -21332,13 +21342,17 @@ "parent": "x86_64-cpu" }, { - "name": "sgx-epc", - "parent": "device" + "name": "EPYC-v3-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "scsi-cd", "parent": "scsi-disk-base" }, + { + "name": "sgx-epc", + "parent": "device" + }, { "name": "gpex-root", "parent": "pci-device" @@ -21407,17 +21421,13 @@ "name": "VGA", "parent": "pci-vga" }, - { - "name": "i440FX", - "parent": "pci-device" - }, { "name": "qio-channel-buffer", "parent": "qio-channel" }, { - "name": "xen-bus", - "parent": "bus" + "name": "i440FX", + "parent": "pci-device" }, { "name": "Penryn-v1-x86_64-cpu", @@ -21436,16 +21446,16 @@ "parent": "virtio-device" }, { - "name": "Icelake-Server-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pc-i440fx-3.1-machine", + "parent": "generic-pc-machine" }, { "name": "pci-serial-4x", "parent": "pci-device" }, { - "name": "pc-i440fx-3.1-machine", - "parent": "generic-pc-machine" + "name": "Icelake-Server-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "sga", @@ -21516,11 +21526,11 @@ "parent": "usb-device" }, { - "name": "IvyBridge-x86_64-cpu", + "name": "SandyBridge-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "SandyBridge-v1-x86_64-cpu", + "name": "IvyBridge-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -21583,10 +21593,6 @@ "name": "ccid-bus", "parent": "bus" }, - { - "name": "xen-pvdevice", - "parent": "pci-device" - }, { "name": "ide-hd", "parent": "ide-device" @@ -21619,14 +21625,14 @@ "name": "pc-i440fx-4.1-machine", "parent": "generic-pc-machine" }, - { - "name": "e1000-82544gc", - "parent": "e1000-base" - }, { "name": "chardev-spiceport", "parent": "chardev-spice" }, + { + "name": "e1000-82544gc", + "parent": "e1000-base" + }, { "name": "tls-creds-x509", "parent": "tls-creds" @@ -21659,10 +21665,6 @@ "name": "isa-cirrus-vga", "parent": "isa-device" }, - { - "name": "pvrdma", - "parent": "pci-device" - }, { "name": "qemu64-x86_64-cpu", "parent": "x86_64-cpu" @@ -21671,6 +21673,10 @@ "name": "Skylake-Server-v2-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "chardev-braille", + "parent": "chardev" + }, { "name": "pc-q35-4.1-machine", "parent": "generic-pc-machine" @@ -21703,14 +21709,14 @@ "name": "pc-testdev", "parent": "isa-device" }, - { - "name": "qio-channel-websock", - "parent": "qio-channel" - }, { "name": "megasas", "parent": "megasas-base" }, + { + "name": "qio-channel-websock", + "parent": "qio-channel" + }, { "name": "virtio-iommu-pci", "parent": "virtio-iommu-pci-base-type" @@ -21719,21 +21725,17 @@ "name": "pc-i440fx-6.1-machine", "parent": "generic-pc-machine" }, - { - "name": "vmcoreinfo", - "parent": "device" - }, { "name": "Icelake-Client-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "tpci200", - "parent": "pci-device" + "name": "vmcoreinfo", + "parent": "device" }, { - "name": "chardev-braille", - "parent": "chardev" + "name": "tpci200", + "parent": "pci-device" }, { "name": "rocker", @@ -21767,10 +21769,6 @@ "name": "qemu-console", "parent": "object" }, - { - "name": "chardev-socket", - "parent": "chardev" - }, { "name": "clock", "parent": "object" @@ -21808,20 +21806,20 @@ "parent": "device" }, { - "name": "Skylake-Server-IBRS-x86_64-cpu", + "name": "Cascadelake-Server-noTSX-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "virtio-pmem", - "parent": "virtio-device" + "name": "chardev-socket", + "parent": "chardev" }, { "name": "nvme-bus", "parent": "bus" }, { - "name": "xen-sysbus", - "parent": "bus" + "name": "virtconsole", + "parent": "virtserialport" }, { "name": "virtio-net-pci-non-transitional", @@ -21839,14 +21837,14 @@ "name": "scsi-hd", "parent": "scsi-disk-base" }, - { - "name": "Cascadelake-Server-noTSX-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "usb-kbd", "parent": "usb-hid" }, + { + "name": "lsi53c810", + "parent": "lsi53c895a" + }, { "name": "isa-fdc", "parent": "isa-device" @@ -21872,24 +21870,24 @@ "parent": "object" }, { - "name": "Westmere-v2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "ccid-card-emulated", + "parent": "ccid-card" }, { "name": "pc-q35-2.9-machine", "parent": "generic-pc-machine" }, { - "name": "Skylake-Client-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-pmem", + "parent": "virtio-device" }, { "name": "tpm-tis", "parent": "isa-device" }, { - "name": "virtconsole", - "parent": "virtserialport" + "name": "Skylake-Server-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "hyperv-testdev", @@ -21912,8 +21910,8 @@ "parent": "generic-pc-machine" }, { - "name": "ccid-card-emulated", - "parent": "ccid-card" + "name": "Westmere-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "pc-q35-5.1-machine", @@ -21928,8 +21926,8 @@ "parent": "virtio-input-hid-device" }, { - "name": "lsi53c810", - "parent": "lsi53c895a" + "name": "Skylake-Client-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "ioh3420", @@ -22031,10 +22029,6 @@ "name": "phenom-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "virtio-net-pci-transitional", - "parent": "virtio-net-pci-base" - }, { "name": "vhost-vsock-pci", "parent": "vhost-vsock-pci-base" @@ -22044,8 +22038,8 @@ "parent": "device" }, { - "name": "vhost-user-blk-pci-transitional", - "parent": "vhost-user-blk-pci-base" + "name": "virtio-net-pci-transitional", + "parent": "virtio-net-pci-base" }, { "name": "irq", @@ -22072,8 +22066,8 @@ "parent": "x86_64-cpu" }, { - "name": "xenfv-3.1-machine", - "parent": "generic-pc-machine" + "name": "vhost-user-blk-pci-transitional", + "parent": "vhost-user-blk-pci-base" }, { "name": "coreduo-x86_64-cpu", @@ -22159,21 +22153,17 @@ "name": "Skylake-Server-v4-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": "kvmvapic", + "parent": "sys-bus-device" }, { - "name": "authz-simple", - "parent": "authz" + "name": "nvme-ns", + "parent": "device" }, { "name": "Icelake-Server-v6-x86_64-cpu", @@ -22192,8 +22182,8 @@ "parent": "vhost-user-blk-pci-base" }, { - "name": "xen-accel", - "parent": "accel" + "name": "authz-simple", + "parent": "authz" }, { "name": "fw_cfg_io", @@ -22311,18 +22301,10 @@ "name": "qemu32-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "xen-sysdev", - "parent": "sys-bus-device" - }, { "name": "Haswell-noTSX-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "chardev-null", - "parent": "chardev" - }, { "name": "pci-serial", "parent": "pci-device" @@ -22351,10 +22333,6 @@ "name": "Opteron_G4-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "qio-channel-rdma", - "parent": "qio-channel" - }, { "name": "ne2k_isa", "parent": "isa-device" @@ -22375,14 +22353,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": "iommu-memory-region" @@ -22396,17 +22374,13 @@ "parent": "pci-device" }, { - "name": "Cooperlake-v1-x86_64-cpu", + "name": "Nehalem-IBRS-x86_64-cpu", "parent": "x86_64-cpu" }, { "name": "Cascadelake-Server-v3-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "vhost-user-rng-pci", - "parent": "vhost-user-rng-pci-base" - }, { "name": "cfi.pflash01", "parent": "sys-bus-device" @@ -22416,8 +22390,12 @@ "parent": "virtio-device" }, { - "name": "isa-parallel", - "parent": "isa-device" + "name": "chardev-null", + "parent": "chardev" + }, + { + "name": "Cooperlake-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "Skylake-Server-x86_64-cpu", @@ -22428,16 +22406,16 @@ "parent": "generic-pc-machine" }, { - "name": "Nehalem-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "isa-parallel", + "parent": "isa-device" }, { "name": "pentium2-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "xen-platform", - "parent": "pci-device" + "name": "vhost-user-rng-pci", + "parent": "vhost-user-rng-pci-base" }, { "name": "isa-vga", @@ -22476,20 +22454,20 @@ "parent": "rng-backend" }, { - "name": "Cascadelake-Server-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "qxl-vga", + "parent": "pci-qxl" }, { "name": "i82558b", "parent": "pci-device" }, { - "name": "ivshmem-doorbell", - "parent": "ivshmem-common" + "name": "Cascadelake-Server-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "qxl-vga", - "parent": "pci-qxl" + "name": "ivshmem-doorbell", + "parent": "ivshmem-common" }, { "name": "PIIX3-xen", @@ -22672,8 +22650,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": "IDE", @@ -22684,8 +22662,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": "mptsas1068", @@ -22696,17 +22674,13 @@ "parent": "scsi-disk-base" }, { - "name": "xenpv-machine", - "parent": "machine" + "name": "chardev-spicevmc", + "parent": "chardev-spice" }, { "name": "Snowridge-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "chardev-spicevmc", - "parent": "chardev-spice" - }, { "name": "q35-pcihost", "parent": "pcie-host-bridge" @@ -22771,6 +22745,10 @@ "name": "vhost-user-blk", "parent": "virtio-device" }, + { + "name": "SandyBridge-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "nvme-subsys", "parent": "device" @@ -22779,10 +22757,6 @@ "name": "Haswell-noTSX-IBRS-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "SandyBridge-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "pc-q35-5.2-machine", "parent": "generic-pc-machine" @@ -24538,6 +24512,11 @@ "name": "smm-compat", "type": "bool" }, + { + "default-value": false, + "name": "x-not-migrate-acpi-index", + "type": "bool" + }, { "default-value": 2, "name": "s4_val", @@ -29178,13 +29157,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": false, - "name": "xenpv", - "numa-mem-supported": false, - "cpu-max": 1, - "deprecated": false - }, { "hotpluggable-cpus": true, "name": "pc-i440fx-6.2", @@ -29283,16 +29255,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-3.1", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram", - "alias": "xenfv" - }, { "hotpluggable-cpus": true, "name": "pc-q35-2.4", @@ -29582,15 +29544,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-4.2", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram" - }, { "hotpluggable-cpus": false, "name": "microvm", @@ -32035,41 +31988,6 @@ ], "option": "machine" }, - { - "parameters": [ - { - "name": "timeout", - "help": "Request timeout in seconds (default 0 = no timeout)", - "type": "number" - }, - { - "name": "initiator-name", - "help": "Initiator iqn name to use when connecting", - "type": "string" - }, - { - "name": "header-digest", - "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", - "type": "string" - }, - { - "name": "password-secret", - "help": "ID of the secret providing password for CHAP authentication to target", - "type": "string" - }, - { - "name": "password", - "help": "password for CHAP authentication to target", - "type": "string" - }, - { - "name": "user", - "help": "username for CHAP authentication to target", - "type": "string" - } - ], - "option": "iscsi" - }, { "parameters": [ { @@ -32203,6 +32121,41 @@ ], "option": "spice" }, + { + "parameters": [ + { + "name": "timeout", + "help": "Request timeout in seconds (default 0 = no timeout)", + "type": "number" + }, + { + "name": "initiator-name", + "help": "Initiator iqn name to use when connecting", + "type": "string" + }, + { + "name": "header-digest", + "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", + "type": "string" + }, + { + "name": "password-secret", + "help": "ID of the secret providing password for CHAP authentication to target", + "type": "string" + }, + { + "name": "password", + "help": "password for CHAP authentication to target", + "type": "string" + }, + { + "name": "user", + "help": "username for CHAP authentication to target", + "type": "string" + } + ], + "option": "iscsi" + }, { "parameters": [ ], @@ -37593,13 +37546,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": false, - "name": "xenpv", - "numa-mem-supported": false, - "cpu-max": 1, - "deprecated": false - }, { "hotpluggable-cpus": true, "name": "pc-i440fx-6.2", @@ -37698,16 +37644,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-3.1", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram", - "alias": "xenfv" - }, { "hotpluggable-cpus": true, "name": "pc-q35-2.4", @@ -37997,15 +37933,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-4.2", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram" - }, { "hotpluggable-cpus": false, "name": "microvm", diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 87f9b4068d..8074c97ecd 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -242,10 +242,10 @@ <flag name='virtio-iommu-pci'/> <flag name='virtio-iommu.boot-bypass'/> <flag name='virtio-net.rss'/> - <version>6002092</version> + <version>7000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> - <package>v7.0.0-rc2</package> + <package>v7.0.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> @@ -1617,7 +1617,6 @@ <machine type='kvm' name='pc-q35-5.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='kvm' name='xenpv' maxCpus='1'/> <machine type='kvm' name='pc-i440fx-6.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -1628,7 +1627,6 @@ <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='kvm' name='xenfv-3.1' alias='xenfv' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='x-remote' maxCpus='1'/> @@ -1660,7 +1658,6 @@ <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='kvm' name='xenfv-4.2' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram'/> <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -3723,7 +3720,6 @@ <machine type='tcg' name='pc-q35-5.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='tcg' name='xenpv' maxCpus='1'/> <machine type='tcg' name='pc-i440fx-6.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -3734,7 +3730,6 @@ <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='tcg' name='xenfv-3.1' alias='xenfv' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='x-remote' maxCpus='1'/> @@ -3766,7 +3761,6 @@ <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='tcg' name='xenfv-4.2' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram'/> <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> -- 2.35.1
On Wed, 20 Apr 2022 13:02:12 +0200 Peter Krempa <pkrempa@redhat.com> wrote:
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property
do you do this for just for every new property? (nothing outside of QEMU needs to know about x-not-migrate-acpi-index, unless one is interested in whether it works or not)
- 'cocoa' display and corresponding props (not present in this build)
Changes in build: - dbus display driver re-enabled - gtk display support re-disabled - xen support re-disabled
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../caps_7.0.0.x86_64.replies | 583 ++++++++---------- .../caps_7.0.0.x86_64.xml | 10 +- 2 files changed, 257 insertions(+), 336 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies index d1f453dcca..620442704a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 92, - "minor": 2, - "major": 6 + "micro": 0, + "minor": 0, + "major": 7 }, - "package": "v7.0.0-rc2" + "package": "v7.0.0" }, "id": "libvirt-2" } @@ -5119,10 +5119,6 @@ "name": "135", "tag": "type", "variants": [ - { - "case": "gtk", - "type": "358" - }, { "case": "curses", "type": "360" @@ -5131,6 +5127,10 @@ "case": "egl-headless", "type": "361" }, + { + "case": "dbus", + "type": "362" + }, { "case": "default", "type": "0" @@ -10498,6 +10498,10 @@ "case": "qemu-vdagent", "type": "518" }, + { + "case": "dbus", + "type": "519" + }, { "case": "vc", "type": "520" @@ -11756,9 +11760,6 @@ { "name": "none" }, - { - "name": "gtk" - }, { "name": "sdl" }, @@ -11770,17 +11771,20 @@ }, { "name": "spice-app" + }, + { + "name": "dbus" } ], "meta-type": "enum", "values": [ "default", "none", - "gtk", "sdl", "egl-headless", "curses", - "spice-app" + "spice-app", + "dbus" ] }, { @@ -16067,6 +16071,9 @@ { "name": "qemu-vdagent" }, + { + "name": "dbus" + }, { "name": "vc" }, @@ -16097,6 +16104,7 @@ "spicevmc", "spiceport", "qemu-vdagent", + "dbus", "vc", "ringbuf", "memory" @@ -16202,6 +16210,16 @@ ], "meta-type": "object" }, + { + "name": "519", + "members": [ + { + "name": "data", + "type": "618" + } + ], + "meta-type": "object" + }, { "name": "520", "members": [ @@ -18460,6 +18478,26 @@ ], "meta-type": "object" }, + { + "name": "618", + "members": [ + { + "name": "logfile", + "default": null, + "type": "str" + }, + { + "name": "logappend", + "default": null, + "type": "bool" + }, + { + "name": "name", + "type": "str" + } + ], + "meta-type": "object" + }, { "name": "619", "members": [ @@ -20363,10 +20401,6 @@ "name": "acpi-erst", "parent": "pci-device" }, - { - "name": "virtio-crypto-device", - "parent": "virtio-device" - }, { "name": "isa-applesmc", "parent": "isa-device" @@ -20379,49 +20413,53 @@ "name": "vhost-user-input-pci", "parent": "vhost-user-input-pci-base-type" }, + { + "name": "usb-redir", + "parent": "usb-device" + }, { "name": "floppy-bus", "parent": "bus" }, { - "name": "Denverton-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-crypto-device", + "parent": "virtio-device" }, { "name": "chardev-testdev", "parent": "chardev" }, { - "name": "usb-wacom-tablet", - "parent": "usb-device" + "name": "Denverton-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "Icelake-Server-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pci-ipmi-bt", + "parent": "pci-device" }, { "name": "chardev-stdio", "parent": "chardev-fd" }, { - "name": "pci-ipmi-bt", - "parent": "pci-device" + "name": "usb-wacom-tablet", + "parent": "usb-device" }, { "name": "filter-buffer", "parent": "netfilter" }, { - "name": "secondary-vga", - "parent": "pci-vga" + "name": "Icelake-Server-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "ich9-usb-uhci6", "parent": "pci-uhci-usb" }, { - "name": "usb-redir", - "parent": "usb-device" + "name": "secondary-vga", + "parent": "pci-vga" }, { "name": "kvm-pit", @@ -20451,14 +20489,14 @@ "name": "sev-guest", "parent": "confidential-guest-support" }, - { - "name": "core2duo-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "ich9-usb-uhci5", "parent": "pci-uhci-usb" }, + { + "name": "core2duo-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "pcm3680_pci", "parent": "pci-device" @@ -20619,10 +20657,6 @@ "name": "pxb-host", "parent": "pci-host-bridge" }, - { - "name": "virtio-scsi-pci", - "parent": "virtio-scsi-pci-base" - }, { "name": "virtio-input-host-pci", "parent": "virtio-input-host-pci-base-type" @@ -20744,8 +20778,8 @@ "parent": "virtio-device" }, { - "name": "xenfv-4.2-machine", - "parent": "generic-pc-machine" + "name": "virtio-scsi-pci", + "parent": "virtio-scsi-pci-base" }, { "name": "ipmi-bmc-extern", @@ -20855,10 +20889,6 @@ "name": "pr-manager-helper", "parent": "pr-manager" }, - { - "name": "virtio-scsi-device", - "parent": "virtio-scsi-common" - }, { "name": "pc-i440fx-2.10-machine", "parent": "generic-pc-machine" @@ -20872,20 +20902,16 @@ "parent": "pci-device" }, { - "name": "xen-pci-passthrough", - "parent": "pci-device" - }, - { - "name": "Haswell-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-scsi-device", + "parent": "virtio-scsi-common" }, { "name": "pxb-pcie", "parent": "pci-device" }, { - "name": "cpu-cluster", - "parent": "device" + "name": "Haswell-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "vhost-user-i2c-pci", @@ -20896,7 +20922,7 @@ "parent": "object" }, { - "name": "xen-backend", + "name": "cpu-cluster", "parent": "device" }, { @@ -20904,16 +20930,16 @@ "parent": "sys-bus-device" }, { - "name": "Haswell-v3-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "i82557a", + "parent": "pci-device" }, { "name": "vhost-user-scsi-pci-non-transitional", "parent": "vhost-user-scsi-pci-base" }, { - "name": "i82557a", - "parent": "pci-device" + "name": "vmmouse", + "parent": "isa-device" }, { "name": "chardev-udp", @@ -20932,8 +20958,8 @@ "parent": "virtio-scsi-pci-base" }, { - "name": "vmmouse", - "parent": "isa-device" + "name": "Haswell-v3-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "migration", @@ -20976,8 +21002,8 @@ "parent": "x86_64-cpu" }, { - "name": "vhost-vsock-device", - "parent": "vhost-vsock-common" + "name": "chardev-dbus", + "parent": "chardev-socket" }, { "name": "Broadwell-v2-x86_64-cpu", @@ -20995,10 +21021,6 @@ "name": "EPYC-IBPB-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "Skylake-Server-v5-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "ib700", "parent": "isa-device" @@ -21008,7 +21030,7 @@ "parent": "x86-iommu" }, { - "name": "Nehalem-v2-x86_64-cpu", + "name": "Skylake-Server-v5-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -21016,16 +21038,16 @@ "parent": "virtio-9p-pci-base" }, { - "name": "igd-passthrough-i440FX", - "parent": "i440FX" + "name": "Nehalem-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "memory-backend-file", "parent": "memory-backend" }, { - "name": "xen-disk", - "parent": "xen-block" + "name": "vhost-vsock-device", + "parent": "vhost-vsock-common" }, { "name": "isa-pcspk", @@ -21036,25 +21058,21 @@ "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", "parent": "generic-pc-machine" }, - { - "name": "IvyBridge-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "virtio-blk-pci-non-transitional", "parent": "virtio-blk-pci-base" @@ -21064,13 +21082,17 @@ "parent": "device" }, { - "name": "ne2k_pci", - "parent": "pci-device" + "name": "IvyBridge-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "isabus-bridge", "parent": "sys-bus-device" }, + { + "name": "ne2k_pci", + "parent": "pci-device" + }, { "name": "usb-bus", "parent": "bus" @@ -21087,18 +21109,10 @@ "name": "tcg-accel", "parent": "accel" }, - { - "name": "i82551", - "parent": "pci-device" - }, { "name": "virtio-balloon-pci", "parent": "virtio-balloon-pci-base" }, - { - "name": "Cascadelake-Server-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "virtio-gpu-device", "parent": "virtio-gpu-base" @@ -21107,6 +21121,10 @@ "name": "e1000", "parent": "e1000-base" }, + { + "name": "Cascadelake-Server-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "athlon-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -21124,8 +21142,8 @@ "parent": "generic-pc-machine" }, { - "name": "xen-apic", - "parent": "apic-common" + "name": "i82551", + "parent": "pci-device" }, { "name": "EPYC-v1-x86_64-cpu", @@ -21159,14 +21177,14 @@ "name": "pc-q35-6.0-machine", "parent": "generic-pc-machine" }, - { - "name": "mioe3680_pci", - "parent": "pci-device" - }, { "name": "vhost-user-backend", "parent": "object" }, + { + "name": "mioe3680_pci", + "parent": "pci-device" + }, { "name": "vmxnet3", "parent": "pci-device" @@ -21204,24 +21222,24 @@ "parent": "smbus-device" }, { - "name": "virtio-serial-device", - "parent": "virtio-device" + "name": "dbus-display", + "parent": "object" }, { - "name": "virtio-serial-pci", - "parent": "virtio-serial-pci-base" + "name": "vhost-user-gpu-pci", + "parent": "vhost-user-gpu-pci-base-type" }, { - "name": "Denverton-v2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-serial-pci", + "parent": "virtio-serial-pci-base" }, { - "name": "xen-bridge", - "parent": "sys-bus-device" + "name": "virtio-serial-device", + "parent": "virtio-device" }, { - "name": "vhost-user-gpu-pci", - "parent": "vhost-user-gpu-pci-base-type" + "name": "Denverton-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "iothread", @@ -21243,14 +21261,14 @@ "name": "ati-vga", "parent": "pci-device" }, - { - "name": "pentium3-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "kvm-i8259", "parent": "pic-common" }, + { + "name": "pentium3-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "isa-serial", "parent": "isa-device" @@ -21311,18 +21329,10 @@ "name": "Opteron_G3-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "xen-cdrom", - "parent": "xen-block" - }, { "name": "Cooperlake-v2-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "EPYC-v3-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "isa-ide", "parent": "isa-device" @@ -21332,13 +21342,17 @@ "parent": "x86_64-cpu" }, { - "name": "sgx-epc", - "parent": "device" + "name": "EPYC-v3-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "scsi-cd", "parent": "scsi-disk-base" }, + { + "name": "sgx-epc", + "parent": "device" + }, { "name": "gpex-root", "parent": "pci-device" @@ -21407,17 +21421,13 @@ "name": "VGA", "parent": "pci-vga" }, - { - "name": "i440FX", - "parent": "pci-device" - }, { "name": "qio-channel-buffer", "parent": "qio-channel" }, { - "name": "xen-bus", - "parent": "bus" + "name": "i440FX", + "parent": "pci-device" }, { "name": "Penryn-v1-x86_64-cpu", @@ -21436,16 +21446,16 @@ "parent": "virtio-device" }, { - "name": "Icelake-Server-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pc-i440fx-3.1-machine", + "parent": "generic-pc-machine" }, { "name": "pci-serial-4x", "parent": "pci-device" }, { - "name": "pc-i440fx-3.1-machine", - "parent": "generic-pc-machine" + "name": "Icelake-Server-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "sga", @@ -21516,11 +21526,11 @@ "parent": "usb-device" }, { - "name": "IvyBridge-x86_64-cpu", + "name": "SandyBridge-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "SandyBridge-v1-x86_64-cpu", + "name": "IvyBridge-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -21583,10 +21593,6 @@ "name": "ccid-bus", "parent": "bus" }, - { - "name": "xen-pvdevice", - "parent": "pci-device" - }, { "name": "ide-hd", "parent": "ide-device" @@ -21619,14 +21625,14 @@ "name": "pc-i440fx-4.1-machine", "parent": "generic-pc-machine" }, - { - "name": "e1000-82544gc", - "parent": "e1000-base" - }, { "name": "chardev-spiceport", "parent": "chardev-spice" }, + { + "name": "e1000-82544gc", + "parent": "e1000-base" + }, { "name": "tls-creds-x509", "parent": "tls-creds" @@ -21659,10 +21665,6 @@ "name": "isa-cirrus-vga", "parent": "isa-device" }, - { - "name": "pvrdma", - "parent": "pci-device" - }, { "name": "qemu64-x86_64-cpu", "parent": "x86_64-cpu" @@ -21671,6 +21673,10 @@ "name": "Skylake-Server-v2-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "chardev-braille", + "parent": "chardev" + }, { "name": "pc-q35-4.1-machine", "parent": "generic-pc-machine" @@ -21703,14 +21709,14 @@ "name": "pc-testdev", "parent": "isa-device" }, - { - "name": "qio-channel-websock", - "parent": "qio-channel" - }, { "name": "megasas", "parent": "megasas-base" }, + { + "name": "qio-channel-websock", + "parent": "qio-channel" + }, { "name": "virtio-iommu-pci", "parent": "virtio-iommu-pci-base-type" @@ -21719,21 +21725,17 @@ "name": "pc-i440fx-6.1-machine", "parent": "generic-pc-machine" }, - { - "name": "vmcoreinfo", - "parent": "device" - }, { "name": "Icelake-Client-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "tpci200", - "parent": "pci-device" + "name": "vmcoreinfo", + "parent": "device" }, { - "name": "chardev-braille", - "parent": "chardev" + "name": "tpci200", + "parent": "pci-device" }, { "name": "rocker", @@ -21767,10 +21769,6 @@ "name": "qemu-console", "parent": "object" }, - { - "name": "chardev-socket", - "parent": "chardev" - }, { "name": "clock", "parent": "object" @@ -21808,20 +21806,20 @@ "parent": "device" }, { - "name": "Skylake-Server-IBRS-x86_64-cpu", + "name": "Cascadelake-Server-noTSX-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "virtio-pmem", - "parent": "virtio-device" + "name": "chardev-socket", + "parent": "chardev" }, { "name": "nvme-bus", "parent": "bus" }, { - "name": "xen-sysbus", - "parent": "bus" + "name": "virtconsole", + "parent": "virtserialport" }, { "name": "virtio-net-pci-non-transitional", @@ -21839,14 +21837,14 @@ "name": "scsi-hd", "parent": "scsi-disk-base" }, - { - "name": "Cascadelake-Server-noTSX-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "usb-kbd", "parent": "usb-hid" }, + { + "name": "lsi53c810", + "parent": "lsi53c895a" + }, { "name": "isa-fdc", "parent": "isa-device" @@ -21872,24 +21870,24 @@ "parent": "object" }, { - "name": "Westmere-v2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "ccid-card-emulated", + "parent": "ccid-card" }, { "name": "pc-q35-2.9-machine", "parent": "generic-pc-machine" }, { - "name": "Skylake-Client-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-pmem", + "parent": "virtio-device" }, { "name": "tpm-tis", "parent": "isa-device" }, { - "name": "virtconsole", - "parent": "virtserialport" + "name": "Skylake-Server-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "hyperv-testdev", @@ -21912,8 +21910,8 @@ "parent": "generic-pc-machine" }, { - "name": "ccid-card-emulated", - "parent": "ccid-card" + "name": "Westmere-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "pc-q35-5.1-machine", @@ -21928,8 +21926,8 @@ "parent": "virtio-input-hid-device" }, { - "name": "lsi53c810", - "parent": "lsi53c895a" + "name": "Skylake-Client-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "ioh3420", @@ -22031,10 +22029,6 @@ "name": "phenom-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "virtio-net-pci-transitional", - "parent": "virtio-net-pci-base" - }, { "name": "vhost-vsock-pci", "parent": "vhost-vsock-pci-base" @@ -22044,8 +22038,8 @@ "parent": "device" }, { - "name": "vhost-user-blk-pci-transitional", - "parent": "vhost-user-blk-pci-base" + "name": "virtio-net-pci-transitional", + "parent": "virtio-net-pci-base" }, { "name": "irq", @@ -22072,8 +22066,8 @@ "parent": "x86_64-cpu" }, { - "name": "xenfv-3.1-machine", - "parent": "generic-pc-machine" + "name": "vhost-user-blk-pci-transitional", + "parent": "vhost-user-blk-pci-base" }, { "name": "coreduo-x86_64-cpu", @@ -22159,21 +22153,17 @@ "name": "Skylake-Server-v4-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": "kvmvapic", + "parent": "sys-bus-device" }, { - "name": "authz-simple", - "parent": "authz" + "name": "nvme-ns", + "parent": "device" }, { "name": "Icelake-Server-v6-x86_64-cpu", @@ -22192,8 +22182,8 @@ "parent": "vhost-user-blk-pci-base" }, { - "name": "xen-accel", - "parent": "accel" + "name": "authz-simple", + "parent": "authz" }, { "name": "fw_cfg_io", @@ -22311,18 +22301,10 @@ "name": "qemu32-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "xen-sysdev", - "parent": "sys-bus-device" - }, { "name": "Haswell-noTSX-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "chardev-null", - "parent": "chardev" - }, { "name": "pci-serial", "parent": "pci-device" @@ -22351,10 +22333,6 @@ "name": "Opteron_G4-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "qio-channel-rdma", - "parent": "qio-channel" - }, { "name": "ne2k_isa", "parent": "isa-device" @@ -22375,14 +22353,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": "iommu-memory-region" @@ -22396,17 +22374,13 @@ "parent": "pci-device" }, { - "name": "Cooperlake-v1-x86_64-cpu", + "name": "Nehalem-IBRS-x86_64-cpu", "parent": "x86_64-cpu" }, { "name": "Cascadelake-Server-v3-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "vhost-user-rng-pci", - "parent": "vhost-user-rng-pci-base" - }, { "name": "cfi.pflash01", "parent": "sys-bus-device" @@ -22416,8 +22390,12 @@ "parent": "virtio-device" }, { - "name": "isa-parallel", - "parent": "isa-device" + "name": "chardev-null", + "parent": "chardev" + }, + { + "name": "Cooperlake-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "Skylake-Server-x86_64-cpu", @@ -22428,16 +22406,16 @@ "parent": "generic-pc-machine" }, { - "name": "Nehalem-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "isa-parallel", + "parent": "isa-device" }, { "name": "pentium2-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "xen-platform", - "parent": "pci-device" + "name": "vhost-user-rng-pci", + "parent": "vhost-user-rng-pci-base" }, { "name": "isa-vga", @@ -22476,20 +22454,20 @@ "parent": "rng-backend" }, { - "name": "Cascadelake-Server-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "qxl-vga", + "parent": "pci-qxl" }, { "name": "i82558b", "parent": "pci-device" }, { - "name": "ivshmem-doorbell", - "parent": "ivshmem-common" + "name": "Cascadelake-Server-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "qxl-vga", - "parent": "pci-qxl" + "name": "ivshmem-doorbell", + "parent": "ivshmem-common" }, { "name": "PIIX3-xen", @@ -22672,8 +22650,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": "IDE", @@ -22684,8 +22662,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": "mptsas1068", @@ -22696,17 +22674,13 @@ "parent": "scsi-disk-base" }, { - "name": "xenpv-machine", - "parent": "machine" + "name": "chardev-spicevmc", + "parent": "chardev-spice" }, { "name": "Snowridge-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "chardev-spicevmc", - "parent": "chardev-spice" - }, { "name": "q35-pcihost", "parent": "pcie-host-bridge" @@ -22771,6 +22745,10 @@ "name": "vhost-user-blk", "parent": "virtio-device" }, + { + "name": "SandyBridge-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "nvme-subsys", "parent": "device" @@ -22779,10 +22757,6 @@ "name": "Haswell-noTSX-IBRS-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "SandyBridge-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "pc-q35-5.2-machine", "parent": "generic-pc-machine" @@ -24538,6 +24512,11 @@ "name": "smm-compat", "type": "bool" }, + { + "default-value": false, + "name": "x-not-migrate-acpi-index", + "type": "bool" + }, { "default-value": 2, "name": "s4_val", @@ -29178,13 +29157,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": false, - "name": "xenpv", - "numa-mem-supported": false, - "cpu-max": 1, - "deprecated": false - }, { "hotpluggable-cpus": true, "name": "pc-i440fx-6.2", @@ -29283,16 +29255,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-3.1", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram", - "alias": "xenfv" - }, { "hotpluggable-cpus": true, "name": "pc-q35-2.4", @@ -29582,15 +29544,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-4.2", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram" - }, { "hotpluggable-cpus": false, "name": "microvm", @@ -32035,41 +31988,6 @@ ], "option": "machine" }, - { - "parameters": [ - { - "name": "timeout", - "help": "Request timeout in seconds (default 0 = no timeout)", - "type": "number" - }, - { - "name": "initiator-name", - "help": "Initiator iqn name to use when connecting", - "type": "string" - }, - { - "name": "header-digest", - "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", - "type": "string" - }, - { - "name": "password-secret", - "help": "ID of the secret providing password for CHAP authentication to target", - "type": "string" - }, - { - "name": "password", - "help": "password for CHAP authentication to target", - "type": "string" - }, - { - "name": "user", - "help": "username for CHAP authentication to target", - "type": "string" - } - ], - "option": "iscsi" - }, { "parameters": [ { @@ -32203,6 +32121,41 @@ ], "option": "spice" }, + { + "parameters": [ + { + "name": "timeout", + "help": "Request timeout in seconds (default 0 = no timeout)", + "type": "number" + }, + { + "name": "initiator-name", + "help": "Initiator iqn name to use when connecting", + "type": "string" + }, + { + "name": "header-digest", + "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", + "type": "string" + }, + { + "name": "password-secret", + "help": "ID of the secret providing password for CHAP authentication to target", + "type": "string" + }, + { + "name": "password", + "help": "password for CHAP authentication to target", + "type": "string" + }, + { + "name": "user", + "help": "username for CHAP authentication to target", + "type": "string" + } + ], + "option": "iscsi" + }, { "parameters": [ ], @@ -37593,13 +37546,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": false, - "name": "xenpv", - "numa-mem-supported": false, - "cpu-max": 1, - "deprecated": false - }, { "hotpluggable-cpus": true, "name": "pc-i440fx-6.2", @@ -37698,16 +37644,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-3.1", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram", - "alias": "xenfv" - }, { "hotpluggable-cpus": true, "name": "pc-q35-2.4", @@ -37997,15 +37933,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-4.2", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram" - }, { "hotpluggable-cpus": false, "name": "microvm", diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 87f9b4068d..8074c97ecd 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -242,10 +242,10 @@ <flag name='virtio-iommu-pci'/> <flag name='virtio-iommu.boot-bypass'/> <flag name='virtio-net.rss'/> - <version>6002092</version> + <version>7000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> - <package>v7.0.0-rc2</package> + <package>v7.0.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> @@ -1617,7 +1617,6 @@ <machine type='kvm' name='pc-q35-5.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='kvm' name='xenpv' maxCpus='1'/> <machine type='kvm' name='pc-i440fx-6.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -1628,7 +1627,6 @@ <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='kvm' name='xenfv-3.1' alias='xenfv' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='x-remote' maxCpus='1'/> @@ -1660,7 +1658,6 @@ <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='kvm' name='xenfv-4.2' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram'/> <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -3723,7 +3720,6 @@ <machine type='tcg' name='pc-q35-5.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='tcg' name='xenpv' maxCpus='1'/> <machine type='tcg' name='pc-i440fx-6.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -3734,7 +3730,6 @@ <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='tcg' name='xenfv-3.1' alias='xenfv' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='x-remote' maxCpus='1'/> @@ -3766,7 +3761,6 @@ <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='tcg' name='xenfv-4.2' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram'/> <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
On Wed, Apr 20, 2022 at 01:15:43PM +0200, Igor Mammedov wrote:
On Wed, 20 Apr 2022 13:02:12 +0200 Peter Krempa <pkrempa@redhat.com> wrote:
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property
do you do this for just for every new property? (nothing outside of QEMU needs to know about x-not-migrate-acpi-index, unless one is interested in whether it works or not)
This is simply a record of what QEMU reports when you query properties for the devices libvirt cares about. If nothing outside is supposed to know about x-not-migrate-acpi-index then QEMU shouldn't tell us about it when asked for properties :-) With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On Wed, 20 Apr 2022 12:21:03 +0100 Daniel P. Berrangé <berrange@redhat.com> wrote:
On Wed, Apr 20, 2022 at 01:15:43PM +0200, Igor Mammedov wrote:
On Wed, 20 Apr 2022 13:02:12 +0200 Peter Krempa <pkrempa@redhat.com> wrote:
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property
do you do this for just for every new property? (nothing outside of QEMU needs to know about x-not-migrate-acpi-index, unless one is interested in whether it works or not)
This is simply a record of what QEMU reports when you query properties for the devices libvirt cares about.
I was just curious why libvirt does it.
If nothing outside is supposed to know about x-not-migrate-acpi-index then QEMU shouldn't tell us about it when asked for properties :-)
Does livirt uses/exposes x- prefixed property anywhere? (i.e. can QEMU hide them?)
With regards, Daniel
On Wed, Apr 20, 2022 at 02:00:52PM +0200, Igor Mammedov wrote:
On Wed, 20 Apr 2022 12:21:03 +0100 Daniel P. Berrangé <berrange@redhat.com> wrote:
On Wed, Apr 20, 2022 at 01:15:43PM +0200, Igor Mammedov wrote:
On Wed, 20 Apr 2022 13:02:12 +0200 Peter Krempa <pkrempa@redhat.com> wrote:
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property
do you do this for just for every new property? (nothing outside of QEMU needs to know about x-not-migrate-acpi-index, unless one is interested in whether it works or not)
This is simply a record of what QEMU reports when you query properties for the devices libvirt cares about.
I was just curious why libvirt does it.
If nothing outside is supposed to know about x-not-migrate-acpi-index then QEMU shouldn't tell us about it when asked for properties :-)
Does livirt uses/exposes x- prefixed property anywhere? (i.e. can QEMU hide them?)
No, as a policy libvirt won't touch x- properties from QEMU at all. Note, these data files are just used for unit tests to validate certain parts of libvirt rather than require the actual QEMU binaries to exist during unit tests. With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On Wed, Apr 20, 2022 at 14:00:52 +0200, Igor Mammedov wrote:
On Wed, 20 Apr 2022 12:21:03 +0100 Daniel P. Berrangé <berrange@redhat.com> wrote:
On Wed, Apr 20, 2022 at 01:15:43PM +0200, Igor Mammedov wrote:
On Wed, 20 Apr 2022 13:02:12 +0200 Peter Krempa <pkrempa@redhat.com> wrote:
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property
do you do this for just for every new property? (nothing outside of QEMU needs to know about x-not-migrate-acpi-index, unless one is interested in whether it works or not)
This is simply a record of what QEMU reports when you query properties for the devices libvirt cares about.
I was just curious why libvirt does it.
If nothing outside is supposed to know about x-not-migrate-acpi-index then QEMU shouldn't tell us about it when asked for properties :-)
Does livirt uses/exposes x- prefixed property anywhere? (i.e. can QEMU hide them?)
I don't think it's needed to hide them. In fact we have strong rules against using them. With one notable exception: -object memory-backend-file,x-use-canonical-path-for-ramblock-id= But this was discussed extensively on the qemu list and qemu pledges that this specific property is considered stable.
On Wed, 20 Apr 2022 14:13:00 +0200 Peter Krempa <pkrempa@redhat.com> wrote:
On Wed, Apr 20, 2022 at 14:00:52 +0200, Igor Mammedov wrote:
On Wed, 20 Apr 2022 12:21:03 +0100 Daniel P. Berrangé <berrange@redhat.com> wrote:
On Wed, Apr 20, 2022 at 01:15:43PM +0200, Igor Mammedov wrote:
On Wed, 20 Apr 2022 13:02:12 +0200 Peter Krempa <pkrempa@redhat.com> wrote:
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property
do you do this for just for every new property? (nothing outside of QEMU needs to know about x-not-migrate-acpi-index, unless one is interested in whether it works or not)
This is simply a record of what QEMU reports when you query properties for the devices libvirt cares about.
I was just curious why libvirt does it.
If nothing outside is supposed to know about x-not-migrate-acpi-index then QEMU shouldn't tell us about it when asked for properties :-)
Does livirt uses/exposes x- prefixed property anywhere? (i.e. can QEMU hide them?)
I don't think it's needed to hide them. In fact we have strong rules against using them.
With one notable exception:
-object memory-backend-file,x-use-canonical-path-for-ramblock-id=
But this was discussed extensively on the qemu list and qemu pledges that this specific property is considered stable.
ok lets leave it as is.
On Wed, Apr 20, 2022 at 4:46 PM Igor Mammedov <imammedo@redhat.com> wrote:
On Wed, 20 Apr 2022 13:02:12 +0200 Peter Krempa <pkrempa@redhat.com> wrote:
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property
do you do this for just for every new property? (nothing outside of QEMU needs to know about x-not-migrate-acpi-index, unless one is interested in whether it works or not)
Any new property that is prefixed with "x-" should not be exposed through libvirt. They are experimental, unstable and can change any time in the future.
- 'cocoa' display and corresponding props (not present in this build)
Changes in build: - dbus display driver re-enabled - gtk display support re-disabled - xen support re-disabled
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../caps_7.0.0.x86_64.replies | 583 ++++++++---------- .../caps_7.0.0.x86_64.xml | 10 +- 2 files changed, 257 insertions(+), 336 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies index d1f453dcca..620442704a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 92, - "minor": 2, - "major": 6 + "micro": 0, + "minor": 0, + "major": 7 }, - "package": "v7.0.0-rc2" + "package": "v7.0.0" }, "id": "libvirt-2" } @@ -5119,10 +5119,6 @@ "name": "135", "tag": "type", "variants": [ - { - "case": "gtk", - "type": "358" - }, { "case": "curses", "type": "360" @@ -5131,6 +5127,10 @@ "case": "egl-headless", "type": "361" }, + { + "case": "dbus", + "type": "362" + }, { "case": "default", "type": "0" @@ -10498,6 +10498,10 @@ "case": "qemu-vdagent", "type": "518" }, + { + "case": "dbus", + "type": "519" + }, { "case": "vc", "type": "520" @@ -11756,9 +11760,6 @@ { "name": "none" }, - { - "name": "gtk" - }, { "name": "sdl" }, @@ -11770,17 +11771,20 @@ }, { "name": "spice-app" + }, + { + "name": "dbus" } ], "meta-type": "enum", "values": [ "default", "none", - "gtk", "sdl", "egl-headless", "curses", - "spice-app" + "spice-app", + "dbus" ] }, { @@ -16067,6 +16071,9 @@ { "name": "qemu-vdagent" }, + { + "name": "dbus" + }, { "name": "vc" }, @@ -16097,6 +16104,7 @@ "spicevmc", "spiceport", "qemu-vdagent", + "dbus", "vc", "ringbuf", "memory" @@ -16202,6 +16210,16 @@ ], "meta-type": "object" }, + { + "name": "519", + "members": [ + { + "name": "data", + "type": "618" + } + ], + "meta-type": "object" + }, { "name": "520", "members": [ @@ -18460,6 +18478,26 @@ ], "meta-type": "object" }, + { + "name": "618", + "members": [ + { + "name": "logfile", + "default": null, + "type": "str" + }, + { + "name": "logappend", + "default": null, + "type": "bool" + }, + { + "name": "name", + "type": "str" + } + ], + "meta-type": "object" + }, { "name": "619", "members": [ @@ -20363,10 +20401,6 @@ "name": "acpi-erst", "parent": "pci-device" }, - { - "name": "virtio-crypto-device", - "parent": "virtio-device" - }, { "name": "isa-applesmc", "parent": "isa-device" @@ -20379,49 +20413,53 @@ "name": "vhost-user-input-pci", "parent": "vhost-user-input-pci-base-type" }, + { + "name": "usb-redir", + "parent": "usb-device" + }, { "name": "floppy-bus", "parent": "bus" }, { - "name": "Denverton-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-crypto-device", + "parent": "virtio-device" }, { "name": "chardev-testdev", "parent": "chardev" }, { - "name": "usb-wacom-tablet", - "parent": "usb-device" + "name": "Denverton-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "Icelake-Server-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pci-ipmi-bt", + "parent": "pci-device" }, { "name": "chardev-stdio", "parent": "chardev-fd" }, { - "name": "pci-ipmi-bt", - "parent": "pci-device" + "name": "usb-wacom-tablet", + "parent": "usb-device" }, { "name": "filter-buffer", "parent": "netfilter" }, { - "name": "secondary-vga", - "parent": "pci-vga" + "name": "Icelake-Server-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "ich9-usb-uhci6", "parent": "pci-uhci-usb" }, { - "name": "usb-redir", - "parent": "usb-device" + "name": "secondary-vga", + "parent": "pci-vga" }, { "name": "kvm-pit", @@ -20451,14 +20489,14 @@ "name": "sev-guest", "parent": "confidential-guest-support" }, - { - "name": "core2duo-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "ich9-usb-uhci5", "parent": "pci-uhci-usb" }, + { + "name": "core2duo-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "pcm3680_pci", "parent": "pci-device" @@ -20619,10 +20657,6 @@ "name": "pxb-host", "parent": "pci-host-bridge" }, - { - "name": "virtio-scsi-pci", - "parent": "virtio-scsi-pci-base" - }, { "name": "virtio-input-host-pci", "parent": "virtio-input-host-pci-base-type" @@ -20744,8 +20778,8 @@ "parent": "virtio-device" }, { - "name": "xenfv-4.2-machine", - "parent": "generic-pc-machine" + "name": "virtio-scsi-pci", + "parent": "virtio-scsi-pci-base" }, { "name": "ipmi-bmc-extern", @@ -20855,10 +20889,6 @@ "name": "pr-manager-helper", "parent": "pr-manager" }, - { - "name": "virtio-scsi-device", - "parent": "virtio-scsi-common" - }, { "name": "pc-i440fx-2.10-machine", "parent": "generic-pc-machine" @@ -20872,20 +20902,16 @@ "parent": "pci-device" }, { - "name": "xen-pci-passthrough", - "parent": "pci-device" - }, - { - "name": "Haswell-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-scsi-device", + "parent": "virtio-scsi-common" }, { "name": "pxb-pcie", "parent": "pci-device" }, { - "name": "cpu-cluster", - "parent": "device" + "name": "Haswell-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "vhost-user-i2c-pci", @@ -20896,7 +20922,7 @@ "parent": "object" }, { - "name": "xen-backend", + "name": "cpu-cluster", "parent": "device" }, { @@ -20904,16 +20930,16 @@ "parent": "sys-bus-device" }, { - "name": "Haswell-v3-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "i82557a", + "parent": "pci-device" }, { "name": "vhost-user-scsi-pci-non-transitional", "parent": "vhost-user-scsi-pci-base" }, { - "name": "i82557a", - "parent": "pci-device" + "name": "vmmouse", + "parent": "isa-device" }, { "name": "chardev-udp", @@ -20932,8 +20958,8 @@ "parent": "virtio-scsi-pci-base" }, { - "name": "vmmouse", - "parent": "isa-device" + "name": "Haswell-v3-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "migration", @@ -20976,8 +21002,8 @@ "parent": "x86_64-cpu" }, { - "name": "vhost-vsock-device", - "parent": "vhost-vsock-common" + "name": "chardev-dbus", + "parent": "chardev-socket" }, { "name": "Broadwell-v2-x86_64-cpu", @@ -20995,10 +21021,6 @@ "name": "EPYC-IBPB-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "Skylake-Server-v5-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "ib700", "parent": "isa-device" @@ -21008,7 +21030,7 @@ "parent": "x86-iommu" }, { - "name": "Nehalem-v2-x86_64-cpu", + "name": "Skylake-Server-v5-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -21016,16 +21038,16 @@ "parent": "virtio-9p-pci-base" }, { - "name": "igd-passthrough-i440FX", - "parent": "i440FX" + "name": "Nehalem-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "memory-backend-file", "parent": "memory-backend" }, { - "name": "xen-disk", - "parent": "xen-block" + "name": "vhost-vsock-device", + "parent": "vhost-vsock-common" }, { "name": "isa-pcspk", @@ -21036,25 +21058,21 @@ "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", "parent": "generic-pc-machine" }, - { - "name": "IvyBridge-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "virtio-blk-pci-non-transitional", "parent": "virtio-blk-pci-base" @@ -21064,13 +21082,17 @@ "parent": "device" }, { - "name": "ne2k_pci", - "parent": "pci-device" + "name": "IvyBridge-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "isabus-bridge", "parent": "sys-bus-device" }, + { + "name": "ne2k_pci", + "parent": "pci-device" + }, { "name": "usb-bus", "parent": "bus" @@ -21087,18 +21109,10 @@ "name": "tcg-accel", "parent": "accel" }, - { - "name": "i82551", - "parent": "pci-device" - }, { "name": "virtio-balloon-pci", "parent": "virtio-balloon-pci-base" }, - { - "name": "Cascadelake-Server-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "virtio-gpu-device", "parent": "virtio-gpu-base" @@ -21107,6 +21121,10 @@ "name": "e1000", "parent": "e1000-base" }, + { + "name": "Cascadelake-Server-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "athlon-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -21124,8 +21142,8 @@ "parent": "generic-pc-machine" }, { - "name": "xen-apic", - "parent": "apic-common" + "name": "i82551", + "parent": "pci-device" }, { "name": "EPYC-v1-x86_64-cpu", @@ -21159,14 +21177,14 @@ "name": "pc-q35-6.0-machine", "parent": "generic-pc-machine" }, - { - "name": "mioe3680_pci", - "parent": "pci-device" - }, { "name": "vhost-user-backend", "parent": "object" }, + { + "name": "mioe3680_pci", + "parent": "pci-device" + }, { "name": "vmxnet3", "parent": "pci-device" @@ -21204,24 +21222,24 @@ "parent": "smbus-device" }, { - "name": "virtio-serial-device", - "parent": "virtio-device" + "name": "dbus-display", + "parent": "object" }, { - "name": "virtio-serial-pci", - "parent": "virtio-serial-pci-base" + "name": "vhost-user-gpu-pci", + "parent": "vhost-user-gpu-pci-base-type" }, { - "name": "Denverton-v2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-serial-pci", + "parent": "virtio-serial-pci-base" }, { - "name": "xen-bridge", - "parent": "sys-bus-device" + "name": "virtio-serial-device", + "parent": "virtio-device" }, { - "name": "vhost-user-gpu-pci", - "parent": "vhost-user-gpu-pci-base-type" + "name": "Denverton-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "iothread", @@ -21243,14 +21261,14 @@ "name": "ati-vga", "parent": "pci-device" }, - { - "name": "pentium3-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "kvm-i8259", "parent": "pic-common" }, + { + "name": "pentium3-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "isa-serial", "parent": "isa-device" @@ -21311,18 +21329,10 @@ "name": "Opteron_G3-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "xen-cdrom", - "parent": "xen-block" - }, { "name": "Cooperlake-v2-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "EPYC-v3-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "isa-ide", "parent": "isa-device" @@ -21332,13 +21342,17 @@ "parent": "x86_64-cpu" }, { - "name": "sgx-epc", - "parent": "device" + "name": "EPYC-v3-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "scsi-cd", "parent": "scsi-disk-base" }, + { + "name": "sgx-epc", + "parent": "device" + }, { "name": "gpex-root", "parent": "pci-device" @@ -21407,17 +21421,13 @@ "name": "VGA", "parent": "pci-vga" }, - { - "name": "i440FX", - "parent": "pci-device" - }, { "name": "qio-channel-buffer", "parent": "qio-channel" }, { - "name": "xen-bus", - "parent": "bus" + "name": "i440FX", + "parent": "pci-device" }, { "name": "Penryn-v1-x86_64-cpu", @@ -21436,16 +21446,16 @@ "parent": "virtio-device" }, { - "name": "Icelake-Server-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pc-i440fx-3.1-machine", + "parent": "generic-pc-machine" }, { "name": "pci-serial-4x", "parent": "pci-device" }, { - "name": "pc-i440fx-3.1-machine", - "parent": "generic-pc-machine" + "name": "Icelake-Server-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "sga", @@ -21516,11 +21526,11 @@ "parent": "usb-device" }, { - "name": "IvyBridge-x86_64-cpu", + "name": "SandyBridge-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "SandyBridge-v1-x86_64-cpu", + "name": "IvyBridge-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -21583,10 +21593,6 @@ "name": "ccid-bus", "parent": "bus" }, - { - "name": "xen-pvdevice", - "parent": "pci-device" - }, { "name": "ide-hd", "parent": "ide-device" @@ -21619,14 +21625,14 @@ "name": "pc-i440fx-4.1-machine", "parent": "generic-pc-machine" }, - { - "name": "e1000-82544gc", - "parent": "e1000-base" - }, { "name": "chardev-spiceport", "parent": "chardev-spice" }, + { + "name": "e1000-82544gc", + "parent": "e1000-base" + }, { "name": "tls-creds-x509", "parent": "tls-creds" @@ -21659,10 +21665,6 @@ "name": "isa-cirrus-vga", "parent": "isa-device" }, - { - "name": "pvrdma", - "parent": "pci-device" - }, { "name": "qemu64-x86_64-cpu", "parent": "x86_64-cpu" @@ -21671,6 +21673,10 @@ "name": "Skylake-Server-v2-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "chardev-braille", + "parent": "chardev" + }, { "name": "pc-q35-4.1-machine", "parent": "generic-pc-machine" @@ -21703,14 +21709,14 @@ "name": "pc-testdev", "parent": "isa-device" }, - { - "name": "qio-channel-websock", - "parent": "qio-channel" - }, { "name": "megasas", "parent": "megasas-base" }, + { + "name": "qio-channel-websock", + "parent": "qio-channel" + }, { "name": "virtio-iommu-pci", "parent": "virtio-iommu-pci-base-type" @@ -21719,21 +21725,17 @@ "name": "pc-i440fx-6.1-machine", "parent": "generic-pc-machine" }, - { - "name": "vmcoreinfo", - "parent": "device" - }, { "name": "Icelake-Client-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "tpci200", - "parent": "pci-device" + "name": "vmcoreinfo", + "parent": "device" }, { - "name": "chardev-braille", - "parent": "chardev" + "name": "tpci200", + "parent": "pci-device" }, { "name": "rocker", @@ -21767,10 +21769,6 @@ "name": "qemu-console", "parent": "object" }, - { - "name": "chardev-socket", - "parent": "chardev" - }, { "name": "clock", "parent": "object" @@ -21808,20 +21806,20 @@ "parent": "device" }, { - "name": "Skylake-Server-IBRS-x86_64-cpu", + "name": "Cascadelake-Server-noTSX-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "virtio-pmem", - "parent": "virtio-device" + "name": "chardev-socket", + "parent": "chardev" }, { "name": "nvme-bus", "parent": "bus" }, { - "name": "xen-sysbus", - "parent": "bus" + "name": "virtconsole", + "parent": "virtserialport" }, { "name": "virtio-net-pci-non-transitional", @@ -21839,14 +21837,14 @@ "name": "scsi-hd", "parent": "scsi-disk-base" }, - { - "name": "Cascadelake-Server-noTSX-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "usb-kbd", "parent": "usb-hid" }, + { + "name": "lsi53c810", + "parent": "lsi53c895a" + }, { "name": "isa-fdc", "parent": "isa-device" @@ -21872,24 +21870,24 @@ "parent": "object" }, { - "name": "Westmere-v2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "ccid-card-emulated", + "parent": "ccid-card" }, { "name": "pc-q35-2.9-machine", "parent": "generic-pc-machine" }, { - "name": "Skylake-Client-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-pmem", + "parent": "virtio-device" }, { "name": "tpm-tis", "parent": "isa-device" }, { - "name": "virtconsole", - "parent": "virtserialport" + "name": "Skylake-Server-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "hyperv-testdev", @@ -21912,8 +21910,8 @@ "parent": "generic-pc-machine" }, { - "name": "ccid-card-emulated", - "parent": "ccid-card" + "name": "Westmere-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "pc-q35-5.1-machine", @@ -21928,8 +21926,8 @@ "parent": "virtio-input-hid-device" }, { - "name": "lsi53c810", - "parent": "lsi53c895a" + "name": "Skylake-Client-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "ioh3420", @@ -22031,10 +22029,6 @@ "name": "phenom-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "virtio-net-pci-transitional", - "parent": "virtio-net-pci-base" - }, { "name": "vhost-vsock-pci", "parent": "vhost-vsock-pci-base" @@ -22044,8 +22038,8 @@ "parent": "device" }, { - "name": "vhost-user-blk-pci-transitional", - "parent": "vhost-user-blk-pci-base" + "name": "virtio-net-pci-transitional", + "parent": "virtio-net-pci-base" }, { "name": "irq", @@ -22072,8 +22066,8 @@ "parent": "x86_64-cpu" }, { - "name": "xenfv-3.1-machine", - "parent": "generic-pc-machine" + "name": "vhost-user-blk-pci-transitional", + "parent": "vhost-user-blk-pci-base" }, { "name": "coreduo-x86_64-cpu", @@ -22159,21 +22153,17 @@ "name": "Skylake-Server-v4-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": "kvmvapic", + "parent": "sys-bus-device" }, { - "name": "authz-simple", - "parent": "authz" + "name": "nvme-ns", + "parent": "device" }, { "name": "Icelake-Server-v6-x86_64-cpu", @@ -22192,8 +22182,8 @@ "parent": "vhost-user-blk-pci-base" }, { - "name": "xen-accel", - "parent": "accel" + "name": "authz-simple", + "parent": "authz" }, { "name": "fw_cfg_io", @@ -22311,18 +22301,10 @@ "name": "qemu32-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "xen-sysdev", - "parent": "sys-bus-device" - }, { "name": "Haswell-noTSX-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "chardev-null", - "parent": "chardev" - }, { "name": "pci-serial", "parent": "pci-device" @@ -22351,10 +22333,6 @@ "name": "Opteron_G4-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "qio-channel-rdma", - "parent": "qio-channel" - }, { "name": "ne2k_isa", "parent": "isa-device" @@ -22375,14 +22353,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": "iommu-memory-region" @@ -22396,17 +22374,13 @@ "parent": "pci-device" }, { - "name": "Cooperlake-v1-x86_64-cpu", + "name": "Nehalem-IBRS-x86_64-cpu", "parent": "x86_64-cpu" }, { "name": "Cascadelake-Server-v3-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "vhost-user-rng-pci", - "parent": "vhost-user-rng-pci-base" - }, { "name": "cfi.pflash01", "parent": "sys-bus-device" @@ -22416,8 +22390,12 @@ "parent": "virtio-device" }, { - "name": "isa-parallel", - "parent": "isa-device" + "name": "chardev-null", + "parent": "chardev" + }, + { + "name": "Cooperlake-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "Skylake-Server-x86_64-cpu", @@ -22428,16 +22406,16 @@ "parent": "generic-pc-machine" }, { - "name": "Nehalem-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "isa-parallel", + "parent": "isa-device" }, { "name": "pentium2-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "xen-platform", - "parent": "pci-device" + "name": "vhost-user-rng-pci", + "parent": "vhost-user-rng-pci-base" }, { "name": "isa-vga", @@ -22476,20 +22454,20 @@ "parent": "rng-backend" }, { - "name": "Cascadelake-Server-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "qxl-vga", + "parent": "pci-qxl" }, { "name": "i82558b", "parent": "pci-device" }, { - "name": "ivshmem-doorbell", - "parent": "ivshmem-common" + "name": "Cascadelake-Server-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "qxl-vga", - "parent": "pci-qxl" + "name": "ivshmem-doorbell", + "parent": "ivshmem-common" }, { "name": "PIIX3-xen", @@ -22672,8 +22650,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": "IDE", @@ -22684,8 +22662,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": "mptsas1068", @@ -22696,17 +22674,13 @@ "parent": "scsi-disk-base" }, { - "name": "xenpv-machine", - "parent": "machine" + "name": "chardev-spicevmc", + "parent": "chardev-spice" }, { "name": "Snowridge-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "chardev-spicevmc", - "parent": "chardev-spice" - }, { "name": "q35-pcihost", "parent": "pcie-host-bridge" @@ -22771,6 +22745,10 @@ "name": "vhost-user-blk", "parent": "virtio-device" }, + { + "name": "SandyBridge-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "nvme-subsys", "parent": "device" @@ -22779,10 +22757,6 @@ "name": "Haswell-noTSX-IBRS-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "SandyBridge-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "pc-q35-5.2-machine", "parent": "generic-pc-machine" @@ -24538,6 +24512,11 @@ "name": "smm-compat", "type": "bool" }, + { + "default-value": false, + "name": "x-not-migrate-acpi-index", + "type": "bool" + }, { "default-value": 2, "name": "s4_val", @@ -29178,13 +29157,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": false, - "name": "xenpv", - "numa-mem-supported": false, - "cpu-max": 1, - "deprecated": false - }, { "hotpluggable-cpus": true, "name": "pc-i440fx-6.2", @@ -29283,16 +29255,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-3.1", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram", - "alias": "xenfv" - }, { "hotpluggable-cpus": true, "name": "pc-q35-2.4", @@ -29582,15 +29544,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-4.2", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram" - }, { "hotpluggable-cpus": false, "name": "microvm", @@ -32035,41 +31988,6 @@ ], "option": "machine" }, - { - "parameters": [ - { - "name": "timeout", - "help": "Request timeout in seconds (default 0 = no timeout)", - "type": "number" - }, - { - "name": "initiator-name", - "help": "Initiator iqn name to use when connecting", - "type": "string" - }, - { - "name": "header-digest", - "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", - "type": "string" - }, - { - "name": "password-secret", - "help": "ID of the secret providing password for CHAP authentication to target", - "type": "string" - }, - { - "name": "password", - "help": "password for CHAP authentication to target", - "type": "string" - }, - { - "name": "user", - "help": "username for CHAP authentication to target", - "type": "string" - } - ], - "option": "iscsi" - }, { "parameters": [ { @@ -32203,6 +32121,41 @@ ], "option": "spice" }, + { + "parameters": [ + { + "name": "timeout", + "help": "Request timeout in seconds (default 0 = no timeout)", + "type": "number" + }, + { + "name": "initiator-name", + "help": "Initiator iqn name to use when connecting", + "type": "string" + }, + { + "name": "header-digest", + "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", + "type": "string" + }, + { + "name": "password-secret", + "help": "ID of the secret providing password for CHAP authentication to target", + "type": "string" + }, + { + "name": "password", + "help": "password for CHAP authentication to target", + "type": "string" + }, + { + "name": "user", + "help": "username for CHAP authentication to target", + "type": "string" + } + ], + "option": "iscsi" + }, { "parameters": [ ], @@ -37593,13 +37546,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": false, - "name": "xenpv", - "numa-mem-supported": false, - "cpu-max": 1, - "deprecated": false - }, { "hotpluggable-cpus": true, "name": "pc-i440fx-6.2", @@ -37698,16 +37644,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-3.1", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram", - "alias": "xenfv" - }, { "hotpluggable-cpus": true, "name": "pc-q35-2.4", @@ -37997,15 +37933,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-4.2", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram" - }, { "hotpluggable-cpus": false, "name": "microvm", diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 87f9b4068d..8074c97ecd 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -242,10 +242,10 @@ <flag name='virtio-iommu-pci'/> <flag name='virtio-iommu.boot-bypass'/> <flag name='virtio-net.rss'/> - <version>6002092</version> + <version>7000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> - <package>v7.0.0-rc2</package> + <package>v7.0.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> @@ -1617,7 +1617,6 @@ <machine type='kvm' name='pc-q35-5.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='kvm' name='xenpv' maxCpus='1'/> <machine type='kvm' name='pc-i440fx-6.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -1628,7 +1627,6 @@ <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='kvm' name='xenfv-3.1' alias='xenfv' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='x-remote' maxCpus='1'/> @@ -1660,7 +1658,6 @@ <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='kvm' name='xenfv-4.2' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram'/> <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -3723,7 +3720,6 @@ <machine type='tcg' name='pc-q35-5.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='tcg' name='xenpv' maxCpus='1'/> <machine type='tcg' name='pc-i440fx-6.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -3734,7 +3730,6 @@ <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='tcg' name='xenfv-3.1' alias='xenfv' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='x-remote' maxCpus='1'/> @@ -3766,7 +3761,6 @@ <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='tcg' name='xenfv-4.2' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram'/> <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
On Wed, Apr 20, 2022 at 16:52:14 +0530, Ani Sinha wrote:
On Wed, Apr 20, 2022 at 4:46 PM Igor Mammedov <imammedo@redhat.com> wrote:
On Wed, 20 Apr 2022 13:02:12 +0200 Peter Krempa <pkrempa@redhat.com> wrote:
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property
do you do this for just for every new property? (nothing outside of QEMU needs to know about x-not-migrate-acpi-index, unless one is interested in whether it works or not)
Any new property that is prefixed with "x-" should not be exposed through libvirt. They are experimental, unstable and can change any time in the future.
We don't expose it. I'm just simply noting what changed between the caps dumps. Since the difference between rc2 and GA hadn't much to happen I also noted this.
On Wed, Apr 20, 2022 at 13:15:43 +0200, Igor Mammedov wrote:
On Wed, 20 Apr 2022 13:02:12 +0200 Peter Krempa <pkrempa@redhat.com> wrote:
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property
do you do this for just for every new property? (nothing outside of QEMU needs to know about x-not-migrate-acpi-index, unless one is interested in whether it works or not)
I generally go through the diff of things that change and note what's changed. In most cases it's just the interesting stuff, but between rc2 and GA there wasn't much interesting going on.
On Wed, Apr 20, 2022 at 13:02:12 +0200, Peter Krempa wrote:
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property
Based on the discussion I can drop this line.
- 'cocoa' display and corresponding props (not present in this build)
Changes in build: - dbus display driver re-enabled - gtk display support re-disabled - xen support re-disabled
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../caps_7.0.0.x86_64.replies | 583 ++++++++---------- .../caps_7.0.0.x86_64.xml | 10 +- 2 files changed, 257 insertions(+), 336 deletions(-)
The rest is still open for review ;)
On 4/25/22 16:36, Peter Krempa wrote:
On Wed, Apr 20, 2022 at 13:02:12 +0200, Peter Krempa wrote:
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property
Based on the discussion I can drop this line.
- 'cocoa' display and corresponding props (not present in this build)
Changes in build: - dbus display driver re-enabled - gtk display support re-disabled - xen support re-disabled
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../caps_7.0.0.x86_64.replies | 583 ++++++++---------- .../caps_7.0.0.x86_64.xml | 10 +- 2 files changed, 257 insertions(+), 336 deletions(-)
The rest is still open for review ;)
Is it? I though you push this kind of patches. I mean, what's there to review? It's basically a generated file. Michal
On Mon, Apr 25, 2022 at 16:40:17 +0200, Michal Prívozník wrote:
On 4/25/22 16:36, Peter Krempa wrote:
On Wed, Apr 20, 2022 at 13:02:12 +0200, Peter Krempa wrote:
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property
Based on the discussion I can drop this line.
- 'cocoa' display and corresponding props (not present in this build)
Changes in build: - dbus display driver re-enabled - gtk display support re-disabled - xen support re-disabled
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../caps_7.0.0.x86_64.replies | 583 ++++++++---------- .../caps_7.0.0.x86_64.xml | 10 +- 2 files changed, 257 insertions(+), 336 deletions(-)
The rest is still open for review ;)
Is it? I though you push this kind of patches. I mean, what's there to review? It's basically a generated file.
Hmm, I didn't really want to get a rule instantiated for this kind of stuff, but yeah, in most cases there's nothing to do. I actually do review them: 1) For new additions on x86 I'm looking for new stuff which might be interesting for us, thus the "changelog" above, but I do that also when I'm sending patches 2) It's important to look that the capabilities don't regress and also potential stuff which might have test fallout. In case when I'm sending those I make sure that doesn't happen so I'll be okay just to push these without review, but generally I'd like to be reviewing other submissions.
On 4/25/22 16:49, Peter Krempa wrote:
On Mon, Apr 25, 2022 at 16:40:17 +0200, Michal Prívozník wrote:
On 4/25/22 16:36, Peter Krempa wrote:
On Wed, Apr 20, 2022 at 13:02:12 +0200, Peter Krempa wrote:
Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property
Based on the discussion I can drop this line.
- 'cocoa' display and corresponding props (not present in this build)
Changes in build: - dbus display driver re-enabled - gtk display support re-disabled - xen support re-disabled
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../caps_7.0.0.x86_64.replies | 583 ++++++++---------- .../caps_7.0.0.x86_64.xml | 10 +- 2 files changed, 257 insertions(+), 336 deletions(-)
The rest is still open for review ;)
Is it? I though you push this kind of patches. I mean, what's there to review? It's basically a generated file.
Hmm, I didn't really want to get a rule instantiated for this kind of stuff, but yeah, in most cases there's nothing to do.
I actually do review them:
1) For new additions on x86 I'm looking for new stuff which might be interesting for us, thus the "changelog" above, but I do that also when I'm sending patches
2) It's important to look that the capabilities don't regress and also potential stuff which might have test fallout.
In case when I'm sending those I make sure that doesn't happen so I'll be okay just to push these without review, but generally I'd like to be reviewing other submissions.
Alright then. Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
participants (5)
-
Ani Sinha -
Daniel P. Berrangé -
Igor Mammedov -
Michal Prívozník -
Peter Krempa