[libvirt] [PATCH 1/8] qemu: command: Assume QEMU_CAPS_DEVICE when building memballoon args

[Peter Krempa]

---
 src/qemu/qemu_command.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index a6afaec..bcd2408 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3452,6 +3452,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd,
                                const virDomainDef *def,
                                virQEMUCapsPtr qemuCaps)
 {
+    char *optstr;
     /* QEMU changed its default behavior to not include the virtio balloon
      * device.  Explicitly request it to ensure it will be present.
      *
@@ -3470,18 +3471,14 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd,
                            virDomainMemballoonModelTypeToString(def->memballoon->model));
             return -1;
         }
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
-            char *optstr;
-            virCommandAddArg(cmd, "-device");

-            optstr = qemuBuildMemballoonDevStr(def, def->memballoon, qemuCaps);
-            if (!optstr)
-                return -1;
-            virCommandAddArg(cmd, optstr);
-            VIR_FREE(optstr);
-        } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BALLOON)) {
-            virCommandAddArgList(cmd, "-balloon", "virtio", NULL);
-        }
+        virCommandAddArg(cmd, "-device");
+
+        optstr = qemuBuildMemballoonDevStr(def, def->memballoon, qemuCaps);
+        if (!optstr)
+            return -1;
+        virCommandAddArg(cmd, optstr);
+        VIR_FREE(optstr);
     }
     return 0;
 }
-- 
2.8.0