qemu: do not format <usedQMP/> in qemu caps XML

Since commit a7424faf 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: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NJiri Denemark <jdenemar@redhat.com>

src/qemu/qemu_capabilities.c

@@ -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",

tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>

tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml

@@ -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'/>

tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml

@@ -2,7 +2,6 @@
   <qemuctime>0</qemuctime>
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
-  <usedQMP/>
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='spice'/>