[PATCH] qemu: caps: Always assume QEMU_CAPS_SMP_TOPOLOGY

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Support for SMP topology was added by qemu commit dc6b1c09849484fbbc50
prior to 0.12.0, our minimum supported qemu version.

$ git describe --tags dc6b1c09849484fbbc50803307e4c7a3d81eab62
v0.11.0-rc0-449-gdc6b1c0
$ git describe --tags --contains dc6b1c09849484fbbc50803307e4c7a3d81eab
v0.12.0-rc0~1477
---

Note that I've trimmed most of the changes done in tests/qemuxml2argvdata to
get under the mailing list size limit. All the changes were generated by running
the test suite with VIR_TEST_REGENERATE_OUTPUT=1 and checking that only the -smp
line has changed.

 src/qemu/qemu_capabilities.c                       |  5 ---
 src/qemu/qemu_capabilities.h                       |  2 +-
 src/qemu/qemu_command.c                            | 40 ++++++++--------------
 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml   |  1 -
 .../caps_2.6.0-gicv2.aarch64.xml                   |  1 -
 .../caps_2.6.0-gicv3.aarch64.xml                   |  1 -
 tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml  |  1 -
 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml   |  1 -
 tests/qemuhelptest.c                               |  8 -----
 .../qemuxml2argv-aarch64-aavmf-virtio-mmio.args    |  2 +-
 .../qemuxml2argv-aarch64-cpu-passthrough.args      |  2 +-
 .../qemuxml2argv-aarch64-gic-host.args             |  2 +-
 .../qemuxml2argv-aarch64-gic-v2.args               |  2 +-
 .../qemuxml2argv-aarch64-gic-v3.args               |  2 +-
 .../qemuxml2argv-aarch64-kvm-32-on-64.args         |  2 +-
 ...l2argv-aarch64-virt-2.6-virtio-pci-default.args |  2 +-
 .../qemuxml2argv-aarch64-virt-default-nic.args     |  2 +-
 .../qemuxml2argv-aarch64-virt-virtio.args          |  2 +-
 .../qemuxml2argv-aarch64-virtio-pci-default.args   |  2 +-
 ...l2argv-aarch64-virtio-pci-manual-addresses.args |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-acpi-table.args  |  2 +-
 .../qemuxml2argv-arm-vexpressa9-basic.args         |  2 +-
 .../qemuxml2argv-arm-vexpressa9-nodevs.args        |  2 +-
 .../qemuxml2argv-arm-vexpressa9-virtio.args        |  2 +-
 .../qemuxml2argv-arm-virt-virtio.args              |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-autoindex.args |  2 +-
 .../qemuxml2argv-balloon-ccw-deflate.args          |  2 +-
 .../qemuxml2argv-balloon-device-auto.args          |  2 +-
 .../qemuxml2argv-balloon-device-deflate-off.args   |  2 +-
 .../qemuxml2argv-balloon-device-deflate.args       |  2 +-
 .../qemuxml2argv-balloon-device-period.args        |  2 +-
 .../qemuxml2argv-balloon-device.args               |  2 +-
 .../qemuxml2argv-balloon-mmio-deflate.args         |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args  |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-bios.args      |  2 +-
 .../qemuxml2argv-blkdeviotune-max.args             |  2 +-
 .../qemuxml2argv-blkdeviotune.args                 |  2 +-
 .../qemuxml2argv-blkiotune-device.args             |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args  |  2 +-
 .../qemuxml2argv-boot-complex-bootindex.args       |  2 +-
 .../qemuxml2argv-boot-complex.args                 |  2 +-
 .../qemuxml2argv-boot-floppy-q35.args              |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args |  2 +-
 ...xml2argv-boot-menu-disable-drive-bootindex.args |  2 +-
 .../qemuxml2argv-boot-menu-disable-drive.args      |  2 +-
 .../qemuxml2argv-boot-menu-disable.args            |  2 +-
 .../qemuxml2argv-boot-menu-enable-bootindex.args   |  2 +-
 ...qemuxml2argv-boot-menu-enable-with-timeout.args |  2 +-
 .../qemuxml2argv-boot-menu-enable.args             |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-boot-multi.args  |  2 +-
 .../qemuxml2argv-boot-network.args                 |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-boot-order.args  |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-boot-strict.args |  2 +-
 .../qemuxml2argv-bootindex-floppy-q35.args         |  2 +-
 .../qemuxml2argv-channel-guestfwd.args             |  2 +-
 .../qemuxml2argv-channel-spicevmc-old.args         |  2 +-
 .../qemuxml2argv-channel-spicevmc.args             |  2 +-
 .../qemuxml2argv-channel-virtio-auto.args          |  2 +-
 .../qemuxml2argv-channel-virtio-autoadd.args       |  2 +-
 .../qemuxml2argv-channel-virtio-autoassign.args    |  2 +-
 .../qemuxml2argv-channel-virtio-default.args       |  2 +-
 .../qemuxml2argv-channel-virtio-state.args         |  2 +-
 .../qemuxml2argv-channel-virtio-unix.args          |  2 +-
 .../qemuxml2argv-channel-virtio.args               |  2 +-
 .../qemuxml2argv-clock-catchup.args                |  2 +-
 .../qemuxml2argv-clock-france.args                 |  2 +-
 .../qemuxml2argv-clock-hpet-off.args               |  2 +-
 ...muxml2argv-clock-localtime-basis-localtime.args |  2 +-
 .../qemuxml2argv-clock-localtime.args              |  2 +-
 .../qemuxml2argv-clock-timer-hyperv-rtc.args       |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args |  2 +-
 .../qemuxml2argv-clock-variable.args               |  2 +-
 .../qemuxml2argv-console-compat-auto.args          |  2 +-
 .../qemuxml2argv-console-compat-chardev.args       |  2 +-
 .../qemuxml2argv-console-compat.args               |  2 +-
 .../qemuxml2argv-console-sclp.args                 |  2 +-
 .../qemuxml2argv-console-virtio-ccw.args           |  2 +-
 .../qemuxml2argv-console-virtio-many.args          |  2 +-
 .../qemuxml2argv-console-virtio-s390.args          |  2 +-
 .../qemuxml2argv-console-virtio.args               |  2 +-
 .../qemuxml2argv-controller-order.args             |  2 +-
 .../qemuxml2argv-cpu-Haswell-noTSX.args            |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args |  2 +-
 .../qemuxml2argv-cpu-Haswell2.args                 |  2 +-
 .../qemuxml2argv-cpu-Haswell3.args                 |  2 +-
 .../qemuxml2argv-cpu-eoi-disabled.args             |  2 +-
 .../qemuxml2argv-cpu-eoi-enabled.args              |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args  |  2 +-
 .../qemuxml2argv-cpu-exact2-nofallback.args        |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args  |  2 +-
 .../qemuxml2argv-cpu-fallback.args                 |  2 +-
 .../qemuxml2argv-cpu-host-kvmclock.args            |  2 +-
 .../qemuxml2argv-cpu-host-model-fallback.args      |  2 +-
 .../qemuxml2argv-cpu-host-model-vendor.args        |  2 +-
 .../qemuxml2argv-cpu-host-model.args               |  2 +-
 ...qemuxml2argv-cpu-host-passthrough-features.args |  2 +-
 .../qemuxml2argv-cpu-host-passthrough.args         |  2 +-
 .../qemuxml2argv-cpu-kvmclock.args                 |  2 +-
 .../qemuxml2argv-cpu-minimum1.args                 |  2 +-
 .../qemuxml2argv-cpu-minimum2.args                 |  2 +-
 .../qemuxml2argv-cpu-numa-disjoint.args            |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args |  2 +-
 .../qemuxml2argv-cpu-topology3.args                |  2 +-
 .../qemuxml2argv-cputune-zero-shares.args          |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-cputune.args   |  2 +-
 .../qemuxml2argv-debug-threads.args                |  2 +-
 .../qemuxml2argv-default-kvm-host-arch.args        |  2 +-
 .../qemuxml2argv-default-qemu-host-arch.args       |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args  |  2 +-
 .../qemuxml2argv-disk-blockio.args                 |  2 +-
 .../qemuxml2argv-disk-cdrom-empty.args             |  2 +-
 .../qemuxml2argv-disk-cdrom-network-ftp.args       |  2 +-
 .../qemuxml2argv-disk-cdrom-network-ftps.args      |  2 +-
 .../qemuxml2argv-disk-cdrom-network-http.args      |  2 +-
 .../qemuxml2argv-disk-cdrom-network-https.args     |  2 +-
 .../qemuxml2argv-disk-cdrom-network-tftp.args      |  2 +-
 ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args |  2 +-
 .../qemuxml2argv-disk-cdrom-tray.args              |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args  |  2 +-
 .../qemuxml2argv-disk-copy_on_read.args            |  2 +-
 .../qemuxml2argv-disk-drive-boot-cdrom.args        |  2 +-
 .../qemuxml2argv-disk-drive-boot-disk.args         |  2 +-
 .../qemuxml2argv-disk-drive-cache-directsync.args  |  2 +-
 .../qemuxml2argv-disk-drive-cache-unsafe.args      |  2 +-
 .../qemuxml2argv-disk-drive-cache-v2-none.args     |  2 +-
 .../qemuxml2argv-disk-drive-cache-v2-wb.args       |  2 +-
 .../qemuxml2argv-disk-drive-cache-v2-wt.args       |  2 +-
 .../qemuxml2argv-disk-drive-copy-on-read.args      |  2 +-
 .../qemuxml2argv-disk-drive-detect-zeroes.args     |  2 +-
 .../qemuxml2argv-disk-drive-discard.args           |  2 +-
 ...uxml2argv-disk-drive-error-policy-enospace.args |  2 +-
 .../qemuxml2argv-disk-drive-error-policy-stop.args |  2 +-
 ...gv-disk-drive-error-policy-wreport-rignore.args |  2 +-
 .../qemuxml2argv-disk-drive-fmt-qcow.args          |  2 +-
 .../qemuxml2argv-disk-drive-network-gluster.args   |  2 +-
 ...qemuxml2argv-disk-drive-network-iscsi-auth.args |  2 +-
 .../qemuxml2argv-disk-drive-network-iscsi-lun.args |  2 +-
 .../qemuxml2argv-disk-drive-network-iscsi.args     |  2 +-
 ...qemuxml2argv-disk-drive-network-nbd-export.args |  2 +-
 ...ml2argv-disk-drive-network-nbd-ipv6-export.args |  2 +-
 .../qemuxml2argv-disk-drive-network-nbd-ipv6.args  |  2 +-
 .../qemuxml2argv-disk-drive-network-nbd-unix.args  |  2 +-
 .../qemuxml2argv-disk-drive-network-nbd.args       |  2 +-
 ...muxml2argv-disk-drive-network-rbd-auth-AES.args |  2 +-
 .../qemuxml2argv-disk-drive-network-rbd-auth.args  |  2 +-
 .../qemuxml2argv-disk-drive-network-rbd-ipv6.args  |  2 +-
 .../qemuxml2argv-disk-drive-network-rbd.args       |  2 +-
 .../qemuxml2argv-disk-drive-network-sheepdog.args  |  2 +-
 .../qemuxml2argv-disk-drive-no-boot.args           |  2 +-
 .../qemuxml2argv-disk-drive-readonly-disk.args     |  2 +-
 ...qemuxml2argv-disk-drive-readonly-no-device.args |  2 +-
 .../qemuxml2argv-disk-drive-shared.args            |  2 +-
 ...emuxml2argv-disk-floppy-tray-no-device-cap.args |  2 +-
 .../qemuxml2argv-disk-floppy-tray.args             |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args |  2 +-
 .../qemuxml2argv-disk-geometry.args                |  2 +-
 .../qemuxml2argv-disk-ide-drive-split.args         |  2 +-
 .../qemuxml2argv-disk-ide-wwn.args                 |  2 +-
 .../qemuxml2argv-disk-ioeventfd.args               |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args  |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-disk-many.args |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-disk-order.args  |  2 +-
 .../qemuxml2argv-disk-sata-device.args             |  2 +-
 .../qemuxml2argv-disk-scsi-device-auto.args        |  2 +-
 .../qemuxml2argv-disk-scsi-device.args             |  2 +-
 .../qemuxml2argv-disk-scsi-disk-split.args         |  2 +-
 .../qemuxml2argv-disk-scsi-disk-vpd.args           |  2 +-
 .../qemuxml2argv-disk-scsi-disk-wwn.args           |  2 +-
 .../qemuxml2argv-disk-scsi-lun-passthrough.args    |  2 +-
 .../qemuxml2argv-disk-scsi-megasas.args            |  2 +-
 .../qemuxml2argv-disk-scsi-mptsas1068.args         |  2 +-
 .../qemuxml2argv-disk-scsi-virtio-scsi.args        |  2 +-
 .../qemuxml2argv-disk-scsi-vscsi.args              |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-disk-serial.args |  2 +-
 .../qemuxml2argv-disk-snapshot.args                |  2 +-
 .../qemuxml2argv-disk-source-pool-mode.args        |  2 +-
 .../qemuxml2argv-disk-source-pool.args             |  2 +-
 .../qemuxml2argv-disk-usb-device-removable.args    |  2 +-
 .../qemuxml2argv-disk-usb-device.args              |  2 +-
 .../qemuxml2argv-disk-virtio-ccw-many.args         |  2 +-
 .../qemuxml2argv-disk-virtio-ccw.args              |  2 +-
 .../qemuxml2argv-disk-virtio-s390.args             |  2 +-
 .../qemuxml2argv-disk-virtio-scsi-ccw.args         |  2 +-
 .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args |  2 +-
 .../qemuxml2argv-disk-virtio-scsi-ioeventfd.args   |  2 +-
 .../qemuxml2argv-disk-virtio-scsi-max_sectors.args |  2 +-
 .../qemuxml2argv-disk-virtio-scsi-num_queues.args  |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args |  2 +-
 .../qemuxml2argv-encrypted-disk-usage.args         |  2 +-
 .../qemuxml2argv-encrypted-disk.args               |  2 +-
 .../qemuxml2argv-eoi-disabled.args                 |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-event_idx.args |  2 +-
 .../qemuxml2argv-fips-enabled.args                 |  2 +-
 .../qemuxml2argv-floppy-drive-fat.args             |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args  |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-fs9p.args      |  2 +-
 .../qemuxml2argv-graphics-sdl-fullscreen.args      |  2 +-
 .../qemuxml2argv-graphics-sdl.args                 |  2 +-
 ...emuxml2argv-graphics-spice-agent-file-xfer.args |  2 +-
 .../qemuxml2argv-graphics-spice-agentmouse.args    |  2 +-
 ...emuxml2argv-graphics-spice-auto-socket-cfg.args |  2 +-
 .../qemuxml2argv-graphics-spice-auto-socket.args   |  2 +-
 .../qemuxml2argv-graphics-spice-compression.args   |  2 +-
 .../qemuxml2argv-graphics-spice-no-args.args       |  2 +-
 .../qemuxml2argv-graphics-spice-qxl-vga.args       |  2 +-
 .../qemuxml2argv-graphics-spice-sasl.args          |  2 +-
 .../qemuxml2argv-graphics-spice-socket.args        |  2 +-
 .../qemuxml2argv-graphics-spice-timeout.args       |  2 +-
 .../qemuxml2argv-graphics-spice-usb-redir.args     |  2 +-
 .../qemuxml2argv-graphics-spice.args               |  2 +-
 .../qemuxml2argv-graphics-vnc-auto-socket-cfg.args |  2 +-
 .../qemuxml2argv-graphics-vnc-auto-socket.args     |  2 +-
 .../qemuxml2argv-graphics-vnc-no-listen-attr.args  |  2 +-
 .../qemuxml2argv-graphics-vnc-none.args            |  2 +-
 .../qemuxml2argv-graphics-vnc-policy.args          |  2 +-
 ...2argv-graphics-vnc-remove-generated-socket.args |  2 +-
 .../qemuxml2argv-graphics-vnc-sasl.args            |  2 +-
 .../qemuxml2argv-graphics-vnc-socket.args          |  2 +-
 .../qemuxml2argv-graphics-vnc-tls.args             |  2 +-
 .../qemuxml2argv-graphics-vnc-websocket.args       |  2 +-
 .../qemuxml2argv-graphics-vnc.args                 |  2 +-
 .../qemuxml2argv-hostdev-pci-address-device.args   |  2 +-
 .../qemuxml2argv-hostdev-pci-address.args          |  2 +-
 .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args  |  2 +-
 .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args       |  2 +-
 .../qemuxml2argv-hostdev-scsi-lsi.args             |  2 +-
 .../qemuxml2argv-hostdev-scsi-readonly.args        |  2 +-
 ...emuxml2argv-hostdev-scsi-virtio-iscsi-auth.args |  2 +-
 .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args    |  2 +-
 .../qemuxml2argv-hostdev-scsi-virtio-scsi.args     |  2 +-
 ...muxml2argv-hostdev-usb-address-device-boot.args |  2 +-
 .../qemuxml2argv-hostdev-usb-address-device.args   |  2 +-
 .../qemuxml2argv-hostdev-usb-address.args          |  2 +-
 .../qemuxml2argv-hostdev-vfio-multidomain.args     |  2 +-
 .../qemuxml2argv-hostdev-vfio.args                 |  2 +-
 .../qemuxml2argv-hotplug-base.args                 |  2 +-
 .../qemuxml2argv-hugepages-numa.args               |  2 +-
 .../qemuxml2argv-hugepages-pages.args              |  2 +-
 .../qemuxml2argv-hugepages-pages2.args             |  2 +-
 .../qemuxml2argv-hugepages-pages3.args             |  2 +-
 .../qemuxml2argv-hugepages-pages5.args             |  2 +-
 .../qemuxml2argv-hugepages-pages6.args             |  2 +-
 .../qemuxml2argv-hugepages-shared.args             |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-hugepages.args |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args  |  2 +-
 .../qemuxml2argv-hyperv-panic.args                 |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-hyperv.args    |  2 +-
 .../qemuxml2argv-input-usbmouse-addr.args          |  2 +-
 .../qemuxml2argv-input-usbmouse.args               |  2 +-
 .../qemuxml2argv-input-usbtablet.args              |  2 +-
 .../qemuxml2argv-iothreads-disk-virtio-ccw.args    |  2 +-
 .../qemuxml2argv-iothreads-disk.args               |  2 +-
 .../qemuxml2argv-iothreads-ids-partial.args        |  2 +-
 .../qemuxml2argv-iothreads-ids.args                |  2 +-
 .../qemuxml2argv-iothreads-virtio-scsi-ccw.args    |  2 +-
 .../qemuxml2argv-iothreads-virtio-scsi-pci.args    |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-iothreads.args |  2 +-
 .../qemuxml2argv-kvm-features-off.args             |  2 +-
 .../qemuxml2argv-kvm-features.args                 |  2 +-
 .../qemuxml2argv-kvm-pit-delay.args                |  2 +-
 .../qemuxml2argv-kvm-pit-device.args               |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-kvm.args       |  2 +-
 .../qemuxml2argv-kvmclock+eoi-disabled.args        |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args  |  2 +-
 .../qemuxml2argv-machine-aeskeywrap-off-cap.args   |  2 +-
 .../qemuxml2argv-machine-aeskeywrap-off-caps.args  |  2 +-
 .../qemuxml2argv-machine-aeskeywrap-on-cap.args    |  2 +-
 .../qemuxml2argv-machine-aeskeywrap-on-caps.args   |  2 +-
 .../qemuxml2argv-machine-aliases1.args             |  2 +-
 .../qemuxml2argv-machine-aliases2.args             |  2 +-
 .../qemuxml2argv-machine-core-off.args             |  2 +-
 .../qemuxml2argv-machine-core-on.args              |  2 +-
 .../qemuxml2argv-machine-deakeywrap-off-cap.args   |  2 +-
 .../qemuxml2argv-machine-deakeywrap-off-caps.args  |  2 +-
 .../qemuxml2argv-machine-deakeywrap-on-cap.args    |  2 +-
 .../qemuxml2argv-machine-deakeywrap-on-caps.args   |  2 +-
 .../qemuxml2argv-machine-keywrap-none-caps.args    |  2 +-
 .../qemuxml2argv-machine-keywrap-none.args         |  2 +-
 .../qemuxml2argv-machine-usb-opt.args              |  2 +-
 .../qemuxml2argv-machine-vmport-opt.args           |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-master-key.args  |  2 +-
 .../qemuxml2argv-memory-hotplug-dimm-addr.args     |  2 +-
 .../qemuxml2argv-memory-hotplug-dimm.args          |  2 +-
 .../qemuxml2argv-memory-hotplug-ppc64-nonuma.args  |  2 +-
 .../qemuxml2argv-memory-hotplug.args               |  2 +-
 .../qemuxml2argv-memtune-unlimited.args            |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-memtune.args   |  2 +-
 .../qemuxml2argv-migrate-numa-unaligned.args       |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-migrate.args   |  2 +-
 .../qemuxml2argv-minimal-msg-timestamp.args        |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-minimal.args   |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args |  2 +-
 .../qemuxml2argv-misc-disable-s3.args              |  2 +-
 .../qemuxml2argv-misc-disable-suspends.args        |  2 +-
 .../qemuxml2argv-misc-enable-s4.args               |  2 +-
 .../qemuxml2argv-misc-no-reboot.args               |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args  |  2 +-
 .../qemuxml2argv-mlock-unsupported.args            |  2 +-
 .../qemuxml2argv-monitor-json.args                 |  2 +-
 .../qemuxml2argv-multifunction-pci-device.args     |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-name-escape.args |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-net-client.args  |  2 +-
 .../qemuxml2argv-net-eth-hostip.args               |  2 +-
 .../qemuxml2argv-net-eth-ifname.args               |  2 +-
 .../qemuxml2argv-net-eth-names.args                |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-net-eth.args   |  2 +-
 .../qemuxml2argv-net-hostdev-multidomain.args      |  2 +-
 .../qemuxml2argv-net-hostdev-vfio-multidomain.args |  2 +-
 .../qemuxml2argv-net-hostdev-vfio.args             |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-net-server.args  |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-net-udp.args   |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-net-user.args  |  2 +-
 .../qemuxml2argv-net-vhostuser-multiq.args         |  2 +-
 .../qemuxml2argv-net-vhostuser.args                |  2 +-
 .../qemuxml2argv-net-virtio-ccw.args               |  2 +-
 .../qemuxml2argv-net-virtio-device.args            |  2 +-
 .../qemuxml2argv-net-virtio-disable-offloads.args  |  2 +-
 .../qemuxml2argv-net-virtio-netdev.args            |  2 +-
 .../qemuxml2argv-net-virtio-s390.args              |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-net-virtio.args  |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-no-shutdown.args |  2 +-
 .../qemuxml2argv-nographics-vga.args               |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-nographics.args  |  2 +-
 .../qemuxml2argv-nosharepages.args                 |  2 +-
 ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args |  2 +-
 ...d-auto-memory-vcpu-no-cpuset-and-placement.args |  2 +-
 ...muxml2argv-numad-auto-vcpu-static-numatune.args |  2 +-
 ...qemuxml2argv-numad-static-memory-auto-vcpu.args |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-numad.args     |  2 +-
 ...qemuxml2argv-numatune-auto-nodeset-invalid.args |  2 +-
 .../qemuxml2argv-numatune-auto-prefer.args         |  2 +-
 .../qemuxml2argv-numatune-memnode-no-memory.args   |  2 +-
 .../qemuxml2argv-numatune-memnode.args             |  2 +-
 .../qemuxml2argv-numatune-memory.args              |  2 +-
 .../qemuxml2argv-panic-double.args                 |  2 +-
 .../qemuxml2argv-panic-no-address.args             |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-panic.args     |  2 +-
 .../qemuxml2argv-parallel-parport-chardev.args     |  2 +-
 .../qemuxml2argv-parallel-tcp-chardev.args         |  2 +-
 .../qemuxml2argv-parallel-tcp.args                 |  2 +-
 .../qemuxml2argv-pci-autoadd-addr.args             |  2 +-
 .../qemuxml2argv-pci-autoadd-idx.args              |  2 +-
 .../qemuxml2argv-pci-autofill-addr.args            |  2 +-
 .../qemuxml2argv-pci-bridge-many-disks.args        |  2 +-
 .../qemuxml2argv-pci-expander-bus.args             |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-pci-many.args  |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args   |  2 +-
 .../qemuxml2argv-pci-serial-dev-chardev.args       |  2 +-
 .../qemuxml2argv-pcie-expander-bus.args            |  2 +-
 .../qemuxml2argv-pcie-root-port.args               |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args |  2 +-
 .../qemuxml2argv-pcie-switch-downstream-port.args  |  2 +-
 .../qemuxml2argv-pcie-switch-upstream-port.args    |  2 +-
 .../qemuxml2argv-pcihole64-q35.args                |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args |  2 +-
 .../qemuxml2argv-pmu-feature-off.args              |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-pmu-feature.args |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args   |  2 +-
 .../qemuxml2argv-ppc64-usb-controller-legacy.args  |  2 +-
 .../qemuxml2argv-ppc64-usb-controller.args         |  2 +-
 .../qemuxml2argv-ppce500-serial.args               |  2 +-
 .../qemuxml2argv-pseries-basic.args                |  2 +-
 .../qemuxml2argv-pseries-cpu-compat.args           |  2 +-
 .../qemuxml2argv-pseries-cpu-exact.args            |  2 +-
 .../qemuxml2argv-pseries-cpu-le.args               |  2 +-
 .../qemuxml2argv-pseries-nvram.args                |  2 +-
 .../qemuxml2argv-pseries-panic-missing.args        |  2 +-
 .../qemuxml2argv-pseries-panic-no-address.args     |  2 +-
 .../qemuxml2argv-pseries-usb-default.args          |  2 +-
 .../qemuxml2argv-pseries-usb-kbd.args              |  2 +-
 .../qemuxml2argv-pseries-usb-multi.args            |  2 +-
 .../qemuxml2argv-pseries-vio-user-assigned.args    |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args |  2 +-
 .../qemuxml2argv-pv-spinlock-disabled.args         |  2 +-
 .../qemuxml2argv-pv-spinlock-enabled.args          |  2 +-
 .../qemuxml2argv-q35-pm-disable-fallback.args      |  2 +-
 .../qemuxml2argv-q35-pm-disable.args               |  2 +-
 .../qemuxml2argv-q35-usb2-multi.args               |  2 +-
 .../qemuxml2argv-q35-usb2-reorder.args             |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args  |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-q35.args       |  2 +-
 .../qemuxml2argv-qemu-ns-commandline-ns0.args      |  2 +-
 .../qemuxml2argv-qemu-ns-commandline-ns1.args      |  2 +-
 .../qemuxml2argv-qemu-ns-commandline.args          |  2 +-
 ...emuxml2argv-qemu-ns-domain-commandline-ns0.args |  2 +-
 .../qemuxml2argv-qemu-ns-domain-commandline.args   |  2 +-
 .../qemuxml2argv-qemu-ns-domain-ns0.args           |  2 +-
 .../qemuxml2argv-qemu-ns-no-env.args               |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args   |  2 +-
 .../qemuxml2argv-reboot-timeout-disabled.args      |  2 +-
 .../qemuxml2argv-reboot-timeout-enabled.args       |  2 +-
 .../qemuxml2argv-restore-v2-fd.args                |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-restore-v2.args  |  2 +-
 ...muxml2argv-s390-allow-bogus-usb-controller.args |  2 +-
 .../qemuxml2argv-s390-allow-bogus-usb-none.args    |  2 +-
 .../qemuxml2argv-s390-panic-missing.args           |  2 +-
 .../qemuxml2argv-s390-panic-no-address.args        |  2 +-
 .../qemuxml2argv-seclabel-dac-none.args            |  2 +-
 .../qemuxml2argv-seclabel-dynamic-baselabel.args   |  2 +-
 .../qemuxml2argv-seclabel-dynamic-labelskip.args   |  2 +-
 .../qemuxml2argv-seclabel-dynamic-override.args    |  2 +-
 .../qemuxml2argv-seclabel-dynamic-relabel.args     |  2 +-
 .../qemuxml2argv-seclabel-dynamic.args             |  2 +-
 .../qemuxml2argv-seclabel-none.args                |  2 +-
 .../qemuxml2argv-seclabel-static-labelskip.args    |  2 +-
 .../qemuxml2argv-seclabel-static-relabel.args      |  2 +-
 .../qemuxml2argv-seclabel-static.args              |  2 +-
 .../qemuxml2argv-serial-dev-chardev-iobase.args    |  2 +-
 .../qemuxml2argv-serial-dev-chardev.args           |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-serial-dev.args  |  2 +-
 .../qemuxml2argv-serial-file-chardev.args          |  2 +-
 .../qemuxml2argv-serial-file-log.args              |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-serial-file.args |  2 +-
 .../qemuxml2argv-serial-many-chardev.args          |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-serial-many.args |  2 +-
 .../qemuxml2argv-serial-pty-chardev.args           |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-serial-pty.args  |  2 +-
 .../qemuxml2argv-serial-spiceport-nospice.args     |  2 +-
 .../qemuxml2argv-serial-spiceport.args             |  2 +-
 .../qemuxml2argv-serial-tcp-chardev.args           |  2 +-
 .../qemuxml2argv-serial-tcp-telnet-chardev.args    |  2 +-
 .../qemuxml2argv-serial-tcp-telnet.args            |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args  |  2 +-
 .../qemuxml2argv-serial-udp-chardev.args           |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-serial-udp.args  |  2 +-
 .../qemuxml2argv-serial-unix-chardev.args          |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-serial-unix.args |  2 +-
 .../qemuxml2argv-serial-vc-chardev.args            |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-shmem.args     |  2 +-
 .../qemuxml2argv-smartcard-controller.args         |  2 +-
 .../qemuxml2argv-smartcard-host-certificates.args  |  2 +-
 .../qemuxml2argv-smartcard-host.args               |  2 +-
 ...emuxml2argv-smartcard-passthrough-spicevmc.args |  2 +-
 .../qemuxml2argv-smartcard-passthrough-tcp.args    |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-smbios.args    |  2 +-
 .../qemuxml2argv-sound-device.args                 |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-sound.args     |  2 +-
 .../qemuxml2argv-tpm-passthrough.args              |  2 +-
 .../qemuxml2argv-usb-controller-default-q35.args   |  2 +-
 .../qemuxml2argv-usb-controller-explicit-q35.args  |  2 +-
 .../qemuxml2argv-usb-controller-xhci.args          |  2 +-
 .../qemuxml2argv-usb-controller.args               |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args   |  2 +-
 .../qemuxml2argv-usb-ich9-companion.args           |  2 +-
 .../qemuxml2argv-usb-ich9-ehci-addr.args           |  2 +-
 .../qemuxml2argv-usb-long-port-path.args           |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-usb-none.args  |  2 +-
 .../qemuxml2argv-usb-piix3-controller.args         |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args |  2 +-
 .../qemuxml2argv-usb-redir-boot.args               |  2 +-
 .../qemuxml2argv-usb-redir-filter-version.args     |  2 +-
 .../qemuxml2argv-usb-redir-filter.args             |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args |  2 +-
 .../qemuxml2argv-video-device-pciaddr-default.args |  2 +-
 .../qemuxml2argv-video-qxl-device-vgamem.args      |  2 +-
 .../qemuxml2argv-video-qxl-device.args             |  2 +-
 .../qemuxml2argv-video-qxl-heads.args              |  2 +-
 .../qemuxml2argv-video-qxl-nodevice.args           |  2 +-
 .../qemuxml2argv-video-qxl-noheads.args            |  2 +-
 .../qemuxml2argv-video-qxl-sec-device-vgamem.args  |  2 +-
 .../qemuxml2argv-video-qxl-sec-device.args         |  2 +-
 .../qemuxml2argv-video-vga-device-vgamem.args      |  2 +-
 .../qemuxml2argv-video-vga-device.args             |  2 +-
 .../qemuxml2argv-video-vga-nodevice.args           |  2 +-
 .../qemuxml2argv-video-virtio-gpu-device.args      |  2 +-
 .../qemuxml2argv-video-virtio-gpu-spice-gl.args    |  2 +-
 .../qemuxml2argv-video-virtio-gpu-virgl.args       |  2 +-
 .../qemuxml2argv-virtio-input-passthrough.args     |  2 +-
 .../qemuxml2argv-virtio-input.args                 |  2 +-
 .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args  |  2 +-
 .../qemuxml2argv-virtio-rng-ccw.args               |  2 +-
 .../qemuxml2argv-virtio-rng-default.args           |  2 +-
 .../qemuxml2argv-virtio-rng-egd.args               |  2 +-
 .../qemuxml2argv-virtio-rng-multiple.args          |  2 +-
 .../qemuxml2argv-virtio-rng-random.args            |  2 +-
 .../qemuxml2argv-watchdog-device.args              |  2 +-
 .../qemuxml2argv-watchdog-diag288.args             |  2 +-
 .../qemuxml2argv-watchdog-dump.args                |  2 +-
 .../qemuxml2argv-watchdog-injectnmi.args           |  2 +-
 tests/qemuxml2argvdata/qemuxml2argv-watchdog.args  |  2 +-
 tests/qemuxml2argvtest.c                           | 17 +++++----
 498 files changed, 503 insertions(+), 542 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2c0b29d..b9ef49d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1229,10 +1229,6 @@ virQEMUCapsComputeCmdFlags(const char *help,

     if (strstr(help, "-sdl"))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
-    if (strstr(help, "cores=") &&
-        strstr(help, "threads=") &&
-        strstr(help, "sockets="))
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY);

     if (strstr(help, ",vhost="))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);
