From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 22 Apr 2010 15:39:10 +0000 (+0100)
Subject: Fix CPU hotplug command names
X-Git-Tag: v0.8.1~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a980d123b54d47cace77b6f49186de70c068b12d;p=thirdparty%2Flibvirt.git

Fix CPU hotplug command names

Probably as a result of a merge error, the CPU hotplug command
names were completely wrong.

* src/qemu/qemu_monitor_json.c, src/qemu/qemu_monitor_text.c: Fix
  the CPU hotplug command names
---

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index cde9899b11..96f246f5bb 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -1181,7 +1181,7 @@ int qemuMonitorJSONSetCPU(qemuMonitorPtr mon,
                           int cpu, int online)
 {
     int ret;
-    virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("balloon",
+    virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("cpu_set",
                                                      "U:cpu", (unsigned long long)cpu,
                                                      "s:state", online ? "online" : "offline",
                                                      NULL);
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 6ad07b1c7f..db3806db68 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -800,7 +800,7 @@ int qemuMonitorTextSetBalloon(qemuMonitorPtr mon,
 
 
 /*
- * Returns: 0 if balloon not supported, +1 if balloon adjust worked
+ * Returns: 0 if CPU hotplug not supported, +1 if CPU hotplug worked
  * or -1 on failure
  */
 int qemuMonitorTextSetCPU(qemuMonitorPtr mon, int cpu, int online)
@@ -809,7 +809,7 @@ int qemuMonitorTextSetCPU(qemuMonitorPtr mon, int cpu, int online)
     char *reply = NULL;
     int ret = -1;
 
-    if (virAsprintf(&cmd, "set_cpu %d %s", cpu, online ? "online" : "offline") < 0) {
+    if (virAsprintf(&cmd, "cpu_set %d %s", cpu, online ? "online" : "offline") < 0) {
         virReportOOMError();
         return -1;
     }