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>
---
 src/qemu/qemu_monitor_json.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 4eca75ecc9..6d4f119a35 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;
 }


-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Thu, Jun 20, 2019 at 01:22:26PM +0200, Peter Krempa wrote:
>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>
>---
> src/qemu/qemu_monitor_json.c | 15 ++++-----------
> 1 file changed, 4 insertions(+), 11 deletions(-)
>
>diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
>index 4eca75ecc9..6d4f119a35 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"));

s/qemu/QEMU/

>+        goto cleanup;
>     }
>     if (!cmd)
>         goto cleanup;

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list