提交 c1300176 编写于 作者: P Peter Krempa

qemu: command: Assume QEMU_CAPS_DEVICE when building memballoon args

上级 feffcc03
...@@ -3525,6 +3525,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, ...@@ -3525,6 +3525,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd,
const virDomainDef *def, const virDomainDef *def,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
char *optstr;
/* QEMU changed its default behavior to not include the virtio balloon /* QEMU changed its default behavior to not include the virtio balloon
* device. Explicitly request it to ensure it will be present. * device. Explicitly request it to ensure it will be present.
* *
...@@ -3543,8 +3544,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, ...@@ -3543,8 +3544,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd,
virDomainMemballoonModelTypeToString(def->memballoon->model)); virDomainMemballoonModelTypeToString(def->memballoon->model));
return -1; return -1;
} }
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
char *optstr;
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
optstr = qemuBuildMemballoonDevStr(def, def->memballoon, qemuCaps); optstr = qemuBuildMemballoonDevStr(def, def->memballoon, qemuCaps);
...@@ -3552,9 +3552,6 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, ...@@ -3552,9 +3552,6 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd,
return -1; return -1;
virCommandAddArg(cmd, optstr); virCommandAddArg(cmd, optstr);
VIR_FREE(optstr); VIR_FREE(optstr);
} else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BALLOON)) {
virCommandAddArgList(cmd, "-balloon", "virtio", NULL);
}
} }
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册