@@ -3381,7 +3377,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index affb639..53a156c 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -85,7 +85,7 @@ typedef enum {
     X_QEMU_CAPS_BALLOON, /* -balloon available */
     X_QEMU_CAPS_DEVICE, /* Is the -device arg available */
     QEMU_CAPS_SDL, /* Is the new -sdl arg available */
-    QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */
+    X_QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */
     QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */

     /* 30 */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 3898ed7..9403196 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6862,8 +6862,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,

 static int
 qemuBuildSmpCommandLine(virCommandPtr cmd,
-                        const virDomainDef *def,
-                        virQEMUCapsPtr qemuCaps)
+                        const virDomainDef *def)
 {
     char *smp;
     virBuffer buf = VIR_BUFFER_INITIALIZER;
@@ -6872,29 +6871,18 @@ qemuBuildSmpCommandLine(virCommandPtr cmd,

     virBufferAsprintf(&buf, "%u", virDomainDefGetVcpus(def));

-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY)) {
-        if (virDomainDefHasVcpusOffline(def))
-            virBufferAsprintf(&buf, ",maxcpus=%u",
-                              virDomainDefGetVcpusMax(def));
-        /* sockets, cores, and threads are either all zero
-         * or all non-zero, thus checking one of them is enough */
-        if (def->cpu && def->cpu->sockets) {
-            virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets);
-            virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores);
-            virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads);
-        } else {
-            virBufferAsprintf(&buf, ",sockets=%u",
-                              virDomainDefGetVcpusMax(def));
-            virBufferAsprintf(&buf, ",cores=%u", 1);
-            virBufferAsprintf(&buf, ",threads=%u", 1);
-        }
-    } else if (virDomainDefHasVcpusOffline(def)) {
-        virBufferFreeAndReset(&buf);
-        /* FIXME - consider hot-unplugging cpus after boot for older qemu */
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("setting current vcpu count less than maximum is "
-                         "not supported with this QEMU binary"));
-        return -1;
+    if (virDomainDefHasVcpusOffline(def))
+        virBufferAsprintf(&buf, ",maxcpus=%u", virDomainDefGetVcpusMax(def));
+    /* sockets, cores, and threads are either all zero
+     * or all non-zero, thus checking one of them is enough */
+    if (def->cpu && def->cpu->sockets) {
+        virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets);
+        virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores);
+        virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads);
+    } else {
+        virBufferAsprintf(&buf, ",sockets=%u", virDomainDefGetVcpusMax(def));
+        virBufferAsprintf(&buf, ",cores=%u", 1);
+        virBufferAsprintf(&buf, ",threads=%u", 1);
     }

     if (virBufferCheckError(&buf) < 0)
