diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9e19848685f7320fbdbd63f80d2d4bb780425946..0662e3913670d97b49967ebb5ef5982469f60be2 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; }