From c1300176f7a3730c0aa82a28e58d9c721818be1a Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 6 Apr 2016 14:24:39 +0200
Subject: [PATCH] qemu: command: Assume QEMU_CAPS_DEVICE when building
 memballoon args

---
 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 9e19848685..0662e39136 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3525,6 +3525,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.
      *
@@ -3543,18 +3544,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;
 }
-- 
GitLab