From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 20 Jun 2019 11:12:04 +0000 (+0200)
Subject: qemu: monitor: Remove text monitor support for cpu hot(un)plug
X-Git-Tag: v5.5.0-rc1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d828b744acae967c79513631425c685faf356be0;p=thirdparty%2Flibvirt.git

qemu: monitor: Remove text monitor support for cpu hot(un)plug

The "cpu-add" command is supported in all supported qemu versions and
cpu unplug did not work at all until the new cpu unplug approach (using
device_add/del) was implemented.

Remove the support for falling back to the text monitor.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 4eca75ecc9..8723ff49c7 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2979,8 +2979,9 @@ int qemuMonitorJSONSetCPU(qemuMonitorPtr mon,
                                          "i:id", cpu,
                                          NULL);
     } else {
-        /* offlining is not yet implemented in qmp */
-        goto fallback;
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("vCPU unplug is not supported by this QEMU"));
+        goto cleanup;
     }
     if (!cmd)
         goto cleanup;
@@ -2988,20 +2989,12 @@ int qemuMonitorJSONSetCPU(qemuMonitorPtr mon,
     if ((ret = qemuMonitorJSONCommand(mon, cmd, &reply)) < 0)
         goto cleanup;
 
-    if (qemuMonitorJSONHasError(reply, "CommandNotFound"))
-        goto fallback;
-    else
-        ret = qemuMonitorJSONCheckError(cmd, reply);
+    ret = qemuMonitorJSONCheckError(cmd, reply);
 
  cleanup:
     virJSONValueFree(cmd);
     virJSONValueFree(reply);
     return ret;
-
- fallback:
-    VIR_DEBUG("no QMP support for cpu_set, trying HMP");
-    ret = qemuMonitorTextSetCPU(mon, cpu, online);
-    goto cleanup;
 }