qemu: Don't duplicate binary name in capabilities

virCapabilitiesAddGuestDomain() takes an optional binary
name: this is intended for cases where a certain domain
type can't use the default one registered for the guest
architecture, but has to use a special binary instead.

The current code, however, will pass 'binary' again when
'kvmbin' is not defined, which is unnecessary as 'binary'
has been registered as default earlier, and will result
in capabilities output such as

  <emulator>/usr/bin/qemu-system-x86_64</emulator>
  <domain type='qemu'/>
  <domain type='kvm'>
    <emulator>/usr/bin/qemu-system-x86_64</emulator>
  </domain>

with the second <emulator> element providing no additional
information.

Change it so that, when 'kvmbin' is not defined, NULL is
passed and so the default emulator will be used instead.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>

src/qemu/qemu_capabilities.c

@@ -885,7 +885,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
 
         if ((dom = virCapabilitiesAddGuestDomain(guest,
                                                  VIR_DOMAIN_VIRT_KVM,
-                                                 kvmbin ? kvmbin : binary,
+                                                 kvmbin ? kvmbin : NULL,
                                                  NULL,
                                                  nmachines,
                                                  machines)) == NULL) {

tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-aarch64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-aarch64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-ppc64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-ppc64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-s390x</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-s390x</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-s390x</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-s390x</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-aarch64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-aarch64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-ppc64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-ppc64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-s390x</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-s390x</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-aarch64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-aarch64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-ppc64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-ppc64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-s390x</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-s390x</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-s390x</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-s390x</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-ppc64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-ppc64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-s390x</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-s390x</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-ppc64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-ppc64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>

tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml

@@ -14,9 +14,7 @@
       <wordsize>64</wordsize>
       <emulator>/usr/bin/qemu-system-x86_64</emulator>
       <domain type='qemu'/>
-      <domain type='kvm'>
-        <emulator>/usr/bin/qemu-system-x86_64</emulator>
-      </domain>
+      <domain type='kvm'/>
     </arch>
     <features>
       <cpuselection/>