@@ -9183,7 +9171,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
     if (qemuBuildMemCommandLine(cmd, cfg, def, qemuCaps) < 0)
         goto error;

-    if (qemuBuildSmpCommandLine(cmd, def, qemuCaps) < 0)
+    if (qemuBuildSmpCommandLine(cmd, def) < 0)
         goto error;

     if (qemuBuildIOThreadCommandLine(cmd, def, qemuCaps) < 0)
diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
index c1d5212..c84f3de 100644
--- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
index 3ac7bdd..c21fdd0 100644
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
index 78628ee..6dc74ce 100644
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index ba096b8..358ce3f 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 9b454b0..9e96dc0 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index db0d000..3b56444 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 964b6f0..19ac793 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 112ac95..b70933f 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 8157985..9c35290 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
index aa65733..a17896b 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
index 04d77f7..824fa08 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
index 120d249..35120af 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 1d503dd..99a7f75 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index d32a731..77ba06b 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -154,7 +154,6 @@ mymain(void)
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_SDL,
             QEMU_CAPS_CHARDEV,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_RTC,
             QEMU_CAPS_NO_HPET,
             QEMU_CAPS_BOOT_MENU,
@@ -173,7 +172,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
@@ -214,7 +212,6 @@ mymain(void)
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_SDL,
             QEMU_CAPS_CHARDEV,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
             QEMU_CAPS_NO_HPET,
