]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: do not format <usedQMP/> in qemu caps XML
authorJán Tomko <jtomko@redhat.com>
Fri, 8 Feb 2019 12:22:12 +0000 (13:22 +0100)
committerJán Tomko <jtomko@redhat.com>
Tue, 12 Feb 2019 13:02:38 +0000 (14:02 +0100)
Since commit a7424faff QMP is always used.

Also, commit 932534e8 removed the last use of this apart from:
* parsing/formatting this in the caps cache
* using it as a temporary variable to know when to report an error

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
37 files changed:
src/qemu/qemu_capabilities.c
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml

index f035e68251d4a2495347ae93bf2d234148c12966..9d9c8096baf6df9de23e178e6fa5c7cdc9b710e0 100644 (file)
@@ -3357,7 +3357,6 @@ virQEMUCapsParseSEVInfo(virQEMUCapsPtr qemuCaps, xmlXPathContextPtr ctxt)
  *   <qemuctime>234235253</qemuctime>
  *   <selfctime>234235253</selfctime>
  *   <selfvers>1002016</selfvers>
- *   <usedQMP/>
  *   <flag name='foo'/>
  *   <flag name='bar'/>
  *   ...
@@ -3418,9 +3417,6 @@ virQEMUCapsLoadCache(virArch hostArch,
     if (virXPathULong("string(./selfvers)", ctxt, &lu) == 0)
         qemuCaps->libvirtVersion = lu;
 
-    qemuCaps->usedQMP = virXPathBoolean("count(./usedQMP) > 0",
-                                        ctxt) > 0;
-
     if ((n = virXPathNodeSet("./flag", ctxt, &nodes)) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("failed to parse qemu capabilities flags"));
@@ -3761,9 +3757,6 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps)
     virBufferAsprintf(&buf, "<selfvers>%lu</selfvers>\n",
                       (unsigned long)qemuCaps->libvirtVersion);
 
