diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2bfd94995f00a0a4c89427d1ecd8b4c75f6ec9b8..ed92e99b90e7f0ddfcad061051a32d816ad8dd4f 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 b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml
index b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml
index b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml
index b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml
index a879d67df32bedfcbff4609617cc44732aa44a93..f6572c8ecd4b5a30f7df3c15f366c1dfb4981eeb 100644
--- a/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-aarch64
-
- /usr/bin/qemu-system-aarch64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml
index 74eaf3ba0eebf9efeb9fc15722fcb91e61f8ffc9..85623f39804cda36cdeb2be8c888984424068ef6 100644
--- a/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-ppc64
-
- /usr/bin/qemu-system-ppc64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml
index 20ef995d62d4baac59ab9f624871d46bfb148556..bb82a150409ef3970ce160e29930f85febd546c4 100644
--- a/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-s390x
-
- /usr/bin/qemu-system-s390x
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml
index b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml
index 20ef995d62d4baac59ab9f624871d46bfb148556..bb82a150409ef3970ce160e29930f85febd546c4 100644
--- a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-s390x
-
- /usr/bin/qemu-system-s390x
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml
index b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml
index a879d67df32bedfcbff4609617cc44732aa44a93..f6572c8ecd4b5a30f7df3c15f366c1dfb4981eeb 100644
--- a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-aarch64
-
- /usr/bin/qemu-system-aarch64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml
index 74eaf3ba0eebf9efeb9fc15722fcb91e61f8ffc9..85623f39804cda36cdeb2be8c888984424068ef6 100644
--- a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-ppc64
-
- /usr/bin/qemu-system-ppc64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml
index 20ef995d62d4baac59ab9f624871d46bfb148556..bb82a150409ef3970ce160e29930f85febd546c4 100644
--- a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-s390x
-
- /usr/bin/qemu-system-s390x
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml
index b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml
index b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml
index b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml
index a879d67df32bedfcbff4609617cc44732aa44a93..f6572c8ecd4b5a30f7df3c15f366c1dfb4981eeb 100644
--- a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-aarch64
-
- /usr/bin/qemu-system-aarch64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml
index 74eaf3ba0eebf9efeb9fc15722fcb91e61f8ffc9..85623f39804cda36cdeb2be8c888984424068ef6 100644
--- a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-ppc64
-
- /usr/bin/qemu-system-ppc64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml
index b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml
index 20ef995d62d4baac59ab9f624871d46bfb148556..bb82a150409ef3970ce160e29930f85febd546c4 100644
--- a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-s390x
-
- /usr/bin/qemu-system-s390x
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml
index b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml
index 20ef995d62d4baac59ab9f624871d46bfb148556..bb82a150409ef3970ce160e29930f85febd546c4 100644
--- a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-s390x
-
- /usr/bin/qemu-system-s390x
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml
index b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml
index 74eaf3ba0eebf9efeb9fc15722fcb91e61f8ffc9..85623f39804cda36cdeb2be8c888984424068ef6 100644
--- a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-ppc64
-
- /usr/bin/qemu-system-ppc64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml
index 20ef995d62d4baac59ab9f624871d46bfb148556..bb82a150409ef3970ce160e29930f85febd546c4 100644
--- a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-s390x
-
- /usr/bin/qemu-system-s390x
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml
index b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml
index 74eaf3ba0eebf9efeb9fc15722fcb91e61f8ffc9..85623f39804cda36cdeb2be8c888984424068ef6 100644
--- a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml
@@ -14,9 +14,7 @@
64
/usr/bin/qemu-system-ppc64
-
- /usr/bin/qemu-system-ppc64
-
+
diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml
index b58f54fefda7ede7c2c08f06eee2e58e3fc10bc4..d41693a00173fe2dc17c27569da817ce7343ebc7 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 @@
64
/usr/bin/qemu-system-x86_64
-
- /usr/bin/qemu-system-x86_64
-
+