@@ -239,7 +236,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
@@ -290,7 +286,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
@@ -339,7 +334,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
@@ -396,7 +390,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
@@ -469,7 +462,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args
index 1de2ecf..bf4b2f7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M virt \
 -cpu cortex-a53 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
 -nographic \
 -nodefconfig \

[... trimmed 6k lines (230KiB) of similar changes ...]


diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 6c526da..cca5247 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1288,7 +1288,7 @@ mymain(void)
     DO_TEST("qemu-ns", NONE);
     DO_TEST("qemu-ns-no-env", NONE);

-    DO_TEST("smp", QEMU_CAPS_SMP_TOPOLOGY);
+    DO_TEST("smp", NONE);

     DO_TEST("iothreads", QEMU_CAPS_OBJECT_IOTHREAD);
     DO_TEST("iothreads-ids", QEMU_CAPS_OBJECT_IOTHREAD);
@@ -1304,8 +1304,8 @@ mymain(void)
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI_IOTHREAD,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);

-    DO_TEST("cpu-topology1", QEMU_CAPS_SMP_TOPOLOGY);
-    DO_TEST("cpu-topology2", QEMU_CAPS_SMP_TOPOLOGY);
+    DO_TEST("cpu-topology1", NONE);
+    DO_TEST("cpu-topology2", NONE);
     DO_TEST("cpu-topology3", NONE);
     DO_TEST("cpu-minimum1", QEMU_CAPS_KVM);
     DO_TEST("cpu-minimum2", QEMU_CAPS_KVM);