-    if (qemuCaps->usedQMP)
-        virBufferAddLit(&buf, "<usedQMP/>\n");
-
     for (i = 0; i < QEMU_CAPS_LAST; i++) {
         if (virQEMUCapsGet(qemuCaps, i)) {
             virBufferAsprintf(&buf, "<flag name='%s'/>\n",
index b54b438f63dca0d99f50dd59627a96149a577e03..d6269102589f998b92f2e351704ca665b20c21f2 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index 4754467ce7f2e70f1b74652c480ab64708921b27..c281cd5f7fcc3d61f4f095ae9d010c33303b934c 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index 84d9777f682966c19f9f507f73846797a329e6c3..bb6c598fc2b6a4dddc3e2b46ffc27af8b1c56215 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index c632a1332bd63c03627cf04cbd12548350413b66..340a725287cc8764b57df04857cdd64de4cacf8f 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index 6c537567cde54834462d2b08661e02665bde405a..e8bf3cef9f66c74f73dfbac6831dc518573d3bf2 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='hda-duplex'/>
   <flag name='virtio-tx-alg'/>
index ca481f84ce6177b460b4a1fa0316a903315c50ad..b24e26dfc522192d40c2bc29aabde8f87e5fff43 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='hda-duplex'/>
   <flag name='virtio-tx-alg'/>
index dced5b51f97c8864c52329a6ea45893eea372235..6707633b14f160428f10b7256c7e6d9cc1309fa7 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
index 2b40d0e28f049959366cc239f983f04b2e945014..1e3a4d753c10a92edd778d0205f6787bf1907cb8 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index 82daefafa0a958da7c02644c862031f9dabb18bd..a781af8a04ee1214bfaa46bcbb375d49d83e5c4a 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
index 25c22e34f6f4c6cbbdfd077847b1ebc6698b618f..1ebf54baaee2e90379d1fb43efa0e5b72ba73437 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index 0d22eff9b9033c607d8878135e1e1659f76ffd0b..4531964c751e73b959a9da0638becb00da4f8429 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='hda-duplex'/>
   <flag name='virtio-tx-alg'/>
index c20ecbfa519171e998fd252d1485714e38d22e8b..835d36425fabc2d29d56fd8d139c6f619af21dfa 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='hda-duplex'/>
   <flag name='virtio-tx-alg'/>
index 0beb46aeb87c684149fb5d70a33f5fc0cc0c42ec..4988ab3fe7b979325482dcff95bf557b27180511 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
index 39cd9aebf515ed20a66ef280c2764e1f9b9316ac..301ab899bbe6c56f161bef160127c3f47fc8e18b 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index 9fbb010feb66c8826c0d74544eb7909bd925052f..14de9d7b3b6413a3b9f152d08078ab35740eb9e3 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index 5bae2bd7002e77eab25e26af0d7b6af6fb15e81b..24f47515d48d5c061de3f2a00ea348d2463bffa9 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index a06ca127b342bbde074de976872592bab5efa058..59688ea09f459ec9827ee22cd421bd3bb1cbd854 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
index a9327561513d5539911f1d4670c33a44b8af3ee7..0ceadb42c02d0c1b239ab17c72b06347036c2692 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='hda-duplex'/>
   <flag name='virtio-tx-alg'/>
index dd1d3accf97e3530abb66be1479f08e833099c2b..828ee630afc9061dc55adb02b01292acff37191f 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index c48711eba48b91dbaa07e42c386267a6d8c31199..77e067e9ba68f893ee06da4094ef758320624192 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
index 0106c16eaa8d52ec7b7abff301b847995e9b6eef..9e9aeb144986b9584d5bb40968384d43358734da 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index 232060ddfffe2e0e3a1af5ab44a85f5aef24d62e..87cc501e25b11d7beb519e8977c3c6fdaa5f8f5c 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
index 6bcb1034f8a616d8bf41f8669f007bc6efa62888..5eb786945b81e01a56bbe38423b7506aa9c0c4c3 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index 2344a5f9aaf49af1cf5366408afd787509422376..0bc61f9c2b21674d32bbb182fabb4610221ea477 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='hda-duplex'/>
   <flag name='virtio-tx-alg'/>
index fd1518b929b4c84b46455db881e72707dd293b70..f628417a0dd06d97f6a3f2ec8ec4c1d117dd97af 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
index 360ce218f4df3a57dcf2b672fc43f1370517b1b4..fe3385680a51a6c758bc9d976f99a54c3e08038d 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index 71198a608ab582990b76b02d391c1e5aeafa05b0..4de8f17f517a22de64950826831ea2970c350da5 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='hda-duplex'/>
   <flag name='virtio-tx-alg'/>
index 1ff0e12f012a31510a0fbcf5b2f1798f11bba1c9..669c0dd786ba5dc14d0b5db1dd8308099c34f6ea 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>
   <flag name='transaction'/>
index 1f07d6ad6511a4045966b10d552b4aacd42764c3..7884d6c07fdbb3ef0fa075f7ef0726081726cf86 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>
   <flag name='transaction'/>
index b784360a6a6fde32a67e64419f70d44b683d4b87..57d9fc677040927afe2978ed1d66d25dc9283487 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
index 4b28962bb98a2f250d4757f98ff1aa1ee96e8d41..ad942520e9541cedab5c727328040c06aabfd0a2 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index 11be58b496bb3725206b17b5613f7a11ec463a47..1ad1dbcdbcf85dfd03750cbadfa2b50a1ac6ac9a 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='hda-duplex'/>
   <flag name='virtio-tx-alg'/>
index f13ef0ece2d2c080dad5f9c59a34b256523f10ee..39b910e3b18e2656079ae468000e66b6a189bc9b 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>
index 3d958db4615e46ceb35b5a3489670df68213c57b..14fd0228ea5a0c252d470f576570f48a92c1465d 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='spice'/>
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
index 40083843f2e9f56e530605b3d57eb0f7f87479fd..437e7112932e8538d98003a5401906fa36d2d76c 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='spice'/>
   <flag name='hda-duplex'/>
   <flag name='ccid-emulated'/>
index 109b1ff753a3ddf9976eea4be23060082e479a8f..88e9e029fb2186958e3dfbfcd7a1d74a4eb9e33d 100644 (file)
@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>