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@xxxxxxxxxx> --- src/qemu/qemu_capabilities.c | 2 +- tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml | 4 +--- tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml | 4 +--- tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml | 4 +--- 29 files changed, 29 insertions(+), 85 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e14da5acab..88f5b1f34e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/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) { diff --git a/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml index a879d67df3..f6572c8ecd 100644 --- a/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml index 74eaf3ba0e..85623f3980 100644 --- a/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml index 20ef995d62..bb82a15040 100644 --- a/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml index 20ef995d62..bb82a15040 100644 --- a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml index a879d67df3..f6572c8ecd 100644 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml index 74eaf3ba0e..85623f3980 100644 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml index 20ef995d62..bb82a15040 100644 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml index a879d67df3..f6572c8ecd 100644 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml index 74eaf3ba0e..85623f3980 100644 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml index 20ef995d62..bb82a15040 100644 --- a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml index 20ef995d62..bb82a15040 100644 --- a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml index 74eaf3ba0e..85623f3980 100644 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml index 20ef995d62..bb82a15040 100644 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml index 74eaf3ba0e..85623f3980 100644 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml +++ b/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/> diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml index b58f54fefd..d41693a001 100644 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml +++ b/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/> -- 2.17.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list