@@ -1316,14 +1316,13 @@ mymain(void)
     DO_TEST_FAILURE("cpu-nofallback", QEMU_CAPS_KVM);
     DO_TEST("cpu-strict1", QEMU_CAPS_KVM);
     DO_TEST("cpu-numa1", NONE);
-    DO_TEST("cpu-numa2", QEMU_CAPS_SMP_TOPOLOGY);
-    DO_TEST("cpu-numa-no-memory-element", QEMU_CAPS_SMP_TOPOLOGY);
+    DO_TEST("cpu-numa2", NONE);
+    DO_TEST("cpu-numa-no-memory-element", NONE);
     DO_TEST_PARSE_ERROR("cpu-numa3", NONE);
     DO_TEST_FAILURE("cpu-numa-disjoint", NONE);
     DO_TEST("cpu-numa-disjoint", QEMU_CAPS_NUMA);
-    DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_SMP_TOPOLOGY,
-                    QEMU_CAPS_OBJECT_MEMORY_RAM);
-    DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_SMP_TOPOLOGY);
+    DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_OBJECT_MEMORY_RAM);
+    DO_TEST_FAILURE("cpu-numa-memshared", NONE);
     DO_TEST("cpu-host-model", NONE);
     DO_TEST("cpu-host-model-vendor", NONE);
     skipLegacyCPUs = true;
@@ -1352,7 +1351,7 @@ mymain(void)
     DO_TEST("cputune-zero-shares", NONE);
     DO_TEST_PARSE_ERROR("cputune-iothreadsched-toomuch", NONE);
     DO_TEST_PARSE_ERROR("cputune-vcpusched-overlap", NONE);
-    DO_TEST("cputune-numatune", QEMU_CAPS_SMP_TOPOLOGY,
+    DO_TEST("cputune-numatune",
             QEMU_CAPS_KVM,
             QEMU_CAPS_OBJECT_IOTHREAD,
             QEMU_CAPS_OBJECT_MEMORY_RAM,
-- 
2.9.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]