Re: [libvirt] [PATCH 4/5] qemu: capabilities: Always assume QEMU_CAPS_ADD_FD
On 08/14/2018 03:21 PM, Peter Krempa wrote: > The capability was usable since qemu 1.3 so we can remove all the > detection code. > > Signed-off-by: Peter Krempa > --- > > Note that the *replies files need to be renumbered. I've split that to a > separate patch for ease of review. Notably because it was done > automatically by tests/qemucapsfixreplies. > > src/qemu/qemu_capabilities.c | 17 > src/qemu/qemu_capabilities.h | 2 +- > src/qemu/qemu_command.c| 32 > ++ > .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 3 +- > .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 3 +- > .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 3 +- > .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 3 +- > .../caps_2.10.0.aarch64.replies| 17 > tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 3 +- > .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 17 > tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 3 +- > .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 17 > tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 3 +- > .../caps_2.10.0.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 3 +- > .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 17 > tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 +- > .../caps_2.11.0.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 3 +- > .../caps_2.12.0.aarch64.replies| 17 > tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 3 +- > .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 17 > tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 3 +- > .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 17 > tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 +- > .../caps_2.12.0.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- > .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 +- > .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 +- > .../caps_2.6.0.aarch64.replies | 17 > tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 3 +- > .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 17 > tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml| 3 +- > .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 +- > .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 17 > tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml| 3 +- > .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 +- > .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 17 > tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml| 3 +- > .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 3 +- > .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 17 > tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml| 3 +- > .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 17 > tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml| 3 +- > .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 +- > .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 17 > tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml| 3 +- > .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 17 > tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 3 +- > tests/qemuxml2argvtest.c | 2 -- > 60 files changed, 43 insertions(+), 570 deletions(-) ACK if you squash 5/5 into this one. Michal -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
[libvirt] [PATCH 4/5] qemu: capabilities: Always assume QEMU_CAPS_ADD_FD
The capability was usable since qemu 1.3 so we can remove all the
detection code.
Signed-off-by: Peter Krempa
---
Note that the *replies files need to be renumbered. I've split that to a
separate patch for ease of review. Notably because it was done
automatically by tests/qemucapsfixreplies.
src/qemu/qemu_capabilities.c | 17
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c| 32 ++
.../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 3 +-
.../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 3 +-
.../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 3 +-
.../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 3 +-
.../caps_2.10.0.aarch64.replies| 17
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 3 +-
.../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 17
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 3 +-
.../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 17
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 3 +-
.../caps_2.10.0.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 3 +-
.../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 17
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 +-
.../caps_2.11.0.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 3 +-
.../caps_2.12.0.aarch64.replies| 17
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 3 +-
.../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 17
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 3 +-
.../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 17
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 +-
.../caps_2.12.0.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +-
.../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 +-
.../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 +-
.../caps_2.6.0.aarch64.replies | 17
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 3 +-
.../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 17
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml| 3 +-
.../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 +-
.../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 17
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml| 3 +-
.../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 +-
.../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 17
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml| 3 +-
.../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 3 +-
.../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 17
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml| 3 +-
.../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 17
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml| 3 +-
.../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 +-
.../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 17
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml| 3 +-
.../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 17
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 3 +-
tests/qemuxml2argvtest.c | 2 --
60 files changed, 43 insertions(+), 570 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index e6e199b2c6..434e5e152c 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1008,7 +1008,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
{ "query-vnc", QEMU_CAPS_VNC },
{ "drive-mirror", QEMU_CAPS_DRIVE_MIRROR },
{ "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT },
-{ "add-fd", QEMU_CAPS_ADD_FD },
{ "nbd-server-start", QEMU_CAPS_NBD_SERVER },
{ "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE },
{ "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION },
@@ -2122,22 +2121,6 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps,
