* [PATCH 01/32] monitor: Drop unnecessary includes
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 22:43 ` Stefan Berger
2023-01-24 12:19 ` [PATCH 02/32] audio: Move HMP commands from monitor/ to audio/ Markus Armbruster
` (30 subsequent siblings)
31 siblings, 1 reply; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor/hmp-cmds.c | 4 ----
monitor/hmp.c | 3 ---
monitor/misc.c | 14 ++------------
monitor/monitor.c | 1 -
monitor/qmp-cmds-control.c | 1 -
monitor/qmp-cmds.c | 8 --------
6 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 1dba973092..de1a96d48c 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -18,17 +18,14 @@
#include "net/net.h"
#include "net/eth.h"
#include "chardev/char.h"
-#include "sysemu/block-backend.h"
#include "sysemu/runstate.h"
#include "qemu/config-file.h"
#include "qemu/option.h"
-#include "qemu/timer.h"
#include "qemu/sockets.h"
#include "qemu/help_option.h"
#include "monitor/monitor.h"
#include "qapi/error.h"
#include "qapi/clone-visitor.h"
-#include "qapi/opts-visitor.h"
#include "qapi/qapi-builtin-visit.h"
#include "qapi/qapi-commands-block.h"
#include "qapi/qapi-commands-char.h"
@@ -42,7 +39,6 @@
#include "qapi/qapi-commands-stats.h"
#include "qapi/qapi-commands-tpm.h"
#include "qapi/qapi-commands-virtio.h"
-#include "qapi/qapi-visit-virtio.h"
#include "qapi/qapi-visit-net.h"
#include "qapi/qapi-visit-migration.h"
#include "qapi/qmp/qdict.h"
diff --git a/monitor/hmp.c b/monitor/hmp.c
index 43fd69f984..65641a6e56 100644
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -23,11 +23,9 @@
*/
#include "qemu/osdep.h"
-#include <dirent.h>
#include "hw/qdev-core.h"
#include "monitor-internal.h"
#include "monitor/hmp.h"
-#include "qapi/error.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qnum.h"
#include "qemu/config-file.h"
@@ -37,7 +35,6 @@
#include "qemu/option.h"
#include "qemu/units.h"
#include "sysemu/block-backend.h"
-#include "sysemu/runstate.h"
#include "trace.h"
static void monitor_command_cb(void *opaque, const char *cmdline,
diff --git a/monitor/misc.c b/monitor/misc.c
index 053af4045e..6fc8bfef13 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -25,27 +25,20 @@
#include "qemu/osdep.h"
#include "monitor-internal.h"
#include "monitor/qdev.h"
-#include "hw/pci/pci.h"
-#include "sysemu/watchdog.h"
#include "exec/gdbstub.h"
#include "net/net.h"
#include "net/slirp.h"
#include "ui/qemu-spice.h"
-#include "qemu/config-file.h"
#include "qemu/ctype.h"
#include "audio/audio.h"
#include "disas/disas.h"
-#include "qemu/timer.h"
#include "qemu/log.h"
#include "sysemu/hw_accel.h"
#include "sysemu/runstate.h"
-#include "authz/list.h"
-#include "qapi/util.h"
#include "sysemu/sysemu.h"
#include "sysemu/device_tree.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qstring.h"
#include "qom/object_interfaces.h"
#include "trace/control.h"
#include "monitor/hmp-target.h"
@@ -53,10 +46,8 @@
#ifdef CONFIG_TRACE_SIMPLE
#include "trace/simple.h"
#endif
-#include "exec/memory.h"
-#include "exec/exec-all.h"
-#include "qemu/option.h"
-#include "qemu/thread.h"
+#include "exec/address-spaces.h"
+#include "exec/ioport.h"
#include "block/qapi.h"
#include "block/block-hmp-cmds.h"
#include "qapi/qapi-commands-char.h"
@@ -69,7 +60,6 @@
#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-init-commands.h"
#include "qapi/error.h"
-#include "qapi/qmp-event.h"
#include "qemu/cutils.h"
#if defined(TARGET_S390X)
diff --git a/monitor/monitor.c b/monitor/monitor.c
index 7ed7bd5342..605fe41748 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -29,7 +29,6 @@
#include "qapi/qapi-emit-events.h"
#include "qapi/qapi-visit-control.h"
#include "qapi/qmp/qdict.h"
-#include "qemu/error-report.h"
#include "qemu/option.h"
#include "sysemu/qtest.h"
#include "trace.h"
diff --git a/monitor/qmp-cmds-control.c b/monitor/qmp-cmds-control.c
index 6e581713a3..f21506efa5 100644
--- a/monitor/qmp-cmds-control.c
+++ b/monitor/qmp-cmds-control.c
@@ -30,7 +30,6 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-introspect.h"
-#include "qapi/qapi-emit-events.h"
#include "qapi/qapi-introspect.h"
#include "qapi/qapi-visit-introspect.h"
#include "qapi/qobject-input-visitor.h"
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index bf22a8c5a6..743849c0b5 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -14,29 +14,21 @@
*/
#include "qemu/osdep.h"
-#include "block/blockjob.h"
-#include "qemu/cutils.h"
-#include "qemu/option.h"
#include "monitor/monitor.h"
#include "monitor/qmp-helpers.h"
#include "sysemu/sysemu.h"
-#include "qemu/config-file.h"
-#include "qemu/uuid.h"
#include "chardev/char.h"
#include "sysemu/kvm.h"
#include "sysemu/runstate.h"
#include "sysemu/runstate-action.h"
-#include "sysemu/blockdev.h"
#include "sysemu/block-backend.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-acpi.h"
-#include "qapi/qapi-commands-block.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-stats.h"
#include "qapi/type-helpers.h"
-#include "exec/ramlist.h"
#include "hw/mem/memory-device.h"
#include "hw/acpi/acpi_dev_interface.h"
#include "hw/intc/intc.h"
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* Re: [PATCH 01/32] monitor: Drop unnecessary includes
2023-01-24 12:19 ` [PATCH 01/32] monitor: Drop unnecessary includes Markus Armbruster
@ 2023-01-24 22:43 ` Stefan Berger
0 siblings, 0 replies; 44+ messages in thread
From: Stefan Berger @ 2023-01-24 22:43 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
On 1/24/23 07:19, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH 02/32] audio: Move HMP commands from monitor/ to audio/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
2023-01-24 12:19 ` [PATCH 01/32] monitor: Drop unnecessary includes Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 03/32] char: Move HMP commands from monitor/ to chardev/ Markus Armbruster
` (29 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS sections "Human
Monitor (HMP)" and "QMP" to "Overall Audio backends".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/monitor/hmp.h | 3 ++
audio/audio-hmp-cmds.c | 83 ++++++++++++++++++++++++++++++++++++++++++
monitor/misc.c | 56 ----------------------------
audio/meson.build | 1 +
4 files changed, 87 insertions(+), 56 deletions(-)
create mode 100644 audio/audio-hmp-cmds.c
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index 1b3bdcb446..c25bec1863 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -151,5 +151,8 @@ void hmp_human_readable_text_helper(Monitor *mon,
HumanReadableText *(*qmp_handler)(Error **));
void hmp_info_stats(Monitor *mon, const QDict *qdict);
void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict);
+void hmp_info_capture(Monitor *mon, const QDict *qdict);
+void hmp_stopcapture(Monitor *mon, const QDict *qdict);
+void hmp_wavcapture(Monitor *mon, const QDict *qdict);
#endif
diff --git a/audio/audio-hmp-cmds.c b/audio/audio-hmp-cmds.c
new file mode 100644
index 0000000000..1237ce9e75
--- /dev/null
+++ b/audio/audio-hmp-cmds.c
@@ -0,0 +1,83 @@
+/*
+ * HMP commands related to audio backends
+ *
+ * Copyright (c) 2003-2004 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "qemu/osdep.h"
+#include "audio/audio.h"
+#include "monitor/hmp.h"
+#include "monitor/monitor.h"
+#include "qapi/qmp/qdict.h"
+
+static QLIST_HEAD (capture_list_head, CaptureState) capture_head;
+
+void hmp_info_capture(Monitor *mon, const QDict *qdict)
+{
+ int i;
+ CaptureState *s;
+
+ for (s = capture_head.lh_first, i = 0; s; s = s->entries.le_next, ++i) {
+ monitor_printf(mon, "[%d]: ", i);
+ s->ops.info (s->opaque);
+ }
+}
+
+void hmp_stopcapture(Monitor *mon, const QDict *qdict)
+{
+ int i;
+ int n = qdict_get_int(qdict, "n");
+ CaptureState *s;
+
+ for (s = capture_head.lh_first, i = 0; s; s = s->entries.le_next, ++i) {
+ if (i == n) {
+ s->ops.destroy (s->opaque);
+ QLIST_REMOVE (s, entries);
+ g_free (s);
+ return;
+ }
+ }
+}
+
+void hmp_wavcapture(Monitor *mon, const QDict *qdict)
+{
+ const char *path = qdict_get_str(qdict, "path");
+ int freq = qdict_get_try_int(qdict, "freq", 44100);
+ int bits = qdict_get_try_int(qdict, "bits", 16);
+ int nchannels = qdict_get_try_int(qdict, "nchannels", 2);
+ const char *audiodev = qdict_get_str(qdict, "audiodev");
+ CaptureState *s;
+ AudioState *as = audio_state_by_name(audiodev);
+
+ if (!as) {
+ monitor_printf(mon, "Audiodev '%s' not found\n", audiodev);
+ return;
+ }
+
+ s = g_malloc0 (sizeof (*s));
+
+ if (wav_start_capture(as, s, path, freq, bits, nchannels)) {
+ monitor_printf(mon, "Failed to add wave capture\n");
+ g_free (s);
+ return;
+ }
+ QLIST_INSERT_HEAD (&capture_head, s, entries);
+}
diff --git a/monitor/misc.c b/monitor/misc.c
index 6fc8bfef13..80d5527774 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -30,7 +30,6 @@
#include "net/slirp.h"
#include "ui/qemu-spice.h"
#include "qemu/ctype.h"
-#include "audio/audio.h"
#include "disas/disas.h"
#include "qemu/log.h"
#include "sysemu/hw_accel.h"
@@ -892,61 +891,6 @@ static void hmp_info_mtree(Monitor *mon, const QDict *qdict)
mtree_info(flatview, dispatch_tree, owner, disabled);
}
-/* Capture support */
-static QLIST_HEAD (capture_list_head, CaptureState) capture_head;
-
-static void hmp_info_capture(Monitor *mon, const QDict *qdict)
-{
- int i;
- CaptureState *s;
-
- for (s = capture_head.lh_first, i = 0; s; s = s->entries.le_next, ++i) {
- monitor_printf(mon, "[%d]: ", i);
- s->ops.info (s->opaque);
- }
-}
-
-static void hmp_stopcapture(Monitor *mon, const QDict *qdict)
-{
- int i;
- int n = qdict_get_int(qdict, "n");
- CaptureState *s;
-
- for (s = capture_head.lh_first, i = 0; s; s = s->entries.le_next, ++i) {
- if (i == n) {
- s->ops.destroy (s->opaque);
- QLIST_REMOVE (s, entries);
- g_free (s);
- return;
- }
- }
-}
-
-static void hmp_wavcapture(Monitor *mon, const QDict *qdict)
-{
- const char *path = qdict_get_str(qdict, "path");
- int freq = qdict_get_try_int(qdict, "freq", 44100);
- int bits = qdict_get_try_int(qdict, "bits", 16);
- int nchannels = qdict_get_try_int(qdict, "nchannels", 2);
- const char *audiodev = qdict_get_str(qdict, "audiodev");
- CaptureState *s;
- AudioState *as = audio_state_by_name(audiodev);
-
- if (!as) {
- monitor_printf(mon, "Audiodev '%s' not found\n", audiodev);
- return;
- }
-
- s = g_malloc0 (sizeof (*s));
-
- if (wav_start_capture(as, s, path, freq, bits, nchannels)) {
- monitor_printf(mon, "Failed to add wave capture\n");
- g_free (s);
- return;
- }
- QLIST_INSERT_HEAD (&capture_head, s, entries);
-}
-
void qmp_getfd(const char *fdname, Error **errp)
{
Monitor *cur_mon = monitor_cur();
diff --git a/audio/meson.build b/audio/meson.build
index 34aed78342..0722224ba9 100644
--- a/audio/meson.build
+++ b/audio/meson.build
@@ -1,5 +1,6 @@
softmmu_ss.add([spice_headers, files('audio.c')])
softmmu_ss.add(files(
+ 'audio-hmp-cmds.c',
'audio_legacy.c',
'mixeng.c',
'noaudio.c',
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 03/32] char: Move HMP commands from monitor/ to chardev/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
2023-01-24 12:19 ` [PATCH 01/32] monitor: Drop unnecessary includes Markus Armbruster
2023-01-24 12:19 ` [PATCH 02/32] audio: Move HMP commands from monitor/ to audio/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 04/32] char: Factor out qmp_add_client() parts and move " Markus Armbruster
` (28 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS sections "Human
Monitor (HMP)" and "QMP" to "Character device backends".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
chardev/char-hmp-cmds.c | 220 ++++++++++++++++++++++++++++++++++++++++
monitor/hmp-cmds.c | 123 ----------------------
monitor/misc.c | 78 --------------
chardev/meson.build | 6 +-
4 files changed, 225 insertions(+), 202 deletions(-)
create mode 100644 chardev/char-hmp-cmds.c
diff --git a/chardev/char-hmp-cmds.c b/chardev/char-hmp-cmds.c
new file mode 100644
index 0000000000..287c2b1bcd
--- /dev/null
+++ b/chardev/char-hmp-cmds.c
@@ -0,0 +1,220 @@
+/*
+ * HMP commands related to character devices
+ *
+ * Copyright IBM, Corp. 2011
+ *
+ * Authors:
+ * Anthony Liguori <aliguori@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
+ */
+
+#include "qemu/osdep.h"
+#include "chardev/char.h"
+#include "monitor/hmp.h"
+#include "monitor/monitor.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-char.h"
+#include "qapi/qmp/qdict.h"
+#include "qemu/config-file.h"
+#include "qemu/option.h"
+
+void hmp_info_chardev(Monitor *mon, const QDict *qdict)
+{
+ ChardevInfoList *char_info, *info;
+
+ char_info = qmp_query_chardev(NULL);
+ for (info = char_info; info; info = info->next) {
+ monitor_printf(mon, "%s: filename=%s\n", info->value->label,
+ info->value->filename);
+ }
+
+ qapi_free_ChardevInfoList(char_info);
+}
+
+void hmp_ringbuf_write(Monitor *mon, const QDict *qdict)
+{
+ const char *chardev = qdict_get_str(qdict, "device");
+ const char *data = qdict_get_str(qdict, "data");
+ Error *err = NULL;
+
+ qmp_ringbuf_write(chardev, data, false, 0, &err);
+
+ hmp_handle_error(mon, err);
+}
+
+void hmp_ringbuf_read(Monitor *mon, const QDict *qdict)
+{
+ uint32_t size = qdict_get_int(qdict, "size");
+ const char *chardev = qdict_get_str(qdict, "device");
+ char *data;
+ Error *err = NULL;
+ int i;
+
+ data = qmp_ringbuf_read(chardev, size, false, 0, &err);
+ if (hmp_handle_error(mon, err)) {
+ return;
+ }
+
+ for (i = 0; data[i]; i++) {
+ unsigned char ch = data[i];
+
+ if (ch == '\\') {
+ monitor_printf(mon, "\\\\");
+ } else if ((ch < 0x20 && ch != '\n' && ch != '\t') || ch == 0x7F) {
+ monitor_printf(mon, "\\u%04X", ch);
+ } else {
+ monitor_printf(mon, "%c", ch);
+ }
+
+ }
+ monitor_printf(mon, "\n");
+ g_free(data);
+}
+
+void hmp_chardev_add(Monitor *mon, const QDict *qdict)
+{
+ const char *args = qdict_get_str(qdict, "args");
+ Error *err = NULL;
+ QemuOpts *opts;
+
+ opts = qemu_opts_parse_noisily(qemu_find_opts("chardev"), args, true);
+ if (opts == NULL) {
+ error_setg(&err, "Parsing chardev args failed");
+ } else {
+ qemu_chr_new_from_opts(opts, NULL, &err);
+ qemu_opts_del(opts);
+ }
+ hmp_handle_error(mon, err);
+}
+
+void hmp_chardev_change(Monitor *mon, const QDict *qdict)
+{
+ const char *args = qdict_get_str(qdict, "args");
+ const char *id;
+ Error *err = NULL;
+ ChardevBackend *backend = NULL;
+ ChardevReturn *ret = NULL;
+ QemuOpts *opts = qemu_opts_parse_noisily(qemu_find_opts("chardev"), args,
+ true);
+ if (!opts) {
+ error_setg(&err, "Parsing chardev args failed");
+ goto end;
+ }
+
+ id = qdict_get_str(qdict, "id");
+ if (qemu_opts_id(opts)) {
+ error_setg(&err, "Unexpected 'id' parameter");
+ goto end;
+ }
+
+ backend = qemu_chr_parse_opts(opts, &err);
+ if (!backend) {
+ goto end;
+ }
+
+ ret = qmp_chardev_change(id, backend, &err);
+
+end:
+ qapi_free_ChardevReturn(ret);
+ qapi_free_ChardevBackend(backend);
+ qemu_opts_del(opts);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_chardev_remove(Monitor *mon, const QDict *qdict)
+{
+ Error *local_err = NULL;
+
+ qmp_chardev_remove(qdict_get_str(qdict, "id"), &local_err);
+ hmp_handle_error(mon, local_err);
+}
+
+void hmp_chardev_send_break(Monitor *mon, const QDict *qdict)
+{
+ Error *local_err = NULL;
+
+ qmp_chardev_send_break(qdict_get_str(qdict, "id"), &local_err);
+ hmp_handle_error(mon, local_err);
+}
+
+void chardev_add_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ size_t len;
+ ChardevBackendInfoList *list, *start;
+
+ if (nb_args != 2) {
+ return;
+ }
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+
+ start = list = qmp_query_chardev_backends(NULL);
+ while (list) {
+ const char *chr_name = list->value->name;
+
+ if (!strncmp(chr_name, str, len)) {
+ readline_add_completion(rs, chr_name);
+ }
+ list = list->next;
+ }
+ qapi_free_ChardevBackendInfoList(start);
+}
+
+void chardev_remove_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ size_t len;
+ ChardevInfoList *list, *start;
+
+ if (nb_args != 2) {
+ return;
+ }
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+
+ start = list = qmp_query_chardev(NULL);
+ while (list) {
+ ChardevInfo *chr = list->value;
+
+ if (!strncmp(chr->label, str, len)) {
+ readline_add_completion(rs, chr->label);
+ }
+ list = list->next;
+ }
+ qapi_free_ChardevInfoList(start);
+}
+
+static void ringbuf_completion(ReadLineState *rs, const char *str)
+{
+ size_t len;
+ ChardevInfoList *list, *start;
+
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+
+ start = list = qmp_query_chardev(NULL);
+ while (list) {
+ ChardevInfo *chr_info = list->value;
+
+ if (!strncmp(chr_info->label, str, len)) {
+ Chardev *chr = qemu_chr_find(chr_info->label);
+ if (chr && CHARDEV_IS_RINGBUF(chr)) {
+ readline_add_completion(rs, chr_info->label);
+ }
+ }
+ list = list->next;
+ }
+ qapi_free_ChardevInfoList(start);
+}
+
+void ringbuf_write_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ if (nb_args != 2) {
+ return;
+ }
+ ringbuf_completion(rs, str);
+}
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index de1a96d48c..c8ed59c281 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -17,10 +17,7 @@
#include "monitor/hmp.h"
#include "net/net.h"
#include "net/eth.h"
-#include "chardev/char.h"
#include "sysemu/runstate.h"
-#include "qemu/config-file.h"
-#include "qemu/option.h"
#include "qemu/sockets.h"
#include "qemu/help_option.h"
#include "monitor/monitor.h"
@@ -28,7 +25,6 @@
#include "qapi/clone-visitor.h"
#include "qapi/qapi-builtin-visit.h"
#include "qapi/qapi-commands-block.h"
-#include "qapi/qapi-commands-char.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-commands-migration.h"
@@ -155,19 +151,6 @@ void hmp_info_uuid(Monitor *mon, const QDict *qdict)
qapi_free_UuidInfo(info);
}
-void hmp_info_chardev(Monitor *mon, const QDict *qdict)
-{
- ChardevInfoList *char_info, *info;
-
- char_info = qmp_query_chardev(NULL);
- for (info = char_info; info; info = info->next) {
- monitor_printf(mon, "%s: filename=%s\n", info->value->label,
- info->value->filename);
- }
-
- qapi_free_ChardevInfoList(char_info);
-}
-
void hmp_info_migrate(Monitor *mon, const QDict *qdict)
{
MigrationInfo *info;
@@ -673,46 +656,6 @@ void hmp_pmemsave(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
-void hmp_ringbuf_write(Monitor *mon, const QDict *qdict)
-{
- const char *chardev = qdict_get_str(qdict, "device");
- const char *data = qdict_get_str(qdict, "data");
- Error *err = NULL;
-
- qmp_ringbuf_write(chardev, data, false, 0, &err);
-
- hmp_handle_error(mon, err);
-}
-
-void hmp_ringbuf_read(Monitor *mon, const QDict *qdict)
-{
- uint32_t size = qdict_get_int(qdict, "size");
- const char *chardev = qdict_get_str(qdict, "device");
- char *data;
- Error *err = NULL;
- int i;
-
- data = qmp_ringbuf_read(chardev, size, false, 0, &err);
- if (hmp_handle_error(mon, err)) {
- return;
- }
-
- for (i = 0; data[i]; i++) {
- unsigned char ch = data[i];
-
- if (ch == '\\') {
- monitor_printf(mon, "\\\\");
- } else if ((ch < 0x20 && ch != '\n' && ch != '\t') || ch == 0x7F) {
- monitor_printf(mon, "\\u%04X", ch);
- } else {
- monitor_printf(mon, "%c", ch);
- }
-
- }
- monitor_printf(mon, "\n");
- g_free(data);
-}
-
void hmp_cont(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
@@ -1241,72 +1184,6 @@ void hmp_closefd(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
-void hmp_chardev_add(Monitor *mon, const QDict *qdict)
-{
- const char *args = qdict_get_str(qdict, "args");
- Error *err = NULL;
- QemuOpts *opts;
-
- opts = qemu_opts_parse_noisily(qemu_find_opts("chardev"), args, true);
- if (opts == NULL) {
- error_setg(&err, "Parsing chardev args failed");
- } else {
- qemu_chr_new_from_opts(opts, NULL, &err);
- qemu_opts_del(opts);
- }
- hmp_handle_error(mon, err);
-}
-
-void hmp_chardev_change(Monitor *mon, const QDict *qdict)
-{
- const char *args = qdict_get_str(qdict, "args");
- const char *id;
- Error *err = NULL;
- ChardevBackend *backend = NULL;
- ChardevReturn *ret = NULL;
- QemuOpts *opts = qemu_opts_parse_noisily(qemu_find_opts("chardev"), args,
- true);
- if (!opts) {
- error_setg(&err, "Parsing chardev args failed");
- goto end;
- }
-
- id = qdict_get_str(qdict, "id");
- if (qemu_opts_id(opts)) {
- error_setg(&err, "Unexpected 'id' parameter");
- goto end;
- }
-
- backend = qemu_chr_parse_opts(opts, &err);
- if (!backend) {
- goto end;
- }
-
- ret = qmp_chardev_change(id, backend, &err);
-
-end:
- qapi_free_ChardevReturn(ret);
- qapi_free_ChardevBackend(backend);
- qemu_opts_del(opts);
- hmp_handle_error(mon, err);
-}
-
-void hmp_chardev_remove(Monitor *mon, const QDict *qdict)
-{
- Error *local_err = NULL;
-
- qmp_chardev_remove(qdict_get_str(qdict, "id"), &local_err);
- hmp_handle_error(mon, local_err);
-}
-
-void hmp_chardev_send_break(Monitor *mon, const QDict *qdict)
-{
- Error *local_err = NULL;
-
- qmp_chardev_send_break(qdict_get_str(qdict, "id"), &local_err);
- hmp_handle_error(mon, local_err);
-}
-
void hmp_object_del(Monitor *mon, const QDict *qdict)
{
const char *id = qdict_get_str(qdict, "id");
diff --git a/monitor/misc.c b/monitor/misc.c
index 80d5527774..c18a713d9c 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -49,7 +49,6 @@
#include "exec/ioport.h"
#include "block/qapi.h"
#include "block/block-hmp-cmds.h"
-#include "qapi/qapi-commands-char.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h"
@@ -1362,29 +1361,6 @@ static void add_completion_option(ReadLineState *rs, const char *str,
}
}
-void chardev_add_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- size_t len;
- ChardevBackendInfoList *list, *start;
-
- if (nb_args != 2) {
- return;
- }
- len = strlen(str);
- readline_set_completion_index(rs, len);
-
- start = list = qmp_query_chardev_backends(NULL);
- while (list) {
- const char *chr_name = list->value->name;
-
- if (!strncmp(chr_name, str, len)) {
- readline_add_completion(rs, chr_name);
- }
- list = list->next;
- }
- qapi_free_ChardevBackendInfoList(start);
-}
-
void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str)
{
size_t len;
@@ -1498,60 +1474,6 @@ static void peripheral_device_del_completion(ReadLineState *rs,
g_slist_free(list);
}
-void chardev_remove_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- size_t len;
- ChardevInfoList *list, *start;
-
- if (nb_args != 2) {
- return;
- }
- len = strlen(str);
- readline_set_completion_index(rs, len);
-
- start = list = qmp_query_chardev(NULL);
- while (list) {
- ChardevInfo *chr = list->value;
-
- if (!strncmp(chr->label, str, len)) {
- readline_add_completion(rs, chr->label);
- }
- list = list->next;
- }
- qapi_free_ChardevInfoList(start);
-}
-
-static void ringbuf_completion(ReadLineState *rs, const char *str)
-{
- size_t len;
- ChardevInfoList *list, *start;
-
- len = strlen(str);
- readline_set_completion_index(rs, len);
-
- start = list = qmp_query_chardev(NULL);
- while (list) {
- ChardevInfo *chr_info = list->value;
-
- if (!strncmp(chr_info->label, str, len)) {
- Chardev *chr = qemu_chr_find(chr_info->label);
- if (chr && CHARDEV_IS_RINGBUF(chr)) {
- readline_add_completion(rs, chr_info->label);
- }
- }
- list = list->next;
- }
- qapi_free_ChardevInfoList(start);
-}
-
-void ringbuf_write_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- if (nb_args != 2) {
- return;
- }
- ringbuf_completion(rs, str);
-}
-
void device_del_completion(ReadLineState *rs, int nb_args, const char *str)
{
size_t len;
diff --git a/chardev/meson.build b/chardev/meson.build
index 789b50056a..7a3ba777ab 100644
--- a/chardev/meson.build
+++ b/chardev/meson.build
@@ -28,7 +28,11 @@ chardev_ss.add(when: 'CONFIG_WIN32', if_true: files(
chardev_ss = chardev_ss.apply(config_host, strict: false)
-softmmu_ss.add(files('msmouse.c', 'wctablet.c', 'testdev.c'))
+softmmu_ss.add(files(
+ 'char-hmp-cmds.c',
+ 'msmouse.c',
+ 'wctablet.c',
+ 'testdev.c'))
chardev_modules = {}
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 04/32] char: Factor out qmp_add_client() parts and move to chardev/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (2 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 03/32] char: Move HMP commands from monitor/ to chardev/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 05/32] hmp: Drop redundant argument check from add_completion_option() Markus Armbruster
` (27 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
Code moves from MAINTAINERS section "QMP" to "Character device
backends".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/monitor/qmp-helpers.h | 3 +++
chardev/char.c | 20 ++++++++++++++++++++
monitor/qmp-cmds.c | 13 ++-----------
3 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/include/monitor/qmp-helpers.h b/include/monitor/qmp-helpers.h
index 4718c63c73..318c3357a2 100644
--- a/include/monitor/qmp-helpers.h
+++ b/include/monitor/qmp-helpers.h
@@ -22,5 +22,8 @@ bool qmp_add_client_vnc(int fd, bool has_skipauth, bool skipauth,
bool qmp_add_client_dbus_display(int fd, bool has_skipauth, bool skipauth,
bool has_tls, bool tls, Error **errp);
#endif
+bool qmp_add_client_char(int fd, bool has_skipauth, bool skipauth,
+ bool has_tls, bool tls, const char *protocol,
+ Error **errp);
#endif
diff --git a/chardev/char.c b/chardev/char.c
index 87ab6efbcc..11eab7764c 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "monitor/monitor.h"
+#include "monitor/qmp-helpers.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
#include "qemu/qemu-print.h"
@@ -1166,6 +1167,25 @@ void qmp_chardev_send_break(const char *id, Error **errp)
qemu_chr_be_event(chr, CHR_EVENT_BREAK);
}
+bool qmp_add_client_char(int fd, bool has_skipauth, bool skipauth,
+ bool has_tls, bool tls, const char *protocol,
+ Error **errp)
+{
+ Chardev *s = qemu_chr_find(protocol);
+
+ if (!s) {
+ error_setg(errp, "protocol '%s' is invalid", protocol);
+ close(fd);
+ return false;
+ }
+ if (qemu_chr_add_client(s, fd) < 0) {
+ error_setg(errp, "failed to add client");
+ close(fd);
+ return false;
+ }
+ return true;
+}
+
/*
* Add a timeout callback for the chardev (in milliseconds), return
* the GSource object created. Please use this to add timeout hook for
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index 743849c0b5..e5ab77f6c6 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -17,7 +17,6 @@
#include "monitor/monitor.h"
#include "monitor/qmp-helpers.h"
#include "sysemu/sysemu.h"
-#include "chardev/char.h"
#include "sysemu/kvm.h"
#include "sysemu/runstate.h"
#include "sysemu/runstate-action.h"
@@ -174,7 +173,6 @@ void qmp_add_client(const char *protocol, const char *fdname,
{ "@dbus-display", qmp_add_client_dbus_display },
#endif
};
- Chardev *s;
int fd, i;
fd = monitor_get_fd(monitor_cur(), fdname, errp);
@@ -192,16 +190,9 @@ void qmp_add_client(const char *protocol, const char *fdname,
}
}
- s = qemu_chr_find(protocol);
- if (!s) {
- error_setg(errp, "protocol '%s' is invalid", protocol);
+ if (!qmp_add_client_char(fd, has_skipauth, skipauth, has_tls, tls,
+ protocol, errp)) {
close(fd);
- return;
- }
- if (qemu_chr_add_client(s, fd) < 0) {
- error_setg(errp, "failed to add client");
- close(fd);
- return;
}
}
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 05/32] hmp: Drop redundant argument check from add_completion_option()
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (3 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 04/32] char: Factor out qmp_add_client() parts and move " Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 06/32] readline: Extract readline_add_completion_of() from monitor Markus Armbruster
` (26 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
No need to check for null arguments, no caller passes them.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor/misc.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/monitor/misc.c b/monitor/misc.c
index c18a713d9c..d58a81c452 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -1353,9 +1353,6 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const char *name)
static void add_completion_option(ReadLineState *rs, const char *str,
const char *option)
{
- if (!str || !option) {
- return;
- }
if (!strncmp(option, str, strlen(str))) {
readline_add_completion(rs, option);
}
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 06/32] readline: Extract readline_add_completion_of() from monitor
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (4 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 05/32] hmp: Drop redundant argument check from add_completion_option() Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 07/32] hmp: Rename help_cmd() to hmp_help_cmd(), move declaration to hmp.h Markus Armbruster
` (25 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
monitor/misc.h has static add_completion_option(). It's useful
elsewhere in the monitor. Since it's not monitor-specific, move it to
util/readline.c renamed to readline_add_completion_of(), and put it to
use.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/qemu/readline.h | 2 +
monitor/hmp.c | 12 +++---
monitor/misc.c | 85 +++++++++++++----------------------------
util/readline.c | 8 ++++
4 files changed, 41 insertions(+), 66 deletions(-)
diff --git a/include/qemu/readline.h b/include/qemu/readline.h
index 622aa4564f..b05e4782da 100644
--- a/include/qemu/readline.h
+++ b/include/qemu/readline.h
@@ -44,6 +44,8 @@ typedef struct ReadLineState {
} ReadLineState;
void readline_add_completion(ReadLineState *rs, const char *str);
+void readline_add_completion_of(ReadLineState *rs,
+ const char *pfx, const char *str);
void readline_set_completion_index(ReadLineState *rs, int completion_index);
const char *readline_get_history(ReadLineState *rs, unsigned int index);
diff --git a/monitor/hmp.c b/monitor/hmp.c
index 65641a6e56..893e100581 100644
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -1188,8 +1188,8 @@ static void cmd_completion(MonitorHMP *mon, const char *name, const char *list)
}
memcpy(cmd, pstart, len);
cmd[len] = '\0';
- if (name[0] == '\0' || !strncmp(name, cmd, strlen(name))) {
- readline_add_completion(mon->rs, cmd);
+ if (name[0] == '\0') {
+ readline_add_completion_of(mon->rs, name, cmd);
}
if (*p == '\0') {
break;
@@ -1269,7 +1269,7 @@ static void monitor_find_completion_by_table(MonitorHMP *mon,
{
const char *cmdname;
int i;
- const char *ptype, *old_ptype, *str, *name;
+ const char *ptype, *old_ptype, *str;
const HMPCommand *cmd;
BlockBackend *blk = NULL;
@@ -1334,10 +1334,8 @@ static void monitor_find_completion_by_table(MonitorHMP *mon,
/* block device name completion */
readline_set_completion_index(mon->rs, strlen(str));
while ((blk = blk_next(blk)) != NULL) {
- name = blk_name(blk);
- if (str[0] == '\0' ||
- !strncmp(name, str, strlen(str))) {
- readline_add_completion(mon->rs, name);
+ if (str[0] == '\0') {
+ readline_add_completion_of(mon->rs, str, blk_name(blk));
}
}
break;
diff --git a/monitor/misc.c b/monitor/misc.c
index d58a81c452..9da52939b2 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -1350,14 +1350,6 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const char *name)
return ret;
}
-static void add_completion_option(ReadLineState *rs, const char *str,
- const char *option)
-{
- if (!strncmp(option, str, strlen(str))) {
- readline_add_completion(rs, option);
- }
-}
-
void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str)
{
size_t len;
@@ -1369,7 +1361,7 @@ void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str)
len = strlen(str);
readline_set_completion_index(rs, len);
for (i = 0; i < NET_CLIENT_DRIVER__MAX; i++) {
- add_completion_option(rs, str, NetClientDriver_str(i));
+ readline_add_completion_of(rs, str, NetClientDriver_str(i));
}
}
@@ -1386,14 +1378,12 @@ void device_add_completion(ReadLineState *rs, int nb_args, const char *str)
readline_set_completion_index(rs, len);
list = elt = object_class_get_list(TYPE_DEVICE, false);
while (elt) {
- const char *name;
DeviceClass *dc = OBJECT_CLASS_CHECK(DeviceClass, elt->data,
TYPE_DEVICE);
- name = object_class_get_name(OBJECT_CLASS(dc));
- if (dc->user_creatable
- && !strncmp(name, str, len)) {
- readline_add_completion(rs, name);
+ if (dc->user_creatable) {
+ readline_add_completion_of(rs, str,
+ object_class_get_name(OBJECT_CLASS(dc)));
}
elt = elt->next;
}
@@ -1416,8 +1406,8 @@ void object_add_completion(ReadLineState *rs, int nb_args, const char *str)
const char *name;
name = object_class_get_name(OBJECT_CLASS(elt->data));
- if (!strncmp(name, str, len) && strcmp(name, TYPE_USER_CREATABLE)) {
- readline_add_completion(rs, name);
+ if (strcmp(name, TYPE_USER_CREATABLE)) {
+ readline_add_completion_of(rs, str, name);
}
elt = elt->next;
}
@@ -1450,7 +1440,7 @@ static GSList *qdev_build_hotpluggable_device_list(Object *peripheral)
}
static void peripheral_device_del_completion(ReadLineState *rs,
- const char *str, size_t len)
+ const char *str)
{
Object *peripheral = container_get(qdev_get_machine(), "/peripheral");
GSList *list, *item;
@@ -1463,8 +1453,8 @@ static void peripheral_device_del_completion(ReadLineState *rs,
for (item = list; item; item = g_slist_next(item)) {
DeviceState *dev = item->data;
- if (dev->id && !strncmp(str, dev->id, len)) {
- readline_add_completion(rs, dev->id);
+ if (dev->id) {
+ readline_add_completion_of(rs, str, dev->id);
}
}
@@ -1473,15 +1463,12 @@ static void peripheral_device_del_completion(ReadLineState *rs,
void device_del_completion(ReadLineState *rs, int nb_args, const char *str)
{
- size_t len;
-
if (nb_args != 2) {
return;
}
- len = strlen(str);
- readline_set_completion_index(rs, len);
- peripheral_device_del_completion(rs, str, len);
+ readline_set_completion_index(rs, strlen(str));
+ peripheral_device_del_completion(rs, str);
}
void object_del_completion(ReadLineState *rs, int nb_args, const char *str)
@@ -1499,9 +1486,8 @@ void object_del_completion(ReadLineState *rs, int nb_args, const char *str)
while (list) {
ObjectPropertyInfo *info = list->value;
- if (!strncmp(info->type, "child<", 5)
- && !strncmp(info->name, str, len)) {
- readline_add_completion(rs, info->name);
+ if (!strncmp(info->type, "child<", 5)) {
+ readline_add_completion_of(rs, str, info->name);
}
list = list->next;
}
@@ -1521,14 +1507,11 @@ void set_link_completion(ReadLineState *rs, int nb_args, const char *str)
NET_CLIENT_DRIVER_NONE,
MAX_QUEUE_NUM);
for (i = 0; i < MIN(count, MAX_QUEUE_NUM); i++) {
- const char *name = ncs[i]->name;
- if (!strncmp(str, name, len)) {
- readline_add_completion(rs, name);
- }
+ readline_add_completion_of(rs, str, ncs[i]->name);
}
} else if (nb_args == 3) {
- add_completion_option(rs, str, "on");
- add_completion_option(rs, str, "off");
+ readline_add_completion_of(rs, str, "on");
+ readline_add_completion_of(rs, str, "off");
}
}
@@ -1546,12 +1529,8 @@ void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str)
count = qemu_find_net_clients_except(NULL, ncs, NET_CLIENT_DRIVER_NIC,
MAX_QUEUE_NUM);
for (i = 0; i < MIN(count, MAX_QUEUE_NUM); i++) {
- const char *name = ncs[i]->name;
- if (strncmp(str, name, len)) {
- continue;
- }
if (ncs[i]->is_netdev) {
- readline_add_completion(rs, name);
+ readline_add_completion_of(rs, str, ncs[i]->name);
}
}
}
@@ -1590,8 +1569,8 @@ void trace_event_completion(ReadLineState *rs, int nb_args, const char *str)
}
g_free(pattern);
} else if (nb_args == 3) {
- add_completion_option(rs, str, "on");
- add_completion_option(rs, str, "off");
+ readline_add_completion_of(rs, str, "on");
+ readline_add_completion_of(rs, str, "off");
}
}
@@ -1604,7 +1583,7 @@ void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str)
}
readline_set_completion_index(rs, strlen(str));
for (i = 0; i < WATCHDOG_ACTION__MAX; i++) {
- add_completion_option(rs, str, WatchdogAction_str(i));
+ readline_add_completion_of(rs, str, WatchdogAction_str(i));
}
}
@@ -1618,14 +1597,11 @@ void migrate_set_capability_completion(ReadLineState *rs, int nb_args,
if (nb_args == 2) {
int i;
for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) {
- const char *name = MigrationCapability_str(i);
- if (!strncmp(str, name, len)) {
- readline_add_completion(rs, name);
- }
+ readline_add_completion_of(rs, str, MigrationCapability_str(i));
}
} else if (nb_args == 3) {
- add_completion_option(rs, str, "on");
- add_completion_option(rs, str, "off");
+ readline_add_completion_of(rs, str, "on");
+ readline_add_completion_of(rs, str, "off");
}
}
@@ -1639,10 +1615,7 @@ void migrate_set_parameter_completion(ReadLineState *rs, int nb_args,
if (nb_args == 2) {
int i;
for (i = 0; i < MIGRATION_PARAMETER__MAX; i++) {
- const char *name = MigrationParameter_str(i);
- if (!strncmp(str, name, len)) {
- readline_add_completion(rs, name);
- }
+ readline_add_completion_of(rs, str, MigrationParameter_str(i));
}
}
}
@@ -1672,14 +1645,8 @@ static void vm_completion(ReadLineState *rs, const char *str)
snapshot = snapshots;
while (snapshot) {
- char *completion = snapshot->value->name;
- if (!strncmp(str, completion, len)) {
- readline_add_completion(rs, completion);
- }
- completion = snapshot->value->id;
- if (!strncmp(str, completion, len)) {
- readline_add_completion(rs, completion);
- }
+ readline_add_completion_of(rs, str, snapshot->value->name);
+ readline_add_completion_of(rs, str, snapshot->value->id);
snapshot = snapshot->next;
}
qapi_free_SnapshotInfoList(snapshots);
diff --git a/util/readline.c b/util/readline.c
index f1ac6e4769..494a3d924e 100644
--- a/util/readline.c
+++ b/util/readline.c
@@ -286,6 +286,14 @@ void readline_add_completion(ReadLineState *rs, const char *str)
}
}
+void readline_add_completion_of(ReadLineState *rs,
+ const char *pfx, const char *str)
+{
+ if (!strncmp(str, pfx, strlen(pfx))) {
+ readline_add_completion(rs, str);
+ }
+}
+
void readline_set_completion_index(ReadLineState *rs, int index)
{
rs->completion_index = index;
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 07/32] hmp: Rename help_cmd() to hmp_help_cmd(), move declaration to hmp.h
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (5 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 06/32] readline: Extract readline_add_completion_of() from monitor Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 08/32] trace: Move HMP commands from monitor/ to trace/ Markus Armbruster
` (24 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
The next commit will move a caller of help_cmd() to a new file.
Including monitor/monitor-internal.h there just for help_cmd() feels
silly. Better to provide it in monitor/hmp.h suitably renamed.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/monitor/hmp.h | 1 +
monitor/monitor-internal.h | 1 -
monitor/hmp.c | 2 +-
monitor/misc.c | 8 ++++----
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index c25bec1863..5a75f4659c 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -18,6 +18,7 @@
#include "qapi/qapi-types-common.h"
bool hmp_handle_error(Monitor *mon, Error *err);
+void hmp_help_cmd(Monitor *mon, const char *name);
void hmp_info_name(Monitor *mon, const QDict *qdict);
void hmp_info_version(Monitor *mon, const QDict *qdict);
diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h
index a2cdbbf646..53e3808054 100644
--- a/monitor/monitor-internal.h
+++ b/monitor/monitor-internal.h
@@ -186,7 +186,6 @@ void monitor_data_destroy_qmp(MonitorQMP *mon);
void coroutine_fn monitor_qmp_dispatcher_co(void *data);
int get_monitor_def(Monitor *mon, int64_t *pval, const char *name);
-void help_cmd(Monitor *mon, const char *name);
void handle_hmp_command(MonitorHMP *mon, const char *cmdline);
int hmp_compare_cmd(const char *name, const char *list);
diff --git a/monitor/hmp.c b/monitor/hmp.c
index 893e100581..844cf54c18 100644
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -271,7 +271,7 @@ static void help_cmd_dump(Monitor *mon, const HMPCommand *cmds,
}
}
-void help_cmd(Monitor *mon, const char *name)
+void hmp_help_cmd(Monitor *mon, const char *name)
{
char *args[MAX_ARGS];
int nb_args = 0;
diff --git a/monitor/misc.c b/monitor/misc.c
index 9da52939b2..240d137327 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -153,7 +153,7 @@ int hmp_compare_cmd(const char *name, const char *list)
static void do_help_cmd(Monitor *mon, const QDict *qdict)
{
- help_cmd(mon, qdict_get_try_str(qdict, "name"));
+ hmp_help_cmd(mon, qdict_get_try_str(qdict, "name"));
}
static void hmp_trace_event(Monitor *mon, const QDict *qdict)
@@ -195,14 +195,14 @@ static void hmp_trace_file(Monitor *mon, const QDict *qdict)
}
} else {
monitor_printf(mon, "unexpected argument \"%s\"\n", op);
- help_cmd(mon, "trace-file");
+ hmp_help_cmd(mon, "trace-file");
}
}
#endif
static void hmp_info_help(Monitor *mon, const QDict *qdict)
{
- help_cmd(mon, "info");
+ hmp_help_cmd(mon, "info");
}
static void monitor_init_qmp_commands(void)
@@ -424,7 +424,7 @@ static void hmp_log(Monitor *mon, const QDict *qdict)
} else {
mask = qemu_str_to_log_mask(items);
if (!mask) {
- help_cmd(mon, "log");
+ hmp_help_cmd(mon, "log");
return;
}
}
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 08/32] trace: Move HMP commands from monitor/ to trace/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (6 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 07/32] hmp: Rename help_cmd() to hmp_help_cmd(), move declaration to hmp.h Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:22 ` Philippe Mathieu-Daudé
2023-01-24 14:21 ` Stefan Hajnoczi
2023-01-24 12:19 ` [PATCH 09/32] machine: Move QMP commands from monitor/ to hw/core/ Markus Armbruster
` (23 subsequent siblings)
31 siblings, 2 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS sections "Human
Monitor (HMP)" and "QMP" to "Tracing".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/monitor/hmp.h | 3 +
monitor/misc.c | 119 ---------------------------------
trace/trace-hmp-cmds.c | 148 +++++++++++++++++++++++++++++++++++++++++
trace/meson.build | 1 +
4 files changed, 152 insertions(+), 119 deletions(-)
create mode 100644 trace/trace-hmp-cmds.c
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index 5a75f4659c..58ed1bec62 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -155,5 +155,8 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict);
void hmp_info_capture(Monitor *mon, const QDict *qdict);
void hmp_stopcapture(Monitor *mon, const QDict *qdict);
void hmp_wavcapture(Monitor *mon, const QDict *qdict);
+void hmp_trace_event(Monitor *mon, const QDict *qdict);
+void hmp_trace_file(Monitor *mon, const QDict *qdict);
+void hmp_info_trace_events(Monitor *mon, const QDict *qdict);
#endif
diff --git a/monitor/misc.c b/monitor/misc.c
index 240d137327..2a6bc13e7f 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -39,12 +39,8 @@
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
#include "qom/object_interfaces.h"
-#include "trace/control.h"
#include "monitor/hmp-target.h"
#include "monitor/hmp.h"
-#ifdef CONFIG_TRACE_SIMPLE
-#include "trace/simple.h"
-#endif
#include "exec/address-spaces.h"
#include "exec/ioport.h"
#include "block/qapi.h"
@@ -54,7 +50,6 @@
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-qom.h"
#include "qapi/qapi-commands-run-state.h"
-#include "qapi/qapi-commands-trace.h"
#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-init-commands.h"
#include "qapi/error.h"
@@ -156,50 +151,6 @@ static void do_help_cmd(Monitor *mon, const QDict *qdict)
hmp_help_cmd(mon, qdict_get_try_str(qdict, "name"));
}
-static void hmp_trace_event(Monitor *mon, const QDict *qdict)
-{
- const char *tp_name = qdict_get_str(qdict, "name");
- bool new_state = qdict_get_bool(qdict, "option");
- bool has_vcpu = qdict_haskey(qdict, "vcpu");
- int vcpu = qdict_get_try_int(qdict, "vcpu", 0);
- Error *local_err = NULL;
-
- if (vcpu < 0) {
- monitor_printf(mon, "argument vcpu must be positive");
- return;
- }
-
- qmp_trace_event_set_state(tp_name, new_state, true, true, has_vcpu, vcpu, &local_err);
- if (local_err) {
- error_report_err(local_err);
- }
-}
-
-#ifdef CONFIG_TRACE_SIMPLE
-static void hmp_trace_file(Monitor *mon, const QDict *qdict)
-{
- const char *op = qdict_get_try_str(qdict, "op");
- const char *arg = qdict_get_try_str(qdict, "arg");
-
- if (!op) {
- st_print_trace_file_status();
- } else if (!strcmp(op, "on")) {
- st_set_trace_file_enabled(true);
- } else if (!strcmp(op, "off")) {
- st_set_trace_file_enabled(false);
- } else if (!strcmp(op, "flush")) {
- st_flush_trace_buffer();
- } else if (!strcmp(op, "set")) {
- if (arg) {
- st_set_trace_file(arg);
- }
- } else {
- monitor_printf(mon, "unexpected argument \"%s\"\n", op);
- hmp_help_cmd(mon, "trace-file");
- }
-}
-#endif
-
static void hmp_info_help(Monitor *mon, const QDict *qdict)
{
hmp_help_cmd(mon, "info");
@@ -344,37 +295,6 @@ static void hmp_info_history(Monitor *mon, const QDict *qdict)
}
}
-static void hmp_info_trace_events(Monitor *mon, const QDict *qdict)
-{
- const char *name = qdict_get_try_str(qdict, "name");
- bool has_vcpu = qdict_haskey(qdict, "vcpu");
- int vcpu = qdict_get_try_int(qdict, "vcpu", 0);
- TraceEventInfoList *events;
- TraceEventInfoList *elem;
- Error *local_err = NULL;
-
- if (name == NULL) {
- name = "*";
- }
- if (vcpu < 0) {
- monitor_printf(mon, "argument vcpu must be positive");
- return;
- }
-
- events = qmp_trace_event_get_state(name, has_vcpu, vcpu, &local_err);
- if (local_err) {
- error_report_err(local_err);
- return;
- }
-
- for (elem = events; elem != NULL; elem = elem->next) {
- monitor_printf(mon, "%s : state %u\n",
- elem->value->name,
- elem->value->state == TRACE_EVENT_STATE_ENABLED ? 1 : 0);
- }
- qapi_free_TraceEventInfoList(events);
-}
-
void qmp_client_migrate_info(const char *protocol, const char *hostname,
bool has_port, int64_t port,
bool has_tls_port, int64_t tls_port,
@@ -1535,45 +1455,6 @@ void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str)
}
}
-void info_trace_events_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- size_t len;
-
- len = strlen(str);
- readline_set_completion_index(rs, len);
- if (nb_args == 2) {
- TraceEventIter iter;
- TraceEvent *ev;
- char *pattern = g_strdup_printf("%s*", str);
- trace_event_iter_init_pattern(&iter, pattern);
- while ((ev = trace_event_iter_next(&iter)) != NULL) {
- readline_add_completion(rs, trace_event_get_name(ev));
- }
- g_free(pattern);
- }
-}
-
-void trace_event_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- size_t len;
-
- len = strlen(str);
- readline_set_completion_index(rs, len);
- if (nb_args == 2) {
- TraceEventIter iter;
- TraceEvent *ev;
- char *pattern = g_strdup_printf("%s*", str);
- trace_event_iter_init_pattern(&iter, pattern);
- while ((ev = trace_event_iter_next(&iter)) != NULL) {
- readline_add_completion(rs, trace_event_get_name(ev));
- }
- g_free(pattern);
- } else if (nb_args == 3) {
- readline_add_completion_of(rs, str, "on");
- readline_add_completion_of(rs, str, "off");
- }
-}
-
void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str)
{
int i;
diff --git a/trace/trace-hmp-cmds.c b/trace/trace-hmp-cmds.c
new file mode 100644
index 0000000000..792876c34a
--- /dev/null
+++ b/trace/trace-hmp-cmds.c
@@ -0,0 +1,148 @@
+/*
+ * HMP commands related to tracing
+ *
+ * Copyright (c) 2003-2004 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "qemu/osdep.h"
+#include "monitor/hmp.h"
+#include "monitor/monitor.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-trace.h"
+#include "qapi/qmp/qdict.h"
+#include "trace/control.h"
+#ifdef CONFIG_TRACE_SIMPLE
+#include "trace/simple.h"
+#endif
+
+void hmp_trace_event(Monitor *mon, const QDict *qdict)
+{
+ const char *tp_name = qdict_get_str(qdict, "name");
+ bool new_state = qdict_get_bool(qdict, "option");
+ bool has_vcpu = qdict_haskey(qdict, "vcpu");
+ int vcpu = qdict_get_try_int(qdict, "vcpu", 0);
+ Error *local_err = NULL;
+
+ if (vcpu < 0) {
+ monitor_printf(mon, "argument vcpu must be positive");
+ return;
+ }
+
+ qmp_trace_event_set_state(tp_name, new_state, true, true, has_vcpu, vcpu, &local_err);
+ if (local_err) {
+ error_report_err(local_err);
+ }
+}
+
+#ifdef CONFIG_TRACE_SIMPLE
+void hmp_trace_file(Monitor *mon, const QDict *qdict)
+{
+ const char *op = qdict_get_try_str(qdict, "op");
+ const char *arg = qdict_get_try_str(qdict, "arg");
+
+ if (!op) {
+ st_print_trace_file_status();
+ } else if (!strcmp(op, "on")) {
+ st_set_trace_file_enabled(true);
+ } else if (!strcmp(op, "off")) {
+ st_set_trace_file_enabled(false);
+ } else if (!strcmp(op, "flush")) {
+ st_flush_trace_buffer();
+ } else if (!strcmp(op, "set")) {
+ if (arg) {
+ st_set_trace_file(arg);
+ }
+ } else {
+ monitor_printf(mon, "unexpected argument \"%s\"\n", op);
+ hmp_help_cmd(mon, "trace-file");
+ }
+}
+#endif
+
+void hmp_info_trace_events(Monitor *mon, const QDict *qdict)
+{
+ const char *name = qdict_get_try_str(qdict, "name");
+ bool has_vcpu = qdict_haskey(qdict, "vcpu");
+ int vcpu = qdict_get_try_int(qdict, "vcpu", 0);
+ TraceEventInfoList *events;
+ TraceEventInfoList *elem;
+ Error *local_err = NULL;
+
+ if (name == NULL) {
+ name = "*";
+ }
+ if (vcpu < 0) {
+ monitor_printf(mon, "argument vcpu must be positive");
+ return;
+ }
+
+ events = qmp_trace_event_get_state(name, has_vcpu, vcpu, &local_err);
+ if (local_err) {
+ error_report_err(local_err);
+ return;
+ }
+
+ for (elem = events; elem != NULL; elem = elem->next) {
+ monitor_printf(mon, "%s : state %u\n",
+ elem->value->name,
+ elem->value->state == TRACE_EVENT_STATE_ENABLED ? 1 : 0);
+ }
+ qapi_free_TraceEventInfoList(events);
+}
+
+void info_trace_events_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ size_t len;
+
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+ if (nb_args == 2) {
+ TraceEventIter iter;
+ TraceEvent *ev;
+ char *pattern = g_strdup_printf("%s*", str);
+ trace_event_iter_init_pattern(&iter, pattern);
+ while ((ev = trace_event_iter_next(&iter)) != NULL) {
+ readline_add_completion(rs, trace_event_get_name(ev));
+ }
+ g_free(pattern);
+ }
+}
+
+void trace_event_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ size_t len;
+
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+ if (nb_args == 2) {
+ TraceEventIter iter;
+ TraceEvent *ev;
+ char *pattern = g_strdup_printf("%s*", str);
+ trace_event_iter_init_pattern(&iter, pattern);
+ while ((ev = trace_event_iter_next(&iter)) != NULL) {
+ readline_add_completion(rs, trace_event_get_name(ev));
+ }
+ g_free(pattern);
+ } else if (nb_args == 3) {
+ readline_add_completion_of(rs, str, "on");
+ readline_add_completion_of(rs, str, "off");
+ }
+}
diff --git a/trace/meson.build b/trace/meson.build
index 26b54714d5..d565948b09 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -1,3 +1,4 @@
+softmmu_ss.add(files('trace-hmp-cmds.c'))
specific_ss.add(files('control-target.c'))
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* Re: [PATCH 08/32] trace: Move HMP commands from monitor/ to trace/
2023-01-24 12:19 ` [PATCH 08/32] trace: Move HMP commands from monitor/ to trace/ Markus Armbruster
@ 2023-01-24 12:22 ` Philippe Mathieu-Daudé
2023-01-24 14:21 ` Stefan Hajnoczi
1 sibling, 0 replies; 44+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-01-24 12:22 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, wangyanan55, jasowang,
jiri, berrange, thuth, quintela, stefanb, stefanha, kvm,
qemu-block
On 24/1/23 13:19, Markus Armbruster wrote:
> This moves these commands from MAINTAINERS sections "Human
> Monitor (HMP)" and "QMP" to "Tracing".
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> include/monitor/hmp.h | 3 +
> monitor/misc.c | 119 ---------------------------------
> trace/trace-hmp-cmds.c | 148 +++++++++++++++++++++++++++++++++++++++++
> trace/meson.build | 1 +
> 4 files changed, 152 insertions(+), 119 deletions(-)
> create mode 100644 trace/trace-hmp-cmds.c
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 08/32] trace: Move HMP commands from monitor/ to trace/
2023-01-24 12:19 ` [PATCH 08/32] trace: Move HMP commands from monitor/ to trace/ Markus Armbruster
2023-01-24 12:22 ` Philippe Mathieu-Daudé
@ 2023-01-24 14:21 ` Stefan Hajnoczi
1 sibling, 0 replies; 44+ messages in thread
From: Stefan Hajnoczi @ 2023-01-24 14:21 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, pbonzini, kraxel, kwolf, hreitz, marcandre.lureau,
dgilbert, mst, imammedo, ani, eduardo, marcel.apfelbaum, philmd,
wangyanan55, jasowang, jiri, berrange, thuth, quintela, stefanb,
kvm, qemu-block
[-- Attachment #1: Type: text/plain, Size: 608 bytes --]
On Tue, Jan 24, 2023 at 01:19:22PM +0100, Markus Armbruster wrote:
> This moves these commands from MAINTAINERS sections "Human
> Monitor (HMP)" and "QMP" to "Tracing".
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> include/monitor/hmp.h | 3 +
> monitor/misc.c | 119 ---------------------------------
> trace/trace-hmp-cmds.c | 148 +++++++++++++++++++++++++++++++++++++++++
> trace/meson.build | 1 +
> 4 files changed, 152 insertions(+), 119 deletions(-)
> create mode 100644 trace/trace-hmp-cmds.c
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 484 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH 09/32] machine: Move QMP commands from monitor/ to hw/core/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (7 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 08/32] trace: Move HMP commands from monitor/ to trace/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 10/32] machine: Move HMP " Markus Armbruster
` (22 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS section "QMP" to "Machine
core".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/core/machine-qmp-cmds.c | 144 +++++++++++++++++++++++++++++++++++++
monitor/qmp-cmds.c | 140 ------------------------------------
2 files changed, 144 insertions(+), 140 deletions(-)
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
index 80d5e59651..44b5da8880 100644
--- a/hw/core/machine-qmp-cmds.c
+++ b/hw/core/machine-qmp-cmds.c
@@ -9,6 +9,9 @@
#include "qemu/osdep.h"
#include "hw/boards.h"
+#include "hw/intc/intc.h"
+#include "hw/mem/memory-device.h"
+#include "hw/rdma/rdma.h"
#include "qapi/error.h"
#include "qapi/qapi-builtin-visit.h"
#include "qapi/qapi-commands-machine.h"
@@ -17,11 +20,13 @@
#include "qapi/qobject-input-visitor.h"
#include "qapi/type-helpers.h"
#include "qemu/main-loop.h"
+#include "qemu/uuid.h"
#include "qom/qom-qobject.h"
#include "sysemu/hostmem.h"
#include "sysemu/hw_accel.h"
#include "sysemu/numa.h"
#include "sysemu/runstate.h"
+#include "sysemu/sysemu.h"
static void cpustate_to_cpuinfo_s390(CpuInfoS390 *info, const CPUState *cpu)
{
@@ -239,3 +244,142 @@ HumanReadableText *qmp_x_query_numa(Error **errp)
done:
return human_readable_text_from_str(buf);
}
+
+KvmInfo *qmp_query_kvm(Error **errp)
+{
+ KvmInfo *info = g_malloc0(sizeof(*info));
+
+ info->enabled = kvm_enabled();
+ info->present = accel_find("kvm");
+
+ return info;
+}
+
+UuidInfo *qmp_query_uuid(Error **errp)
+{
+ UuidInfo *info = g_malloc0(sizeof(*info));
+
+ info->UUID = qemu_uuid_unparse_strdup(&qemu_uuid);
+ return info;
+}
+
+void qmp_system_reset(Error **errp)
+{
+ qemu_system_reset_request(SHUTDOWN_CAUSE_HOST_QMP_SYSTEM_RESET);
+}
+
+void qmp_system_powerdown(Error **errp)
+{
+ qemu_system_powerdown_request();
+}
+
+void qmp_system_wakeup(Error **errp)
+{
+ if (!qemu_wakeup_suspend_enabled()) {
+ error_setg(errp,
+ "wake-up from suspend is not supported by this guest");
+ return;
+ }
+
+ qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, errp);
+}
+
+MemoryDeviceInfoList *qmp_query_memory_devices(Error **errp)
+{
+ return qmp_memory_device_list();
+}
+
+MemoryInfo *qmp_query_memory_size_summary(Error **errp)
+{
+ MemoryInfo *mem_info = g_new0(MemoryInfo, 1);
+ MachineState *ms = MACHINE(qdev_get_machine());
+
+ mem_info->base_memory = ms->ram_size;
+
+ mem_info->plugged_memory = get_plugged_memory_size();
+ mem_info->has_plugged_memory =
+ mem_info->plugged_memory != (uint64_t)-1;
+
+ return mem_info;
+}
+
+static int qmp_x_query_rdma_foreach(Object *obj, void *opaque)
+{
+ RdmaProvider *rdma;
+ RdmaProviderClass *k;
+ GString *buf = opaque;
+
+ if (object_dynamic_cast(obj, INTERFACE_RDMA_PROVIDER)) {
+ rdma = RDMA_PROVIDER(obj);
+ k = RDMA_PROVIDER_GET_CLASS(obj);
+ if (k->format_statistics) {
+ k->format_statistics(rdma, buf);
+ } else {
+ g_string_append_printf(buf,
+ "RDMA statistics not available for %s.\n",
+ object_get_typename(obj));
+ }
+ }
+
+ return 0;
+}
+
+HumanReadableText *qmp_x_query_rdma(Error **errp)
+{
+ g_autoptr(GString) buf = g_string_new("");
+
+ object_child_foreach_recursive(object_get_root(),
+ qmp_x_query_rdma_foreach, buf);
+
+ return human_readable_text_from_str(buf);
+}
+
+HumanReadableText *qmp_x_query_ramblock(Error **errp)
+{
+ g_autoptr(GString) buf = ram_block_format();
+
+ return human_readable_text_from_str(buf);
+}
+
+static int qmp_x_query_irq_foreach(Object *obj, void *opaque)
+{
+ InterruptStatsProvider *intc;
+ InterruptStatsProviderClass *k;
+ GString *buf = opaque;
+
+ if (object_dynamic_cast(obj, TYPE_INTERRUPT_STATS_PROVIDER)) {
+ intc = INTERRUPT_STATS_PROVIDER(obj);
+ k = INTERRUPT_STATS_PROVIDER_GET_CLASS(obj);
+ uint64_t *irq_counts;
+ unsigned int nb_irqs, i;
+ if (k->get_statistics &&
+ k->get_statistics(intc, &irq_counts, &nb_irqs)) {
+ if (nb_irqs > 0) {
+ g_string_append_printf(buf, "IRQ statistics for %s:\n",
+ object_get_typename(obj));
+ for (i = 0; i < nb_irqs; i++) {
+ if (irq_counts[i] > 0) {
+ g_string_append_printf(buf, "%2d: %" PRId64 "\n", i,
+ irq_counts[i]);
+ }
+ }
+ }
+ } else {
+ g_string_append_printf(buf,
+ "IRQ statistics not available for %s.\n",
+ object_get_typename(obj));
+ }
+ }
+
+ return 0;
+}
+
+HumanReadableText *qmp_x_query_irq(Error **errp)
+{
+ g_autoptr(GString) buf = g_string_new("");
+
+ object_child_foreach_recursive(object_get_root(),
+ qmp_x_query_irq_foreach, buf);
+
+ return human_readable_text_from_str(buf);
+}
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index e5ab77f6c6..4a8d1e9a15 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -24,7 +24,6 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-acpi.h"
#include "qapi/qapi-commands-control.h"
-#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-stats.h"
#include "qapi/type-helpers.h"
@@ -42,24 +41,6 @@ NameInfo *qmp_query_name(Error **errp)
return info;
}
-KvmInfo *qmp_query_kvm(Error **errp)
-{
- KvmInfo *info = g_malloc0(sizeof(*info));
-
- info->enabled = kvm_enabled();
- info->present = accel_find("kvm");
-
- return info;
-}
-
-UuidInfo *qmp_query_uuid(Error **errp)
-{
- UuidInfo *info = g_malloc0(sizeof(*info));
-
- info->UUID = qemu_uuid_unparse_strdup(&qemu_uuid);
- return info;
-}
-
void qmp_quit(Error **errp)
{
shutdown_action = SHUTDOWN_ACTION_POWEROFF;
@@ -82,16 +63,6 @@ void qmp_stop(Error **errp)
}
}
-void qmp_system_reset(Error **errp)
-{
- qemu_system_reset_request(SHUTDOWN_CAUSE_HOST_QMP_SYSTEM_RESET);
-}
-
-void qmp_system_powerdown(Error **errp)
-{
- qemu_system_powerdown_request();
-}
-
void qmp_cont(Error **errp)
{
BlockBackend *blk;
@@ -145,17 +116,6 @@ void qmp_cont(Error **errp)
}
}
-void qmp_system_wakeup(Error **errp)
-{
- if (!qemu_wakeup_suspend_enabled()) {
- error_setg(errp,
- "wake-up from suspend is not supported by this guest");
- return;
- }
-
- qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, errp);
-}
-
void qmp_add_client(const char *protocol, const char *fdname,
bool has_skipauth, bool skipauth, bool has_tls, bool tls,
Error **errp)
@@ -196,11 +156,6 @@ void qmp_add_client(const char *protocol, const char *fdname,
}
}
-MemoryDeviceInfoList *qmp_query_memory_devices(Error **errp)
-{
- return qmp_memory_device_list();
-}
-
ACPIOSTInfoList *qmp_query_acpi_ospm_status(Error **errp)
{
bool ambig;
@@ -220,101 +175,6 @@ ACPIOSTInfoList *qmp_query_acpi_ospm_status(Error **errp)
return head;
}
-MemoryInfo *qmp_query_memory_size_summary(Error **errp)
-{
- MemoryInfo *mem_info = g_new0(MemoryInfo, 1);
- MachineState *ms = MACHINE(qdev_get_machine());
-
- mem_info->base_memory = ms->ram_size;
-
- mem_info->plugged_memory = get_plugged_memory_size();
- mem_info->has_plugged_memory =
- mem_info->plugged_memory != (uint64_t)-1;
-
- return mem_info;
-}
-
-static int qmp_x_query_rdma_foreach(Object *obj, void *opaque)
-{
- RdmaProvider *rdma;
- RdmaProviderClass *k;
- GString *buf = opaque;
-
- if (object_dynamic_cast(obj, INTERFACE_RDMA_PROVIDER)) {
- rdma = RDMA_PROVIDER(obj);
- k = RDMA_PROVIDER_GET_CLASS(obj);
- if (k->format_statistics) {
- k->format_statistics(rdma, buf);
- } else {
- g_string_append_printf(buf,
- "RDMA statistics not available for %s.\n",
- object_get_typename(obj));
- }
- }
-
- return 0;
-}
-
-HumanReadableText *qmp_x_query_rdma(Error **errp)
-{
- g_autoptr(GString) buf = g_string_new("");
-
- object_child_foreach_recursive(object_get_root(),
- qmp_x_query_rdma_foreach, buf);
-
- return human_readable_text_from_str(buf);
-}
-
-HumanReadableText *qmp_x_query_ramblock(Error **errp)
-{
- g_autoptr(GString) buf = ram_block_format();
-
- return human_readable_text_from_str(buf);
-}
-
-static int qmp_x_query_irq_foreach(Object *obj, void *opaque)
-{
- InterruptStatsProvider *intc;
- InterruptStatsProviderClass *k;
- GString *buf = opaque;
-
- if (object_dynamic_cast(obj, TYPE_INTERRUPT_STATS_PROVIDER)) {
- intc = INTERRUPT_STATS_PROVIDER(obj);
- k = INTERRUPT_STATS_PROVIDER_GET_CLASS(obj);
- uint64_t *irq_counts;
- unsigned int nb_irqs, i;
- if (k->get_statistics &&
- k->get_statistics(intc, &irq_counts, &nb_irqs)) {
- if (nb_irqs > 0) {
- g_string_append_printf(buf, "IRQ statistics for %s:\n",
- object_get_typename(obj));
- for (i = 0; i < nb_irqs; i++) {
- if (irq_counts[i] > 0) {
- g_string_append_printf(buf, "%2d: %" PRId64 "\n", i,
- irq_counts[i]);
- }
- }
- }
- } else {
- g_string_append_printf(buf,
- "IRQ statistics not available for %s.\n",
- object_get_typename(obj));
- }
- }
-
- return 0;
-}
-
-HumanReadableText *qmp_x_query_irq(Error **errp)
-{
- g_autoptr(GString) buf = g_string_new("");
-
- object_child_foreach_recursive(object_get_root(),
- qmp_x_query_irq_foreach, buf);
-
- return human_readable_text_from_str(buf);
-}
-
typedef struct StatsCallbacks {
StatsProvider provider;
StatRetrieveFunc *stats_cb;
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 10/32] machine: Move HMP commands from monitor/ to hw/core/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (8 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 09/32] machine: Move QMP commands from monitor/ to hw/core/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 11/32] qom: Move HMP commands from monitor/ to qom/ Markus Armbruster
` (21 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS section "Human
Monitor (HMP)" to "Machine core".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/core/machine-hmp-cmds.c | 208 ++++++++++++++++++++++++++++++++++++
monitor/hmp-cmds.c | 209 -------------------------------------
2 files changed, 208 insertions(+), 209 deletions(-)
diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c
index a1a51e9778..c3e55ef9e9 100644
--- a/hw/core/machine-hmp-cmds.c
+++ b/hw/core/machine-hmp-cmds.c
@@ -134,3 +134,211 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
qapi_free_MemdevList(memdev_list);
hmp_handle_error(mon, err);
}
+
+void hmp_info_kvm(Monitor *mon, const QDict *qdict)
+{
+ KvmInfo *info;
+
+ info = qmp_query_kvm(NULL);
+ monitor_printf(mon, "kvm support: ");
+ if (info->present) {
+ monitor_printf(mon, "%s\n", info->enabled ? "enabled" : "disabled");
+ } else {
+ monitor_printf(mon, "not compiled\n");
+ }
+
+ qapi_free_KvmInfo(info);
+}
+
+void hmp_info_uuid(Monitor *mon, const QDict *qdict)
+{
+ UuidInfo *info;
+
+ info = qmp_query_uuid(NULL);
+ monitor_printf(mon, "%s\n", info->UUID);
+ qapi_free_UuidInfo(info);
+}
+
+void hmp_info_balloon(Monitor *mon, const QDict *qdict)
+{
+ BalloonInfo *info;
+ Error *err = NULL;
+
+ info = qmp_query_balloon(&err);
+ if (hmp_handle_error(mon, err)) {
+ return;
+ }
+
+ monitor_printf(mon, "balloon: actual=%" PRId64 "\n", info->actual >> 20);
+
+ qapi_free_BalloonInfo(info);
+}
+
+void hmp_system_reset(Monitor *mon, const QDict *qdict)
+{
+ qmp_system_reset(NULL);
+}
+
+void hmp_system_powerdown(Monitor *mon, const QDict *qdict)
+{
+ qmp_system_powerdown(NULL);
+}
+
+void hmp_memsave(Monitor *mon, const QDict *qdict)
+{
+ uint32_t size = qdict_get_int(qdict, "size");
+ const char *filename = qdict_get_str(qdict, "filename");
+ uint64_t addr = qdict_get_int(qdict, "val");
+ Error *err = NULL;
+ int cpu_index = monitor_get_cpu_index(mon);
+
+ if (cpu_index < 0) {
+ monitor_printf(mon, "No CPU available\n");
+ return;
+ }
+
+ qmp_memsave(addr, size, filename, true, cpu_index, &err);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_pmemsave(Monitor *mon, const QDict *qdict)
+{
+ uint32_t size = qdict_get_int(qdict, "size");
+ const char *filename = qdict_get_str(qdict, "filename");
+ uint64_t addr = qdict_get_int(qdict, "val");
+ Error *err = NULL;
+
+ qmp_pmemsave(addr, size, filename, &err);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_system_wakeup(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+
+ qmp_system_wakeup(&err);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_nmi(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+
+ qmp_inject_nmi(&err);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_balloon(Monitor *mon, const QDict *qdict)
+{
+ int64_t value = qdict_get_int(qdict, "value");
+ Error *err = NULL;
+
+ qmp_balloon(value, &err);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_info_memory_devices(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ MemoryDeviceInfoList *info_list = qmp_query_memory_devices(&err);
+ MemoryDeviceInfoList *info;
+ VirtioPMEMDeviceInfo *vpi;
+ VirtioMEMDeviceInfo *vmi;
+ MemoryDeviceInfo *value;
+ PCDIMMDeviceInfo *di;
+ SgxEPCDeviceInfo *se;
+
+ for (info = info_list; info; info = info->next) {
+ value = info->value;
+
+ if (value) {
+ switch (value->type) {
+ case MEMORY_DEVICE_INFO_KIND_DIMM:
+ case MEMORY_DEVICE_INFO_KIND_NVDIMM:
+ di = value->type == MEMORY_DEVICE_INFO_KIND_DIMM ?
+ value->u.dimm.data : value->u.nvdimm.data;
+ monitor_printf(mon, "Memory device [%s]: \"%s\"\n",
+ MemoryDeviceInfoKind_str(value->type),
+ di->id ? di->id : "");
+ monitor_printf(mon, " addr: 0x%" PRIx64 "\n", di->addr);
+ monitor_printf(mon, " slot: %" PRId64 "\n", di->slot);
+ monitor_printf(mon, " node: %" PRId64 "\n", di->node);
+ monitor_printf(mon, " size: %" PRIu64 "\n", di->size);
+ monitor_printf(mon, " memdev: %s\n", di->memdev);
+ monitor_printf(mon, " hotplugged: %s\n",
+ di->hotplugged ? "true" : "false");
+ monitor_printf(mon, " hotpluggable: %s\n",
+ di->hotpluggable ? "true" : "false");
+ break;
+ case MEMORY_DEVICE_INFO_KIND_VIRTIO_PMEM:
+ vpi = value->u.virtio_pmem.data;
+ monitor_printf(mon, "Memory device [%s]: \"%s\"\n",
+ MemoryDeviceInfoKind_str(value->type),
+ vpi->id ? vpi->id : "");
+ monitor_printf(mon, " memaddr: 0x%" PRIx64 "\n", vpi->memaddr);
+ monitor_printf(mon, " size: %" PRIu64 "\n", vpi->size);
+ monitor_printf(mon, " memdev: %s\n", vpi->memdev);
+ break;
+ case MEMORY_DEVICE_INFO_KIND_VIRTIO_MEM:
+ vmi = value->u.virtio_mem.data;
+ monitor_printf(mon, "Memory device [%s]: \"%s\"\n",
+ MemoryDeviceInfoKind_str(value->type),
+ vmi->id ? vmi->id : "");
+ monitor_printf(mon, " memaddr: 0x%" PRIx64 "\n", vmi->memaddr);
+ monitor_printf(mon, " node: %" PRId64 "\n", vmi->node);
+ monitor_printf(mon, " requested-size: %" PRIu64 "\n",
+ vmi->requested_size);
+ monitor_printf(mon, " size: %" PRIu64 "\n", vmi->size);
+ monitor_printf(mon, " max-size: %" PRIu64 "\n", vmi->max_size);
+ monitor_printf(mon, " block-size: %" PRIu64 "\n",
+ vmi->block_size);
+ monitor_printf(mon, " memdev: %s\n", vmi->memdev);
+ break;
+ case MEMORY_DEVICE_INFO_KIND_SGX_EPC:
+ se = value->u.sgx_epc.data;
+ monitor_printf(mon, "Memory device [%s]: \"%s\"\n",
+ MemoryDeviceInfoKind_str(value->type),
+ se->id ? se->id : "");
+ monitor_printf(mon, " memaddr: 0x%" PRIx64 "\n", se->memaddr);
+ monitor_printf(mon, " size: %" PRIu64 "\n", se->size);
+ monitor_printf(mon, " node: %" PRId64 "\n", se->node);
+ monitor_printf(mon, " memdev: %s\n", se->memdev);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+ }
+ }
+
+ qapi_free_MemoryDeviceInfoList(info_list);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ GuidInfo *info = qmp_query_vm_generation_id(&err);
+ if (info) {
+ monitor_printf(mon, "%s\n", info->guid);
+ }
+ hmp_handle_error(mon, err);
+ qapi_free_GuidInfo(info);
+}
+
+void hmp_info_memory_size_summary(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ MemoryInfo *info = qmp_query_memory_size_summary(&err);
+ if (info) {
+ monitor_printf(mon, "base memory: %" PRIu64 "\n",
+ info->base_memory);
+
+ if (info->has_plugged_memory) {
+ monitor_printf(mon, "plugged memory: %" PRIu64 "\n",
+ info->plugged_memory);
+ }
+
+ qapi_free_MemoryInfo(info);
+ }
+ hmp_handle_error(mon, err);
+}
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index c8ed59c281..1e41381e77 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -26,7 +26,6 @@
#include "qapi/qapi-builtin-visit.h"
#include "qapi/qapi-commands-block.h"
#include "qapi/qapi-commands-control.h"
-#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-net.h"
@@ -108,21 +107,6 @@ void hmp_info_version(Monitor *mon, const QDict *qdict)
qapi_free_VersionInfo(info);
}
-void hmp_info_kvm(Monitor *mon, const QDict *qdict)
-{
- KvmInfo *info;
-
- info = qmp_query_kvm(NULL);
- monitor_printf(mon, "kvm support: ");
- if (info->present) {
- monitor_printf(mon, "%s\n", info->enabled ? "enabled" : "disabled");
- } else {
- monitor_printf(mon, "not compiled\n");
- }
-
- qapi_free_KvmInfo(info);
-}
-
void hmp_info_status(Monitor *mon, const QDict *qdict)
{
StatusInfo *info;
@@ -142,15 +126,6 @@ void hmp_info_status(Monitor *mon, const QDict *qdict)
qapi_free_StatusInfo(info);
}
-void hmp_info_uuid(Monitor *mon, const QDict *qdict)
-{
- UuidInfo *info;
-
- info = qmp_query_uuid(NULL);
- monitor_printf(mon, "%s\n", info->UUID);
- qapi_free_UuidInfo(info);
-}
-
void hmp_info_migrate(Monitor *mon, const QDict *qdict)
{
MigrationInfo *info;
@@ -469,21 +444,6 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
qapi_free_MigrationParameters(params);
}
-void hmp_info_balloon(Monitor *mon, const QDict *qdict)
-{
- BalloonInfo *info;
- Error *err = NULL;
-
- info = qmp_query_balloon(&err);
- if (hmp_handle_error(mon, err)) {
- return;
- }
-
- monitor_printf(mon, "balloon: actual=%" PRId64 "\n", info->actual >> 20);
-
- qapi_free_BalloonInfo(info);
-}
-
static int hmp_info_pic_foreach(Object *obj, void *opaque)
{
InterruptStatsProvider *intc;
@@ -598,16 +558,6 @@ void hmp_sync_profile(Monitor *mon, const QDict *qdict)
}
}
-void hmp_system_reset(Monitor *mon, const QDict *qdict)
-{
- qmp_system_reset(NULL);
-}
-
-void hmp_system_powerdown(Monitor *mon, const QDict *qdict)
-{
- qmp_system_powerdown(NULL);
-}
-
void hmp_exit_preconfig(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
@@ -628,34 +578,6 @@ void hmp_cpu(Monitor *mon, const QDict *qdict)
}
}
-void hmp_memsave(Monitor *mon, const QDict *qdict)
-{
- uint32_t size = qdict_get_int(qdict, "size");
- const char *filename = qdict_get_str(qdict, "filename");
- uint64_t addr = qdict_get_int(qdict, "val");
- Error *err = NULL;
- int cpu_index = monitor_get_cpu_index(mon);
-
- if (cpu_index < 0) {
- monitor_printf(mon, "No CPU available\n");
- return;
- }
-
- qmp_memsave(addr, size, filename, true, cpu_index, &err);
- hmp_handle_error(mon, err);
-}
-
-void hmp_pmemsave(Monitor *mon, const QDict *qdict)
-{
- uint32_t size = qdict_get_int(qdict, "size");
- const char *filename = qdict_get_str(qdict, "filename");
- uint64_t addr = qdict_get_int(qdict, "val");
- Error *err = NULL;
-
- qmp_pmemsave(addr, size, filename, &err);
- hmp_handle_error(mon, err);
-}
-
void hmp_cont(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
@@ -664,22 +586,6 @@ void hmp_cont(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
-void hmp_system_wakeup(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
-
- qmp_system_wakeup(&err);
- hmp_handle_error(mon, err);
-}
-
-void hmp_nmi(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
-
- qmp_inject_nmi(&err);
- hmp_handle_error(mon, err);
-}
-
void hmp_set_link(Monitor *mon, const QDict *qdict)
{
const char *name = qdict_get_str(qdict, "name");
@@ -690,15 +596,6 @@ void hmp_set_link(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
-void hmp_balloon(Monitor *mon, const QDict *qdict)
-{
- int64_t value = qdict_get_int(qdict, "value");
- Error *err = NULL;
-
- qmp_balloon(value, &err);
- hmp_handle_error(mon, err);
-}
-
void hmp_loadvm(Monitor *mon, const QDict *qdict)
{
int saved_vm_running = runstate_is_running();
@@ -1193,83 +1090,6 @@ void hmp_object_del(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
-void hmp_info_memory_devices(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- MemoryDeviceInfoList *info_list = qmp_query_memory_devices(&err);
- MemoryDeviceInfoList *info;
- VirtioPMEMDeviceInfo *vpi;
- VirtioMEMDeviceInfo *vmi;
- MemoryDeviceInfo *value;
- PCDIMMDeviceInfo *di;
- SgxEPCDeviceInfo *se;
-
- for (info = info_list; info; info = info->next) {
- value = info->value;
-
- if (value) {
- switch (value->type) {
- case MEMORY_DEVICE_INFO_KIND_DIMM:
- case MEMORY_DEVICE_INFO_KIND_NVDIMM:
- di = value->type == MEMORY_DEVICE_INFO_KIND_DIMM ?
- value->u.dimm.data : value->u.nvdimm.data;
- monitor_printf(mon, "Memory device [%s]: \"%s\"\n",
- MemoryDeviceInfoKind_str(value->type),
- di->id ? di->id : "");
- monitor_printf(mon, " addr: 0x%" PRIx64 "\n", di->addr);
- monitor_printf(mon, " slot: %" PRId64 "\n", di->slot);
- monitor_printf(mon, " node: %" PRId64 "\n", di->node);
- monitor_printf(mon, " size: %" PRIu64 "\n", di->size);
- monitor_printf(mon, " memdev: %s\n", di->memdev);
- monitor_printf(mon, " hotplugged: %s\n",
- di->hotplugged ? "true" : "false");
- monitor_printf(mon, " hotpluggable: %s\n",
- di->hotpluggable ? "true" : "false");
- break;
- case MEMORY_DEVICE_INFO_KIND_VIRTIO_PMEM:
- vpi = value->u.virtio_pmem.data;
- monitor_printf(mon, "Memory device [%s]: \"%s\"\n",
- MemoryDeviceInfoKind_str(value->type),
- vpi->id ? vpi->id : "");
- monitor_printf(mon, " memaddr: 0x%" PRIx64 "\n", vpi->memaddr);
- monitor_printf(mon, " size: %" PRIu64 "\n", vpi->size);
- monitor_printf(mon, " memdev: %s\n", vpi->memdev);
- break;
- case MEMORY_DEVICE_INFO_KIND_VIRTIO_MEM:
- vmi = value->u.virtio_mem.data;
- monitor_printf(mon, "Memory device [%s]: \"%s\"\n",
- MemoryDeviceInfoKind_str(value->type),
- vmi->id ? vmi->id : "");
- monitor_printf(mon, " memaddr: 0x%" PRIx64 "\n", vmi->memaddr);
- monitor_printf(mon, " node: %" PRId64 "\n", vmi->node);
- monitor_printf(mon, " requested-size: %" PRIu64 "\n",
- vmi->requested_size);
- monitor_printf(mon, " size: %" PRIu64 "\n", vmi->size);
- monitor_printf(mon, " max-size: %" PRIu64 "\n", vmi->max_size);
- monitor_printf(mon, " block-size: %" PRIu64 "\n",
- vmi->block_size);
- monitor_printf(mon, " memdev: %s\n", vmi->memdev);
- break;
- case MEMORY_DEVICE_INFO_KIND_SGX_EPC:
- se = value->u.sgx_epc.data;
- monitor_printf(mon, "Memory device [%s]: \"%s\"\n",
- MemoryDeviceInfoKind_str(value->type),
- se->id ? se->id : "");
- monitor_printf(mon, " memaddr: 0x%" PRIx64 "\n", se->memaddr);
- monitor_printf(mon, " size: %" PRIu64 "\n", se->size);
- monitor_printf(mon, " node: %" PRId64 "\n", se->node);
- monitor_printf(mon, " memdev: %s\n", se->memdev);
- break;
- default:
- g_assert_not_reached();
- }
- }
- }
-
- qapi_free_MemoryDeviceInfoList(info_list);
- hmp_handle_error(mon, err);
-}
-
void hmp_info_iothreads(Monitor *mon, const QDict *qdict)
{
IOThreadInfoList *info_list = qmp_query_iothreads(NULL);
@@ -1585,35 +1405,6 @@ void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict *qdict)
qapi_free_RockerOfDpaGroupList(list);
}
-void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- GuidInfo *info = qmp_query_vm_generation_id(&err);
- if (info) {
- monitor_printf(mon, "%s\n", info->guid);
- }
- hmp_handle_error(mon, err);
- qapi_free_GuidInfo(info);
-}
-
-void hmp_info_memory_size_summary(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- MemoryInfo *info = qmp_query_memory_size_summary(&err);
- if (info) {
- monitor_printf(mon, "base memory: %" PRIu64 "\n",
- info->base_memory);
-
- if (info->has_plugged_memory) {
- monitor_printf(mon, "plugged memory: %" PRIu64 "\n",
- info->plugged_memory);
- }
-
- qapi_free_MemoryInfo(info);
- }
- hmp_handle_error(mon, err);
-}
-
static void print_stats_schema_value(Monitor *mon, StatsSchemaValue *value)
{
const char *unit = NULL;
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 11/32] qom: Move HMP commands from monitor/ to qom/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (9 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 10/32] machine: Move HMP " Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:23 ` Philippe Mathieu-Daudé
2023-01-24 12:19 ` [PATCH 12/32] block: Factor out hmp_change_medium(), and move to block/monitor/ Markus Armbruster
` (20 subsequent siblings)
31 siblings, 1 reply; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS sections "Human
Monitor (HMP)" and "QMP" to "QOM".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor/hmp-cmds.c | 19 -------------
monitor/misc.c | 49 ---------------------------------
qom/qom-hmp-cmds.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 67 insertions(+), 68 deletions(-)
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 1e41381e77..4fe2aaebcd 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -40,7 +40,6 @@
#include "qapi/qmp/qerror.h"
#include "qapi/string-input-visitor.h"
#include "qapi/string-output-visitor.h"
-#include "qom/object_interfaces.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "hw/core/cpu.h"
@@ -1054,15 +1053,6 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
-void hmp_object_add(Monitor *mon, const QDict *qdict)
-{
- const char *options = qdict_get_str(qdict, "object");
- Error *err = NULL;
-
- user_creatable_add_from_str(options, &err);
- hmp_handle_error(mon, err);
-}
-
void hmp_getfd(Monitor *mon, const QDict *qdict)
{
const char *fdname = qdict_get_str(qdict, "fdname");
@@ -1081,15 +1071,6 @@ void hmp_closefd(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
-void hmp_object_del(Monitor *mon, const QDict *qdict)
-{
- const char *id = qdict_get_str(qdict, "id");
- Error *err = NULL;
-
- user_creatable_del(id, &err);
- hmp_handle_error(mon, err);
-}
-
void hmp_info_iothreads(Monitor *mon, const QDict *qdict)
{
IOThreadInfoList *info_list = qmp_query_iothreads(NULL);
diff --git a/monitor/misc.c b/monitor/misc.c
index 2a6bc13e7f..0cf2518ce1 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -38,7 +38,6 @@
#include "sysemu/device_tree.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
-#include "qom/object_interfaces.h"
#include "monitor/hmp-target.h"
#include "monitor/hmp.h"
#include "exec/address-spaces.h"
@@ -48,7 +47,6 @@
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qapi-commands-qom.h"
#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-init-commands.h"
@@ -1310,30 +1308,6 @@ void device_add_completion(ReadLineState *rs, int nb_args, const char *str)
g_slist_free(list);
}
-void object_add_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- GSList *list, *elt;
- size_t len;
-
- if (nb_args != 2) {
- return;
- }
-
- len = strlen(str);
- readline_set_completion_index(rs, len);
- list = elt = object_class_get_list(TYPE_USER_CREATABLE, false);
- while (elt) {
- const char *name;
-
- name = object_class_get_name(OBJECT_CLASS(elt->data));
- if (strcmp(name, TYPE_USER_CREATABLE)) {
- readline_add_completion_of(rs, str, name);
- }
- elt = elt->next;
- }
- g_slist_free(list);
-}
-
static int qdev_add_hotpluggable_device(Object *obj, void *opaque)
{
GSList **list = opaque;
@@ -1391,29 +1365,6 @@ void device_del_completion(ReadLineState *rs, int nb_args, const char *str)
peripheral_device_del_completion(rs, str);
}
-void object_del_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- ObjectPropertyInfoList *list, *start;
- size_t len;
-
- if (nb_args != 2) {
- return;
- }
- len = strlen(str);
- readline_set_completion_index(rs, len);
-
- start = list = qmp_qom_list("/objects", NULL);
- while (list) {
- ObjectPropertyInfo *info = list->value;
-
- if (!strncmp(info->type, "child<", 5)) {
- readline_add_completion_of(rs, str, info->name);
- }
- list = list->next;
- }
- qapi_free_ObjectPropertyInfoList(start);
-}
-
void set_link_completion(ReadLineState *rs, int nb_args, const char *str)
{
size_t len;
diff --git a/qom/qom-hmp-cmds.c b/qom/qom-hmp-cmds.c
index 453fbfeabc..6e3a2175a4 100644
--- a/qom/qom-hmp-cmds.c
+++ b/qom/qom-hmp-cmds.c
@@ -13,7 +13,9 @@
#include "qapi/qapi-commands-qom.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qjson.h"
+#include "qemu/readline.h"
#include "qom/object.h"
+#include "qom/object_interfaces.h"
void hmp_qom_list(Monitor *mon, const QDict *qdict)
{
@@ -150,3 +152,68 @@ void hmp_info_qom_tree(Monitor *mon, const QDict *dict)
}
print_qom_composition(mon, obj, 0);
}
+
+void hmp_object_add(Monitor *mon, const QDict *qdict)
+{
+ const char *options = qdict_get_str(qdict, "object");
+ Error *err = NULL;
+
+ user_creatable_add_from_str(options, &err);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_object_del(Monitor *mon, const QDict *qdict)
+{
+ const char *id = qdict_get_str(qdict, "id");
+ Error *err = NULL;
+
+ user_creatable_del(id, &err);
+ hmp_handle_error(mon, err);
+}
+
+void object_add_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ GSList *list, *elt;
+ size_t len;
+
+ if (nb_args != 2) {
+ return;
+ }
+
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+ list = elt = object_class_get_list(TYPE_USER_CREATABLE, false);
+ while (elt) {
+ const char *name;
+
+ name = object_class_get_name(OBJECT_CLASS(elt->data));
+ if (strcmp(name, TYPE_USER_CREATABLE)) {
+ readline_add_completion_of(rs, str, name);
+ }
+ elt = elt->next;
+ }
+ g_slist_free(list);
+}
+
+void object_del_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ ObjectPropertyInfoList *list, *start;
+ size_t len;
+
+ if (nb_args != 2) {
+ return;
+ }
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+
+ start = list = qmp_qom_list("/objects", NULL);
+ while (list) {
+ ObjectPropertyInfo *info = list->value;
+
+ if (!strncmp(info->type, "child<", 5)) {
+ readline_add_completion_of(rs, str, info->name);
+ }
+ list = list->next;
+ }
+ qapi_free_ObjectPropertyInfoList(start);
+}
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* Re: [PATCH 11/32] qom: Move HMP commands from monitor/ to qom/
2023-01-24 12:19 ` [PATCH 11/32] qom: Move HMP commands from monitor/ to qom/ Markus Armbruster
@ 2023-01-24 12:23 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 44+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-01-24 12:23 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, wangyanan55, jasowang,
jiri, berrange, thuth, quintela, stefanb, stefanha, kvm,
qemu-block
On 24/1/23 13:19, Markus Armbruster wrote:
> This moves these commands from MAINTAINERS sections "Human
> Monitor (HMP)" and "QMP" to "QOM".
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> monitor/hmp-cmds.c | 19 -------------
> monitor/misc.c | 49 ---------------------------------
> qom/qom-hmp-cmds.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 67 insertions(+), 68 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH 12/32] block: Factor out hmp_change_medium(), and move to block/monitor/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (10 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 11/32] qom: Move HMP commands from monitor/ to qom/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 14:20 ` Stefan Hajnoczi
2023-01-26 13:29 ` Stefan Berger
2023-01-24 12:19 ` [PATCH 13/32] rocker: Move HMP commands from monitor to hw/net/rocker/ Markus Armbruster
` (19 subsequent siblings)
31 siblings, 2 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/monitor/hmp.h | 3 +++
block/monitor/block-hmp-cmds.c | 21 +++++++++++++++++++++
monitor/hmp-cmds.c | 17 +----------------
3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index 58ed1bec62..6fafa7ffb4 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -78,6 +78,9 @@ void hmp_change_vnc(Monitor *mon, const char *device, const char *target,
const char *arg, const char *read_only, bool force,
Error **errp);
#endif
+void hmp_change_medium(Monitor *mon, const char *device, const char *target,
+ const char *arg, const char *read_only, bool force,
+ Error **errp);
void hmp_migrate(Monitor *mon, const QDict *qdict);
void hmp_device_add(Monitor *mon, const QDict *qdict);
void hmp_device_del(Monitor *mon, const QDict *qdict);
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
index 0ff7c84039..ae624ab575 100644
--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
@@ -1005,3 +1005,24 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict)
g_free(sn_tab);
g_free(global_snapshots);
}
+
+void hmp_change_medium(Monitor *mon, const char *device, const char *target,
+ const char *arg, const char *read_only, bool force,
+ Error **errp)
+{
+ ERRP_GUARD();
+ BlockdevChangeReadOnlyMode read_only_mode = 0;
+
+ if (read_only) {
+ read_only_mode =
+ qapi_enum_parse(&BlockdevChangeReadOnlyMode_lookup,
+ read_only,
+ BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN, errp);
+ if (*errp) {
+ return;
+ }
+ }
+
+ qmp_blockdev_change_medium(device, NULL, target, arg, true, force,
+ !!read_only, read_only_mode, errp);
+}
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 4fe2aaebcd..bed75af656 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -24,7 +24,6 @@
#include "qapi/error.h"
#include "qapi/clone-visitor.h"
#include "qapi/qapi-builtin-visit.h"
-#include "qapi/qapi-commands-block.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h"
@@ -916,7 +915,6 @@ void hmp_change(Monitor *mon, const QDict *qdict)
const char *arg = qdict_get_try_str(qdict, "arg");
const char *read_only = qdict_get_try_str(qdict, "read-only-mode");
bool force = qdict_get_try_bool(qdict, "force", false);
- BlockdevChangeReadOnlyMode read_only_mode = 0;
Error *err = NULL;
#ifdef CONFIG_VNC
@@ -925,22 +923,9 @@ void hmp_change(Monitor *mon, const QDict *qdict)
} else
#endif
{
- if (read_only) {
- read_only_mode =
- qapi_enum_parse(&BlockdevChangeReadOnlyMode_lookup,
- read_only,
- BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN, &err);
- if (err) {
- goto end;
- }
- }
-
- qmp_blockdev_change_medium(device, NULL, target, arg, true, force,
- !!read_only, read_only_mode,
- &err);
+ hmp_change_medium(mon, device, target, arg, read_only, force, &err);
}
-end:
hmp_handle_error(mon, err);
}
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* Re: [PATCH 12/32] block: Factor out hmp_change_medium(), and move to block/monitor/
2023-01-24 12:19 ` [PATCH 12/32] block: Factor out hmp_change_medium(), and move to block/monitor/ Markus Armbruster
@ 2023-01-24 14:20 ` Stefan Hajnoczi
2023-01-26 13:29 ` Stefan Berger
1 sibling, 0 replies; 44+ messages in thread
From: Stefan Hajnoczi @ 2023-01-24 14:20 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, pbonzini, kraxel, kwolf, hreitz, marcandre.lureau,
dgilbert, mst, imammedo, ani, eduardo, marcel.apfelbaum, philmd,
wangyanan55, jasowang, jiri, berrange, thuth, quintela, stefanb,
kvm, qemu-block
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
On Tue, Jan 24, 2023 at 01:19:26PM +0100, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> include/monitor/hmp.h | 3 +++
> block/monitor/block-hmp-cmds.c | 21 +++++++++++++++++++++
> monitor/hmp-cmds.c | 17 +----------------
> 3 files changed, 25 insertions(+), 16 deletions(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 12/32] block: Factor out hmp_change_medium(), and move to block/monitor/
2023-01-24 12:19 ` [PATCH 12/32] block: Factor out hmp_change_medium(), and move to block/monitor/ Markus Armbruster
2023-01-24 14:20 ` Stefan Hajnoczi
@ 2023-01-26 13:29 ` Stefan Berger
1 sibling, 0 replies; 44+ messages in thread
From: Stefan Berger @ 2023-01-26 13:29 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
On 1/24/23 07:19, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH 13/32] rocker: Move HMP commands from monitor to hw/net/rocker/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (11 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 12/32] block: Factor out hmp_change_medium(), and move to block/monitor/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 14/32] hmp: Rewrite strlist_from_comma_list() as hmp_split_at_comma() Markus Armbruster
` (18 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS section "Human
Monitor (HMP)" to "Rocker" and "Network devices".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/net/rocker/rocker-hmp-cmds.c | 316 ++++++++++++++++++++++++++++++++
monitor/hmp-cmds.c | 297 ------------------------------
hw/net/meson.build | 1 +
3 files changed, 317 insertions(+), 297 deletions(-)
create mode 100644 hw/net/rocker/rocker-hmp-cmds.c
diff --git a/hw/net/rocker/rocker-hmp-cmds.c b/hw/net/rocker/rocker-hmp-cmds.c
new file mode 100644
index 0000000000..197c6e28dc
--- /dev/null
+++ b/hw/net/rocker/rocker-hmp-cmds.c
@@ -0,0 +1,316 @@
+/*
+ * Human Monitor Interface commands
+ *
+ * Copyright IBM, Corp. 2011
+ *
+ * Authors:
+ * Anthony Liguori <aliguori@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
+ */
+
+#include "qemu/osdep.h"
+#include "monitor/hmp.h"
+#include "monitor/monitor.h"
+#include "net/eth.h"
+#include "qapi/qapi-commands-rocker.h"
+#include "qapi/qmp/qdict.h"
+
+void hmp_rocker(Monitor *mon, const QDict *qdict)
+{
+ const char *name = qdict_get_str(qdict, "name");
+ RockerSwitch *rocker;
+ Error *err = NULL;
+
+ rocker = qmp_query_rocker(name, &err);
+ if (hmp_handle_error(mon, err)) {
+ return;
+ }
+
+ monitor_printf(mon, "name: %s\n", rocker->name);
+ monitor_printf(mon, "id: 0x%" PRIx64 "\n", rocker->id);
+ monitor_printf(mon, "ports: %d\n", rocker->ports);
+
+ qapi_free_RockerSwitch(rocker);
+}
+
+void hmp_rocker_ports(Monitor *mon, const QDict *qdict)
+{
+ RockerPortList *list, *port;
+ const char *name = qdict_get_str(qdict, "name");
+ Error *err = NULL;
+
+ list = qmp_query_rocker_ports(name, &err);
+ if (hmp_handle_error(mon, err)) {
+ return;
+ }
+
+ monitor_printf(mon, " ena/ speed/ auto\n");
+ monitor_printf(mon, " port link duplex neg?\n");
+
+ for (port = list; port; port = port->next) {
+ monitor_printf(mon, "%10s %-4s %-3s %2s %s\n",
+ port->value->name,
+ port->value->enabled ? port->value->link_up ?
+ "up" : "down" : "!ena",
+ port->value->speed == 10000 ? "10G" : "??",
+ port->value->duplex ? "FD" : "HD",
+ port->value->autoneg ? "Yes" : "No");
+ }
+
+ qapi_free_RockerPortList(list);
+}
+
+void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict *qdict)
+{
+ RockerOfDpaFlowList *list, *info;
+ const char *name = qdict_get_str(qdict, "name");
+ uint32_t tbl_id = qdict_get_try_int(qdict, "tbl_id", -1);
+ Error *err = NULL;
+
+ list = qmp_query_rocker_of_dpa_flows(name, tbl_id != -1, tbl_id, &err);
+ if (hmp_handle_error(mon, err)) {
+ return;
+ }
+
+ monitor_printf(mon, "prio tbl hits key(mask) --> actions\n");
+
+ for (info = list; info; info = info->next) {
+ RockerOfDpaFlow *flow = info->value;
+ RockerOfDpaFlowKey *key = flow->key;
+ RockerOfDpaFlowMask *mask = flow->mask;
+ RockerOfDpaFlowAction *action = flow->action;
+
+ if (flow->hits) {
+ monitor_printf(mon, "%-4d %-3d %-4" PRIu64,
+ key->priority, key->tbl_id, flow->hits);
+ } else {
+ monitor_printf(mon, "%-4d %-3d ",
+ key->priority, key->tbl_id);
+ }
+
+ if (key->has_in_pport) {
+ monitor_printf(mon, " pport %d", key->in_pport);
+ if (mask->has_in_pport) {
+ monitor_printf(mon, "(0x%x)", mask->in_pport);
+ }
+ }
+
+ if (key->has_vlan_id) {
+ monitor_printf(mon, " vlan %d",
+ key->vlan_id & VLAN_VID_MASK);
+ if (mask->has_vlan_id) {
+ monitor_printf(mon, "(0x%x)", mask->vlan_id);
+ }
+ }
+
+ if (key->has_tunnel_id) {
+ monitor_printf(mon, " tunnel %d", key->tunnel_id);
+ if (mask->has_tunnel_id) {
+ monitor_printf(mon, "(0x%x)", mask->tunnel_id);
+ }
+ }
+
+ if (key->has_eth_type) {
+ switch (key->eth_type) {
+ case 0x0806:
+ monitor_printf(mon, " ARP");
+ break;
+ case 0x0800:
+ monitor_printf(mon, " IP");
+ break;
+ case 0x86dd:
+ monitor_printf(mon, " IPv6");
+ break;
+ case 0x8809:
+ monitor_printf(mon, " LACP");
+ break;
+ case 0x88cc:
+ monitor_printf(mon, " LLDP");
+ break;
+ default:
+ monitor_printf(mon, " eth type 0x%04x", key->eth_type);
+ break;
+ }
+ }
+
+ if (key->eth_src) {
+ if ((strcmp(key->eth_src, "01:00:00:00:00:00") == 0) &&
+ mask->eth_src &&
+ (strcmp(mask->eth_src, "01:00:00:00:00:00") == 0)) {
+ monitor_printf(mon, " src <any mcast/bcast>");
+ } else if ((strcmp(key->eth_src, "00:00:00:00:00:00") == 0) &&
+ mask->eth_src &&
+ (strcmp(mask->eth_src, "01:00:00:00:00:00") == 0)) {
+ monitor_printf(mon, " src <any ucast>");
+ } else {
+ monitor_printf(mon, " src %s", key->eth_src);
+ if (mask->eth_src) {
+ monitor_printf(mon, "(%s)", mask->eth_src);
+ }
+ }
+ }
+
+ if (key->eth_dst) {
+ if ((strcmp(key->eth_dst, "01:00:00:00:00:00") == 0) &&
+ mask->eth_dst &&
+ (strcmp(mask->eth_dst, "01:00:00:00:00:00") == 0)) {
+ monitor_printf(mon, " dst <any mcast/bcast>");
+ } else if ((strcmp(key->eth_dst, "00:00:00:00:00:00") == 0) &&
+ mask->eth_dst &&
+ (strcmp(mask->eth_dst, "01:00:00:00:00:00") == 0)) {
+ monitor_printf(mon, " dst <any ucast>");
+ } else {
+ monitor_printf(mon, " dst %s", key->eth_dst);
+ if (mask->eth_dst) {
+ monitor_printf(mon, "(%s)", mask->eth_dst);
+ }
+ }
+ }
+
+ if (key->has_ip_proto) {
+ monitor_printf(mon, " proto %d", key->ip_proto);
+ if (mask->has_ip_proto) {
+ monitor_printf(mon, "(0x%x)", mask->ip_proto);
+ }
+ }
+
+ if (key->has_ip_tos) {
+ monitor_printf(mon, " TOS %d", key->ip_tos);
+ if (mask->has_ip_tos) {
+ monitor_printf(mon, "(0x%x)", mask->ip_tos);
+ }
+ }
+
+ if (key->ip_dst) {
+ monitor_printf(mon, " dst %s", key->ip_dst);
+ }
+
+ if (action->has_goto_tbl || action->has_group_id ||
+ action->has_new_vlan_id) {
+ monitor_printf(mon, " -->");
+ }
+
+ if (action->has_new_vlan_id) {
+ monitor_printf(mon, " apply new vlan %d",
+ ntohs(action->new_vlan_id));
+ }
+
+ if (action->has_group_id) {
+ monitor_printf(mon, " write group 0x%08x", action->group_id);
+ }
+
+ if (action->has_goto_tbl) {
+ monitor_printf(mon, " goto tbl %d", action->goto_tbl);
+ }
+
+ monitor_printf(mon, "\n");
+ }
+
+ qapi_free_RockerOfDpaFlowList(list);
+}
+
+void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict *qdict)
+{
+ RockerOfDpaGroupList *list, *g;
+ const char *name = qdict_get_str(qdict, "name");
+ uint8_t type = qdict_get_try_int(qdict, "type", 9);
+ Error *err = NULL;
+
+ list = qmp_query_rocker_of_dpa_groups(name, type != 9, type, &err);
+ if (hmp_handle_error(mon, err)) {
+ return;
+ }
+
+ monitor_printf(mon, "id (decode) --> buckets\n");
+
+ for (g = list; g; g = g->next) {
+ RockerOfDpaGroup *group = g->value;
+ bool set = false;
+
+ monitor_printf(mon, "0x%08x", group->id);
+
+ monitor_printf(mon, " (type %s", group->type == 0 ? "L2 interface" :
+ group->type == 1 ? "L2 rewrite" :
+ group->type == 2 ? "L3 unicast" :
+ group->type == 3 ? "L2 multicast" :
+ group->type == 4 ? "L2 flood" :
+ group->type == 5 ? "L3 interface" :
+ group->type == 6 ? "L3 multicast" :
+ group->type == 7 ? "L3 ECMP" :
+ group->type == 8 ? "L2 overlay" :
+ "unknown");
+
+ if (group->has_vlan_id) {
+ monitor_printf(mon, " vlan %d", group->vlan_id);
+ }
+
+ if (group->has_pport) {
+ monitor_printf(mon, " pport %d", group->pport);
+ }
+
+ if (group->has_index) {
+ monitor_printf(mon, " index %d", group->index);
+ }
+
+ monitor_printf(mon, ") -->");
+
+ if (group->has_set_vlan_id && group->set_vlan_id) {
+ set = true;
+ monitor_printf(mon, " set vlan %d",
+ group->set_vlan_id & VLAN_VID_MASK);
+ }
+
+ if (group->set_eth_src) {
+ if (!set) {
+ set = true;
+ monitor_printf(mon, " set");
+ }
+ monitor_printf(mon, " src %s", group->set_eth_src);
+ }
+
+ if (group->set_eth_dst) {
+ if (!set) {
+ monitor_printf(mon, " set");
+ }
+ monitor_printf(mon, " dst %s", group->set_eth_dst);
+ }
+
+ if (group->has_ttl_check && group->ttl_check) {
+ monitor_printf(mon, " check TTL");
+ }
+
+ if (group->has_group_id && group->group_id) {
+ monitor_printf(mon, " group id 0x%08x", group->group_id);
+ }
+
+ if (group->has_pop_vlan && group->pop_vlan) {
+ monitor_printf(mon, " pop vlan");
+ }
+
+ if (group->has_out_pport) {
+ monitor_printf(mon, " out pport %d", group->out_pport);
+ }
+
+ if (group->has_group_ids) {
+ struct uint32List *id;
+
+ monitor_printf(mon, " groups [");
+ for (id = group->group_ids; id; id = id->next) {
+ monitor_printf(mon, "0x%08x", id->value);
+ if (id->next) {
+ monitor_printf(mon, ",");
+ }
+ }
+ monitor_printf(mon, "]");
+ }
+
+ monitor_printf(mon, "\n");
+ }
+
+ qapi_free_RockerOfDpaGroupList(list);
+}
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index bed75af656..edb50da1ff 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -16,7 +16,6 @@
#include "qemu/osdep.h"
#include "monitor/hmp.h"
#include "net/net.h"
-#include "net/eth.h"
#include "sysemu/runstate.h"
#include "qemu/sockets.h"
#include "qemu/help_option.h"
@@ -28,7 +27,6 @@
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-net.h"
-#include "qapi/qapi-commands-rocker.h"
#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-stats.h"
#include "qapi/qapi-commands-tpm.h"
@@ -1076,301 +1074,6 @@ void hmp_info_iothreads(Monitor *mon, const QDict *qdict)
qapi_free_IOThreadInfoList(info_list);
}
-void hmp_rocker(Monitor *mon, const QDict *qdict)
-{
- const char *name = qdict_get_str(qdict, "name");
- RockerSwitch *rocker;
- Error *err = NULL;
-
- rocker = qmp_query_rocker(name, &err);
- if (hmp_handle_error(mon, err)) {
- return;
- }
-
- monitor_printf(mon, "name: %s\n", rocker->name);
- monitor_printf(mon, "id: 0x%" PRIx64 "\n", rocker->id);
- monitor_printf(mon, "ports: %d\n", rocker->ports);
-
- qapi_free_RockerSwitch(rocker);
-}
-
-void hmp_rocker_ports(Monitor *mon, const QDict *qdict)
-{
- RockerPortList *list, *port;
- const char *name = qdict_get_str(qdict, "name");
- Error *err = NULL;
-
- list = qmp_query_rocker_ports(name, &err);
- if (hmp_handle_error(mon, err)) {
- return;
- }
-
- monitor_printf(mon, " ena/ speed/ auto\n");
- monitor_printf(mon, " port link duplex neg?\n");
-
- for (port = list; port; port = port->next) {
- monitor_printf(mon, "%10s %-4s %-3s %2s %s\n",
- port->value->name,
- port->value->enabled ? port->value->link_up ?
- "up" : "down" : "!ena",
- port->value->speed == 10000 ? "10G" : "??",
- port->value->duplex ? "FD" : "HD",
- port->value->autoneg ? "Yes" : "No");
- }
-
- qapi_free_RockerPortList(list);
-}
-
-void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict *qdict)
-{
- RockerOfDpaFlowList *list, *info;
- const char *name = qdict_get_str(qdict, "name");
- uint32_t tbl_id = qdict_get_try_int(qdict, "tbl_id", -1);
- Error *err = NULL;
-
- list = qmp_query_rocker_of_dpa_flows(name, tbl_id != -1, tbl_id, &err);
- if (hmp_handle_error(mon, err)) {
- return;
- }
-
- monitor_printf(mon, "prio tbl hits key(mask) --> actions\n");
-
- for (info = list; info; info = info->next) {
- RockerOfDpaFlow *flow = info->value;
- RockerOfDpaFlowKey *key = flow->key;
- RockerOfDpaFlowMask *mask = flow->mask;
- RockerOfDpaFlowAction *action = flow->action;
-
- if (flow->hits) {
- monitor_printf(mon, "%-4d %-3d %-4" PRIu64,
- key->priority, key->tbl_id, flow->hits);
- } else {
- monitor_printf(mon, "%-4d %-3d ",
- key->priority, key->tbl_id);
- }
-
- if (key->has_in_pport) {
- monitor_printf(mon, " pport %d", key->in_pport);
- if (mask->has_in_pport) {
- monitor_printf(mon, "(0x%x)", mask->in_pport);
- }
- }
-
- if (key->has_vlan_id) {
- monitor_printf(mon, " vlan %d",
- key->vlan_id & VLAN_VID_MASK);
- if (mask->has_vlan_id) {
- monitor_printf(mon, "(0x%x)", mask->vlan_id);
- }
- }
-
- if (key->has_tunnel_id) {
- monitor_printf(mon, " tunnel %d", key->tunnel_id);
- if (mask->has_tunnel_id) {
- monitor_printf(mon, "(0x%x)", mask->tunnel_id);
- }
- }
-
- if (key->has_eth_type) {
- switch (key->eth_type) {
- case 0x0806:
- monitor_printf(mon, " ARP");
- break;
- case 0x0800:
- monitor_printf(mon, " IP");
- break;
- case 0x86dd:
- monitor_printf(mon, " IPv6");
- break;
- case 0x8809:
- monitor_printf(mon, " LACP");
- break;
- case 0x88cc:
- monitor_printf(mon, " LLDP");
- break;
- default:
- monitor_printf(mon, " eth type 0x%04x", key->eth_type);
- break;
- }
- }
-
- if (key->eth_src) {
- if ((strcmp(key->eth_src, "01:00:00:00:00:00") == 0) &&
- mask->eth_src &&
- (strcmp(mask->eth_src, "01:00:00:00:00:00") == 0)) {
- monitor_printf(mon, " src <any mcast/bcast>");
- } else if ((strcmp(key->eth_src, "00:00:00:00:00:00") == 0) &&
- mask->eth_src &&
- (strcmp(mask->eth_src, "01:00:00:00:00:00") == 0)) {
- monitor_printf(mon, " src <any ucast>");
- } else {
- monitor_printf(mon, " src %s", key->eth_src);
- if (mask->eth_src) {
- monitor_printf(mon, "(%s)", mask->eth_src);
- }
- }
- }
-
- if (key->eth_dst) {
- if ((strcmp(key->eth_dst, "01:00:00:00:00:00") == 0) &&
- mask->eth_dst &&
- (strcmp(mask->eth_dst, "01:00:00:00:00:00") == 0)) {
- monitor_printf(mon, " dst <any mcast/bcast>");
- } else if ((strcmp(key->eth_dst, "00:00:00:00:00:00") == 0) &&
- mask->eth_dst &&
- (strcmp(mask->eth_dst, "01:00:00:00:00:00") == 0)) {
- monitor_printf(mon, " dst <any ucast>");
- } else {
- monitor_printf(mon, " dst %s", key->eth_dst);
- if (mask->eth_dst) {
- monitor_printf(mon, "(%s)", mask->eth_dst);
- }
- }
- }
-
- if (key->has_ip_proto) {
- monitor_printf(mon, " proto %d", key->ip_proto);
- if (mask->has_ip_proto) {
- monitor_printf(mon, "(0x%x)", mask->ip_proto);
- }
- }
-
- if (key->has_ip_tos) {
- monitor_printf(mon, " TOS %d", key->ip_tos);
- if (mask->has_ip_tos) {
- monitor_printf(mon, "(0x%x)", mask->ip_tos);
- }
- }
-
- if (key->ip_dst) {
- monitor_printf(mon, " dst %s", key->ip_dst);
- }
-
- if (action->has_goto_tbl || action->has_group_id ||
- action->has_new_vlan_id) {
- monitor_printf(mon, " -->");
- }
-
- if (action->has_new_vlan_id) {
- monitor_printf(mon, " apply new vlan %d",
- ntohs(action->new_vlan_id));
- }
-
- if (action->has_group_id) {
- monitor_printf(mon, " write group 0x%08x", action->group_id);
- }
-
- if (action->has_goto_tbl) {
- monitor_printf(mon, " goto tbl %d", action->goto_tbl);
- }
-
- monitor_printf(mon, "\n");
- }
-
- qapi_free_RockerOfDpaFlowList(list);
-}
-
-void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict *qdict)
-{
- RockerOfDpaGroupList *list, *g;
- const char *name = qdict_get_str(qdict, "name");
- uint8_t type = qdict_get_try_int(qdict, "type", 9);
- Error *err = NULL;
-
- list = qmp_query_rocker_of_dpa_groups(name, type != 9, type, &err);
- if (hmp_handle_error(mon, err)) {
- return;
- }
-
- monitor_printf(mon, "id (decode) --> buckets\n");
-
- for (g = list; g; g = g->next) {
- RockerOfDpaGroup *group = g->value;
- bool set = false;
-
- monitor_printf(mon, "0x%08x", group->id);
-
- monitor_printf(mon, " (type %s", group->type == 0 ? "L2 interface" :
- group->type == 1 ? "L2 rewrite" :
- group->type == 2 ? "L3 unicast" :
- group->type == 3 ? "L2 multicast" :
- group->type == 4 ? "L2 flood" :
- group->type == 5 ? "L3 interface" :
- group->type == 6 ? "L3 multicast" :
- group->type == 7 ? "L3 ECMP" :
- group->type == 8 ? "L2 overlay" :
- "unknown");
-
- if (group->has_vlan_id) {
- monitor_printf(mon, " vlan %d", group->vlan_id);
- }
-
- if (group->has_pport) {
- monitor_printf(mon, " pport %d", group->pport);
- }
-
- if (group->has_index) {
- monitor_printf(mon, " index %d", group->index);
- }
-
- monitor_printf(mon, ") -->");
-
- if (group->has_set_vlan_id && group->set_vlan_id) {
- set = true;
- monitor_printf(mon, " set vlan %d",
- group->set_vlan_id & VLAN_VID_MASK);
- }
-
- if (group->set_eth_src) {
- if (!set) {
- set = true;
- monitor_printf(mon, " set");
- }
- monitor_printf(mon, " src %s", group->set_eth_src);
- }
-
- if (group->set_eth_dst) {
- if (!set) {
- monitor_printf(mon, " set");
- }
- monitor_printf(mon, " dst %s", group->set_eth_dst);
- }
-
- if (group->has_ttl_check && group->ttl_check) {
- monitor_printf(mon, " check TTL");
- }
-
- if (group->has_group_id && group->group_id) {
- monitor_printf(mon, " group id 0x%08x", group->group_id);
- }
-
- if (group->has_pop_vlan && group->pop_vlan) {
- monitor_printf(mon, " pop vlan");
- }
-
- if (group->has_out_pport) {
- monitor_printf(mon, " out pport %d", group->out_pport);
- }
-
- if (group->has_group_ids) {
- struct uint32List *id;
-
- monitor_printf(mon, " groups [");
- for (id = group->group_ids; id; id = id->next) {
- monitor_printf(mon, "0x%08x", id->value);
- if (id->next) {
- monitor_printf(mon, ",");
- }
- }
- monitor_printf(mon, "]");
- }
-
- monitor_printf(mon, "\n");
- }
-
- qapi_free_RockerOfDpaGroupList(list);
-}
-
static void print_stats_schema_value(Monitor *mon, StatsSchemaValue *value)
{
const char *unit = NULL;
diff --git a/hw/net/meson.build b/hw/net/meson.build
index ebac261542..4285145715 100644
--- a/hw/net/meson.build
+++ b/hw/net/meson.build
@@ -68,5 +68,6 @@ softmmu_ss.add(when: 'CONFIG_ROCKER', if_true: files(
'rocker/rocker_world.c',
), if_false: files('rocker/qmp-norocker.c'))
softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('rocker/qmp-norocker.c'))
+softmmu_ss.add(files('rocker/rocker-hmp-cmds.c'))
subdir('can')
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 14/32] hmp: Rewrite strlist_from_comma_list() as hmp_split_at_comma()
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (12 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 13/32] rocker: Move HMP commands from monitor to hw/net/rocker/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 15/32] net: Move HMP commands from monitor to net/ Markus Armbruster
` (17 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
Use g_strsplit() for the actual splitting. Give external linkage, so
the next commit can move one of its users to another source file.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/monitor/hmp.h | 1 +
monitor/hmp-cmds.c | 27 ++++++++++-----------------
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index 6fafa7ffb4..d60d1305b8 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -19,6 +19,7 @@
bool hmp_handle_error(Monitor *mon, Error *err);
void hmp_help_cmd(Monitor *mon, const char *name);
+strList *hmp_split_at_comma(const char *str);
void hmp_info_name(Monitor *mon, const QDict *qdict);
void hmp_info_version(Monitor *mon, const QDict *qdict);
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index edb50da1ff..2ca869c2ee 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -54,28 +54,21 @@ bool hmp_handle_error(Monitor *mon, Error *err)
}
/*
- * Produce a strList from a comma separated list.
- * A NULL or empty input string return NULL.
+ * Split @str at comma.
+ * A null @str defaults to "".
*/
-static strList *strList_from_comma_list(const char *in)
+strList *hmp_split_at_comma(const char *str)
{
+ char **split = g_strsplit(str ?: "", ",", -1);
strList *res = NULL;
strList **tail = &res;
+ int i;
- while (in && in[0]) {
- char *comma = strchr(in, ',');
- char *value;
-
- if (comma) {
- value = g_strndup(in, comma - in);
- in = comma + 1; /* skip the , */
- } else {
- value = g_strdup(in);
- in = NULL;
- }
- QAPI_LIST_APPEND(tail, value);
+ for (i = 0; split[i]; i++) {
+ QAPI_LIST_APPEND(tail, split[i]);
}
+ g_free(split);
return res;
}
@@ -632,7 +625,7 @@ void hmp_announce_self(Monitor *mon, const QDict *qdict)
migrate_announce_params());
qapi_free_strList(params->interfaces);
- params->interfaces = strList_from_comma_list(interfaces_str);
+ params->interfaces = hmp_split_at_comma(interfaces_str);
params->has_interfaces = params->interfaces != NULL;
params->id = g_strdup(id);
qmp_announce_self(params, NULL);
@@ -1234,7 +1227,7 @@ static StatsFilter *stats_filter(StatsTarget target, const char *names,
request->provider = provider_idx;
if (names && !g_str_equal(names, "*")) {
request->has_names = true;
- request->names = strList_from_comma_list(names);
+ request->names = hmp_split_at_comma(names);
}
QAPI_LIST_PREPEND(request_list, request);
}
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 15/32] net: Move HMP commands from monitor to net/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (13 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 14/32] hmp: Rewrite strlist_from_comma_list() as hmp_split_at_comma() Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 16/32] net: Move hmp_info_network() to net-hmp-cmds.c Markus Armbruster
` (16 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS sections "Human
Monitor (HMP)" and "QMP" to "Network device backends".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor/hmp-cmds.c | 61 -------------------
monitor/misc.c | 56 ------------------
net/net-hmp-cmds.c | 142 +++++++++++++++++++++++++++++++++++++++++++++
net/meson.build | 1 +
4 files changed, 143 insertions(+), 117 deletions(-)
create mode 100644 net/net-hmp-cmds.c
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 2ca869c2ee..90259d02d7 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -21,17 +21,14 @@
#include "qemu/help_option.h"
#include "monitor/monitor.h"
#include "qapi/error.h"
-#include "qapi/clone-visitor.h"
#include "qapi/qapi-builtin-visit.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qapi-commands-net.h"
#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-stats.h"
#include "qapi/qapi-commands-tpm.h"
#include "qapi/qapi-commands-virtio.h"
-#include "qapi/qapi-visit-net.h"
#include "qapi/qapi-visit-migration.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
@@ -575,16 +572,6 @@ void hmp_cont(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
-void hmp_set_link(Monitor *mon, const QDict *qdict)
-{
- const char *name = qdict_get_str(qdict, "name");
- bool up = qdict_get_bool(qdict, "up");
- Error *err = NULL;
-
- qmp_set_link(name, up, &err);
- hmp_handle_error(mon, err);
-}
-
void hmp_loadvm(Monitor *mon, const QDict *qdict)
{
int saved_vm_running = runstate_is_running();
@@ -617,21 +604,6 @@ void hmp_delvm(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
-void hmp_announce_self(Monitor *mon, const QDict *qdict)
-{
- const char *interfaces_str = qdict_get_try_str(qdict, "interfaces");
- const char *id = qdict_get_try_str(qdict, "id");
- AnnounceParameters *params = QAPI_CLONE(AnnounceParameters,
- migrate_announce_params());
-
- qapi_free_strList(params->interfaces);
- params->interfaces = hmp_split_at_comma(interfaces_str);
- params->has_interfaces = params->interfaces != NULL;
- params->id = g_strdup(id);
- qmp_announce_self(params, NULL);
- qapi_free_AnnounceParameters(params);
-}
-
void hmp_migrate_cancel(Monitor *mon, const QDict *qdict)
{
qmp_migrate_cancel(NULL);
@@ -996,39 +968,6 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
}
}
-void hmp_netdev_add(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- QemuOpts *opts;
- const char *type = qdict_get_try_str(qdict, "type");
-
- if (type && is_help_option(type)) {
- show_netdevs();
- return;
- }
- opts = qemu_opts_from_qdict(qemu_find_opts("netdev"), qdict, &err);
- if (err) {
- goto out;
- }
-
- netdev_add(opts, &err);
- if (err) {
- qemu_opts_del(opts);
- }
-
-out:
- hmp_handle_error(mon, err);
-}
-
-void hmp_netdev_del(Monitor *mon, const QDict *qdict)
-{
- const char *id = qdict_get_str(qdict, "id");
- Error *err = NULL;
-
- qmp_netdev_del(id, &err);
- hmp_handle_error(mon, err);
-}
-
void hmp_getfd(Monitor *mon, const QDict *qdict)
{
const char *fdname = qdict_get_str(qdict, "fdname");
diff --git a/monitor/misc.c b/monitor/misc.c
index 0cf2518ce1..bf3d863227 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -1268,21 +1268,6 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const char *name)
return ret;
}
-void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- size_t len;
- int i;
-
- if (nb_args != 2) {
- return;
- }
- len = strlen(str);
- readline_set_completion_index(rs, len);
- for (i = 0; i < NET_CLIENT_DRIVER__MAX; i++) {
- readline_add_completion_of(rs, str, NetClientDriver_str(i));
- }
-}
-
void device_add_completion(ReadLineState *rs, int nb_args, const char *str)
{
GSList *list, *elt;
@@ -1365,47 +1350,6 @@ void device_del_completion(ReadLineState *rs, int nb_args, const char *str)
peripheral_device_del_completion(rs, str);
}
-void set_link_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- size_t len;
-
- len = strlen(str);
- readline_set_completion_index(rs, len);
- if (nb_args == 2) {
- NetClientState *ncs[MAX_QUEUE_NUM];
- int count, i;
- count = qemu_find_net_clients_except(NULL, ncs,
- NET_CLIENT_DRIVER_NONE,
- MAX_QUEUE_NUM);
- for (i = 0; i < MIN(count, MAX_QUEUE_NUM); i++) {
- readline_add_completion_of(rs, str, ncs[i]->name);
- }
- } else if (nb_args == 3) {
- readline_add_completion_of(rs, str, "on");
- readline_add_completion_of(rs, str, "off");
- }
-}
-
-void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- int len, count, i;
- NetClientState *ncs[MAX_QUEUE_NUM];
-
- if (nb_args != 2) {
- return;
- }
-
- len = strlen(str);
- readline_set_completion_index(rs, len);
- count = qemu_find_net_clients_except(NULL, ncs, NET_CLIENT_DRIVER_NIC,
- MAX_QUEUE_NUM);
- for (i = 0; i < MIN(count, MAX_QUEUE_NUM); i++) {
- if (ncs[i]->is_netdev) {
- readline_add_completion_of(rs, str, ncs[i]->name);
- }
- }
-}
-
void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str)
{
int i;
diff --git a/net/net-hmp-cmds.c b/net/net-hmp-cmds.c
new file mode 100644
index 0000000000..d7427ea4f8
--- /dev/null
+++ b/net/net-hmp-cmds.c
@@ -0,0 +1,142 @@
+/*
+ * Human Monitor Interface commands
+ *
+ * Copyright IBM, Corp. 2011
+ *
+ * Authors:
+ * Anthony Liguori <aliguori@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
+ */
+
+#include "qemu/osdep.h"
+#include "migration/misc.h"
+#include "monitor/hmp.h"
+#include "net/net.h"
+#include "qapi/clone-visitor.h"
+#include "qapi/qapi-commands-net.h"
+#include "qapi/qapi-visit-net.h"
+#include "qapi/qmp/qdict.h"
+#include "qemu/config-file.h"
+#include "qemu/help_option.h"
+#include "qemu/option.h"
+
+void hmp_set_link(Monitor *mon, const QDict *qdict)
+{
+ const char *name = qdict_get_str(qdict, "name");
+ bool up = qdict_get_bool(qdict, "up");
+ Error *err = NULL;
+
+ qmp_set_link(name, up, &err);
+ hmp_handle_error(mon, err);
+}
+
+
+void hmp_announce_self(Monitor *mon, const QDict *qdict)
+{
+ const char *interfaces_str = qdict_get_try_str(qdict, "interfaces");
+ const char *id = qdict_get_try_str(qdict, "id");
+ AnnounceParameters *params = QAPI_CLONE(AnnounceParameters,
+ migrate_announce_params());
+
+ qapi_free_strList(params->interfaces);
+ params->interfaces = hmp_split_at_comma(interfaces_str);
+ params->has_interfaces = params->interfaces != NULL;
+ params->id = g_strdup(id);
+ qmp_announce_self(params, NULL);
+ qapi_free_AnnounceParameters(params);
+}
+
+void hmp_netdev_add(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ QemuOpts *opts;
+ const char *type = qdict_get_try_str(qdict, "type");
+
+ if (type && is_help_option(type)) {
+ show_netdevs();
+ return;
+ }
+ opts = qemu_opts_from_qdict(qemu_find_opts("netdev"), qdict, &err);
+ if (err) {
+ goto out;
+ }
+
+ netdev_add(opts, &err);
+ if (err) {
+ qemu_opts_del(opts);
+ }
+
+out:
+ hmp_handle_error(mon, err);
+}
+
+void hmp_netdev_del(Monitor *mon, const QDict *qdict)
+{
+ const char *id = qdict_get_str(qdict, "id");
+ Error *err = NULL;
+
+ qmp_netdev_del(id, &err);
+ hmp_handle_error(mon, err);
+}
+
+
+void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ size_t len;
+ int i;
+
+ if (nb_args != 2) {
+ return;
+ }
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+ for (i = 0; i < NET_CLIENT_DRIVER__MAX; i++) {
+ readline_add_completion_of(rs, str, NetClientDriver_str(i));
+ }
+}
+
+void set_link_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ size_t len;
+
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+ if (nb_args == 2) {
+ NetClientState *ncs[MAX_QUEUE_NUM];
+ int count, i;
+ count = qemu_find_net_clients_except(NULL, ncs,
+ NET_CLIENT_DRIVER_NONE,
+ MAX_QUEUE_NUM);
+ for (i = 0; i < MIN(count, MAX_QUEUE_NUM); i++) {
+ readline_add_completion_of(rs, str, ncs[i]->name);
+ }
+ } else if (nb_args == 3) {
+ readline_add_completion_of(rs, str, "on");
+ readline_add_completion_of(rs, str, "off");
+ }
+}
+
+void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ int len, count, i;
+ NetClientState *ncs[MAX_QUEUE_NUM];
+
+ if (nb_args != 2) {
+ return;
+ }
+
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+ count = qemu_find_net_clients_except(NULL, ncs, NET_CLIENT_DRIVER_NIC,
+ MAX_QUEUE_NUM);
+ for (i = 0; i < MIN(count, MAX_QUEUE_NUM); i++) {
+ if (ncs[i]->is_netdev) {
+ readline_add_completion_of(rs, str, ncs[i]->name);
+ }
+ }
+}
diff --git a/net/meson.build b/net/meson.build
index 6cd1e3dab3..87afca3e93 100644
--- a/net/meson.build
+++ b/net/meson.build
@@ -10,6 +10,7 @@ softmmu_ss.add(files(
'filter-rewriter.c',
'filter.c',
'hub.c',
+ 'net-hmp-cmds.c',
'net.c',
'queue.c',
'socket.c',
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 16/32] net: Move hmp_info_network() to net-hmp-cmds.c
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (14 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 15/32] net: Move HMP commands from monitor to net/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 17/32] migration: Move HMP commands from monitor/ to migration/ Markus Armbruster
` (15 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/monitor/hmp.h | 1 +
include/net/net.h | 4 +++-
monitor/hmp-cmds.c | 1 -
monitor/misc.c | 1 -
net/net-hmp-cmds.c | 28 ++++++++++++++++++++++++++++
net/net.c | 28 +---------------------------
6 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index d60d1305b8..a248ee9ed1 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -56,6 +56,7 @@ void hmp_ringbuf_read(Monitor *mon, const QDict *qdict);
void hmp_cont(Monitor *mon, const QDict *qdict);
void hmp_system_wakeup(Monitor *mon, const QDict *qdict);
void hmp_nmi(Monitor *mon, const QDict *qdict);
+void hmp_info_network(Monitor *mon, const QDict *qdict);
void hmp_set_link(Monitor *mon, const QDict *qdict);
void hmp_balloon(Monitor *mon, const QDict *qdict);
void hmp_loadvm(Monitor *mon, const QDict *qdict);
diff --git a/include/net/net.h b/include/net/net.h
index dc20b31e9f..fad589cc1d 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -115,6 +115,8 @@ struct NetClientState {
QTAILQ_HEAD(, NetFilterState) filters;
};
+typedef QTAILQ_HEAD(NetClientStateList, NetClientState) NetClientStateList;
+
typedef struct NICState {
NetClientState *ncs;
NICConf *conf;
@@ -196,7 +198,6 @@ int qemu_find_nic_model(NICInfo *nd, const char * const *models,
const char *default_model);
void print_net_client(Monitor *mon, NetClientState *nc);
-void hmp_info_network(Monitor *mon, const QDict *qdict);
void net_socket_rs_init(SocketReadState *rs,
SocketReadStateFinalize *finalize,
bool vnet_hdr);
@@ -222,6 +223,7 @@ extern NICInfo nd_table[MAX_NICS];
extern const char *host_net_devices[];
/* from net.c */
+extern NetClientStateList net_clients;
bool netdev_is_modern(const char *optarg);
void netdev_parse_modern(const char *optarg);
void net_client_parse(QemuOptsList *opts_list, const char *str);
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 90259d02d7..b059af7abd 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -15,7 +15,6 @@
#include "qemu/osdep.h"
#include "monitor/hmp.h"
-#include "net/net.h"
#include "sysemu/runstate.h"
#include "qemu/sockets.h"
#include "qemu/help_option.h"
diff --git a/monitor/misc.c b/monitor/misc.c
index bf3d863227..77a76b2b5f 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -26,7 +26,6 @@
#include "monitor-internal.h"
#include "monitor/qdev.h"
#include "exec/gdbstub.h"
-#include "net/net.h"
#include "net/slirp.h"
#include "ui/qemu-spice.h"
#include "qemu/ctype.h"
diff --git a/net/net-hmp-cmds.c b/net/net-hmp-cmds.c
index d7427ea4f8..41d326bf5f 100644
--- a/net/net-hmp-cmds.c
+++ b/net/net-hmp-cmds.c
@@ -16,7 +16,9 @@
#include "qemu/osdep.h"
#include "migration/misc.h"
#include "monitor/hmp.h"
+#include "monitor/monitor.h"
#include "net/net.h"
+#include "net/hub.h"
#include "qapi/clone-visitor.h"
#include "qapi/qapi-commands-net.h"
#include "qapi/qapi-visit-net.h"
@@ -25,6 +27,32 @@
#include "qemu/help_option.h"
#include "qemu/option.h"
+void hmp_info_network(Monitor *mon, const QDict *qdict)
+{
+ NetClientState *nc, *peer;
+ NetClientDriver type;
+
+ net_hub_info(mon);
+
+ QTAILQ_FOREACH(nc, &net_clients, next) {
+ peer = nc->peer;
+ type = nc->info->type;
+
+ /* Skip if already printed in hub info */
+ if (net_hub_id_for_client(nc, NULL) == 0) {
+ continue;
+ }
+
+ if (!peer || type == NET_CLIENT_DRIVER_NIC) {
+ print_net_client(mon, nc);
+ } /* else it's a netdev connected to a NIC, printed with the NIC */
+ if (peer && type == NET_CLIENT_DRIVER_NIC) {
+ monitor_printf(mon, " \\ ");
+ print_net_client(mon, peer);
+ }
+ }
+}
+
void hmp_set_link(Monitor *mon, const QDict *qdict)
{
const char *name = qdict_get_str(qdict, "name");
diff --git a/net/net.c b/net/net.c
index 2d01472998..251fc5ab55 100644
--- a/net/net.c
+++ b/net/net.c
@@ -63,7 +63,7 @@
#endif
static VMChangeStateEntry *net_change_state_entry;
-static QTAILQ_HEAD(, NetClientState) net_clients;
+NetClientStateList net_clients;
typedef struct NetdevQueueEntry {
Netdev *nd;
@@ -1345,32 +1345,6 @@ RxFilterInfoList *qmp_query_rx_filter(const char *name, Error **errp)
return filter_list;
}
-void hmp_info_network(Monitor *mon, const QDict *qdict)
-{
- NetClientState *nc, *peer;
- NetClientDriver type;
-
- net_hub_info(mon);
-
- QTAILQ_FOREACH(nc, &net_clients, next) {
- peer = nc->peer;
- type = nc->info->type;
-
- /* Skip if already printed in hub info */
- if (net_hub_id_for_client(nc, NULL) == 0) {
- continue;
- }
-
- if (!peer || type == NET_CLIENT_DRIVER_NIC) {
- print_net_client(mon, nc);
- } /* else it's a netdev connected to a NIC, printed with the NIC */
- if (peer && type == NET_CLIENT_DRIVER_NIC) {
- monitor_printf(mon, " \\ ");
- print_net_client(mon, peer);
- }
- }
-}
-
void colo_notify_filters_event(int event, Error **errp)
{
NetClientState *nc;
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 17/32] migration: Move HMP commands from monitor/ to migration/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (15 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 16/32] net: Move hmp_info_network() to net-hmp-cmds.c Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-02-01 20:46 ` Juan Quintela
2023-01-24 12:19 ` [PATCH 18/32] migration: Move the QMP command " Markus Armbruster
` (14 subsequent siblings)
31 siblings, 1 reply; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS sections "Human
Monitor (HMP)" and "QMP" to "Migration".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
migration/migration-hmp-cmds.c | 807 +++++++++++++++++++++++++++++++++
monitor/hmp-cmds.c | 703 ----------------------------
monitor/misc.c | 82 ----
migration/meson.build | 1 +
4 files changed, 808 insertions(+), 785 deletions(-)
create mode 100644 migration/migration-hmp-cmds.c
diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
new file mode 100644
index 0000000000..ef25bc8929
--- /dev/null
+++ b/migration/migration-hmp-cmds.c
@@ -0,0 +1,807 @@
+/*
+ * HMP commands related to migration
+ *
+ * Copyright IBM, Corp. 2011
+ *
+ * Authors:
+ * Anthony Liguori <aliguori@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
+ */
+
+#include "qemu/osdep.h"
+#include "block/qapi.h"
+#include "migration/misc.h"
+#include "migration/snapshot.h"
+#include "monitor/hmp.h"
+#include "monitor/monitor.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-migration.h"
+#include "qapi/qapi-visit-migration.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/string-input-visitor.h"
+#include "qapi/string-output-visitor.h"
+#include "qemu/cutils.h"
+#include "qemu/error-report.h"
+#include "qemu/sockets.h"
+#include "sysemu/runstate.h"
+#include "ui/qemu-spice.h"
+
+void hmp_info_migrate(Monitor *mon, const QDict *qdict)
+{
+ MigrationInfo *info;
+
+ info = qmp_query_migrate(NULL);
+
+ migration_global_dump(mon);
+
+ if (info->blocked_reasons) {
+ strList *reasons = info->blocked_reasons;
+ monitor_printf(mon, "Outgoing migration blocked:\n");
+ while (reasons) {
+ monitor_printf(mon, " %s\n", reasons->value);
+ reasons = reasons->next;
+ }
+ }
+
+ if (info->has_status) {
+ monitor_printf(mon, "Migration status: %s",
+ MigrationStatus_str(info->status));
+ if (info->status == MIGRATION_STATUS_FAILED && info->error_desc) {
+ monitor_printf(mon, " (%s)\n", info->error_desc);
+ } else {
+ monitor_printf(mon, "\n");
+ }
+
+ monitor_printf(mon, "total time: %" PRIu64 " ms\n",
+ info->total_time);
+ if (info->has_expected_downtime) {
+ monitor_printf(mon, "expected downtime: %" PRIu64 " ms\n",
+ info->expected_downtime);
+ }
+ if (info->has_downtime) {
+ monitor_printf(mon, "downtime: %" PRIu64 " ms\n",
+ info->downtime);
+ }
+ if (info->has_setup_time) {
+ monitor_printf(mon, "setup: %" PRIu64 " ms\n",
+ info->setup_time);
+ }
+ }
+
+ if (info->ram) {
+ monitor_printf(mon, "transferred ram: %" PRIu64 " kbytes\n",
+ info->ram->transferred >> 10);
+ monitor_printf(mon, "throughput: %0.2f mbps\n",
+ info->ram->mbps);
+ monitor_printf(mon, "remaining ram: %" PRIu64 " kbytes\n",
+ info->ram->remaining >> 10);
+ monitor_printf(mon, "total ram: %" PRIu64 " kbytes\n",
+ info->ram->total >> 10);
+ monitor_printf(mon, "duplicate: %" PRIu64 " pages\n",
+ info->ram->duplicate);
+ monitor_printf(mon, "skipped: %" PRIu64 " pages\n",
+ info->ram->skipped);
+ monitor_printf(mon, "normal: %" PRIu64 " pages\n",
+ info->ram->normal);
+ monitor_printf(mon, "normal bytes: %" PRIu64 " kbytes\n",
+ info->ram->normal_bytes >> 10);
+ monitor_printf(mon, "dirty sync count: %" PRIu64 "\n",
+ info->ram->dirty_sync_count);
+ monitor_printf(mon, "page size: %" PRIu64 " kbytes\n",
+ info->ram->page_size >> 10);
+ monitor_printf(mon, "multifd bytes: %" PRIu64 " kbytes\n",
+ info->ram->multifd_bytes >> 10);
+ monitor_printf(mon, "pages-per-second: %" PRIu64 "\n",
+ info->ram->pages_per_second);
+
+ if (info->ram->dirty_pages_rate) {
+ monitor_printf(mon, "dirty pages rate: %" PRIu64 " pages\n",
+ info->ram->dirty_pages_rate);
+ }
+ if (info->ram->postcopy_requests) {
+ monitor_printf(mon, "postcopy request count: %" PRIu64 "\n",
+ info->ram->postcopy_requests);
+ }
+ if (info->ram->precopy_bytes) {
+ monitor_printf(mon, "precopy ram: %" PRIu64 " kbytes\n",
+ info->ram->precopy_bytes >> 10);
+ }
+ if (info->ram->downtime_bytes) {
+ monitor_printf(mon, "downtime ram: %" PRIu64 " kbytes\n",
+ info->ram->downtime_bytes >> 10);
+ }
+ if (info->ram->postcopy_bytes) {
+ monitor_printf(mon, "postcopy ram: %" PRIu64 " kbytes\n",
+ info->ram->postcopy_bytes >> 10);
+ }
+ if (info->ram->dirty_sync_missed_zero_copy) {
+ monitor_printf(mon,
+ "Zero-copy-send fallbacks happened: %" PRIu64 " times\n",
+ info->ram->dirty_sync_missed_zero_copy);
+ }
+ }
+
+ if (info->disk) {
+ monitor_printf(mon, "transferred disk: %" PRIu64 " kbytes\n",
+ info->disk->transferred >> 10);
+ monitor_printf(mon, "remaining disk: %" PRIu64 " kbytes\n",
+ info->disk->remaining >> 10);
+ monitor_printf(mon, "total disk: %" PRIu64 " kbytes\n",
+ info->disk->total >> 10);
+ }
+
+ if (info->xbzrle_cache) {
+ monitor_printf(mon, "cache size: %" PRIu64 " bytes\n",
+ info->xbzrle_cache->cache_size);
+ monitor_printf(mon, "xbzrle transferred: %" PRIu64 " kbytes\n",
+ info->xbzrle_cache->bytes >> 10);
+ monitor_printf(mon, "xbzrle pages: %" PRIu64 " pages\n",
+ info->xbzrle_cache->pages);
+ monitor_printf(mon, "xbzrle cache miss: %" PRIu64 " pages\n",
+ info->xbzrle_cache->cache_miss);
+ monitor_printf(mon, "xbzrle cache miss rate: %0.2f\n",
+ info->xbzrle_cache->cache_miss_rate);
+ monitor_printf(mon, "xbzrle encoding rate: %0.2f\n",
+ info->xbzrle_cache->encoding_rate);
+ monitor_printf(mon, "xbzrle overflow: %" PRIu64 "\n",
+ info->xbzrle_cache->overflow);
+ }
+
+ if (info->compression) {
+ monitor_printf(mon, "compression pages: %" PRIu64 " pages\n",
+ info->compression->pages);
+ monitor_printf(mon, "compression busy: %" PRIu64 "\n",
+ info->compression->busy);
+ monitor_printf(mon, "compression busy rate: %0.2f\n",
+ info->compression->busy_rate);
+ monitor_printf(mon, "compressed size: %" PRIu64 " kbytes\n",
+ info->compression->compressed_size >> 10);
+ monitor_printf(mon, "compression rate: %0.2f\n",
+ info->compression->compression_rate);
+ }
+
+ if (info->has_cpu_throttle_percentage) {
+ monitor_printf(mon, "cpu throttle percentage: %" PRIu64 "\n",
+ info->cpu_throttle_percentage);
+ }
+
+ if (info->has_postcopy_blocktime) {
+ monitor_printf(mon, "postcopy blocktime: %u\n",
+ info->postcopy_blocktime);
+ }
+
+ if (info->has_postcopy_vcpu_blocktime) {
+ Visitor *v;
+ char *str;
+ v = string_output_visitor_new(false, &str);
+ visit_type_uint32List(v, NULL, &info->postcopy_vcpu_blocktime,
+ &error_abort);
+ visit_complete(v, &str);
+ monitor_printf(mon, "postcopy vcpu blocktime: %s\n", str);
+ g_free(str);
+ visit_free(v);
+ }
+ if (info->has_socket_address) {
+ SocketAddressList *addr;
+
+ monitor_printf(mon, "socket address: [\n");
+
+ for (addr = info->socket_address; addr; addr = addr->next) {
+ char *s = socket_uri(addr->value);
+ monitor_printf(mon, "\t%s\n", s);
+ g_free(s);
+ }
+ monitor_printf(mon, "]\n");
+ }
+
+ if (info->vfio) {
+ monitor_printf(mon, "vfio device transferred: %" PRIu64 " kbytes\n",
+ info->vfio->transferred >> 10);
+ }
+
+ qapi_free_MigrationInfo(info);
+}
+
+void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict)
+{
+ MigrationCapabilityStatusList *caps, *cap;
+
+ caps = qmp_query_migrate_capabilities(NULL);
+
+ if (caps) {
+ for (cap = caps; cap; cap = cap->next) {
+ monitor_printf(mon, "%s: %s\n",
+ MigrationCapability_str(cap->value->capability),
+ cap->value->state ? "on" : "off");
+ }
+ }
+
+ qapi_free_MigrationCapabilityStatusList(caps);
+}
+
+void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
+{
+ MigrationParameters *params;
+
+ params = qmp_query_migrate_parameters(NULL);
+
+ if (params) {
+ monitor_printf(mon, "%s: %" PRIu64 " ms\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_INITIAL),
+ params->announce_initial);
+ monitor_printf(mon, "%s: %" PRIu64 " ms\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_MAX),
+ params->announce_max);
+ monitor_printf(mon, "%s: %" PRIu64 "\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_ROUNDS),
+ params->announce_rounds);
+ monitor_printf(mon, "%s: %" PRIu64 " ms\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_STEP),
+ params->announce_step);
+ assert(params->has_compress_level);
+ monitor_printf(mon, "%s: %u\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_COMPRESS_LEVEL),
+ params->compress_level);
+ assert(params->has_compress_threads);
+ monitor_printf(mon, "%s: %u\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_COMPRESS_THREADS),
+ params->compress_threads);
+ assert(params->has_compress_wait_thread);
+ monitor_printf(mon, "%s: %s\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_COMPRESS_WAIT_THREAD),
+ params->compress_wait_thread ? "on" : "off");
+ assert(params->has_decompress_threads);
+ monitor_printf(mon, "%s: %u\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_DECOMPRESS_THREADS),
+ params->decompress_threads);
+ assert(params->has_throttle_trigger_threshold);
+ monitor_printf(mon, "%s: %u\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_THROTTLE_TRIGGER_THRESHOLD),
+ params->throttle_trigger_threshold);
+ assert(params->has_cpu_throttle_initial);
+ monitor_printf(mon, "%s: %u\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL),
+ params->cpu_throttle_initial);
+ assert(params->has_cpu_throttle_increment);
+ monitor_printf(mon, "%s: %u\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT),
+ params->cpu_throttle_increment);
+ assert(params->has_cpu_throttle_tailslow);
+ monitor_printf(mon, "%s: %s\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_CPU_THROTTLE_TAILSLOW),
+ params->cpu_throttle_tailslow ? "on" : "off");
+ assert(params->has_max_cpu_throttle);
+ monitor_printf(mon, "%s: %u\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_MAX_CPU_THROTTLE),
+ params->max_cpu_throttle);
+ assert(params->tls_creds);
+ monitor_printf(mon, "%s: '%s'\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_TLS_CREDS),
+ params->tls_creds);
+ assert(params->tls_hostname);
+ monitor_printf(mon, "%s: '%s'\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_TLS_HOSTNAME),
+ params->tls_hostname);
+ assert(params->has_max_bandwidth);
+ monitor_printf(mon, "%s: %" PRIu64 " bytes/second\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_MAX_BANDWIDTH),
+ params->max_bandwidth);
+ assert(params->has_downtime_limit);
+ monitor_printf(mon, "%s: %" PRIu64 " ms\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_DOWNTIME_LIMIT),
+ params->downtime_limit);
+ assert(params->has_x_checkpoint_delay);
+ monitor_printf(mon, "%s: %u ms\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_X_CHECKPOINT_DELAY),
+ params->x_checkpoint_delay);
+ assert(params->has_block_incremental);
+ monitor_printf(mon, "%s: %s\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_BLOCK_INCREMENTAL),
+ params->block_incremental ? "on" : "off");
+ monitor_printf(mon, "%s: %u\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_CHANNELS),
+ params->multifd_channels);
+ monitor_printf(mon, "%s: %s\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_COMPRESSION),
+ MultiFDCompression_str(params->multifd_compression));
+ monitor_printf(mon, "%s: %" PRIu64 " bytes\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE),
+ params->xbzrle_cache_size);
+ monitor_printf(mon, "%s: %" PRIu64 "\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_MAX_POSTCOPY_BANDWIDTH),
+ params->max_postcopy_bandwidth);
+ monitor_printf(mon, "%s: '%s'\n",
+ MigrationParameter_str(MIGRATION_PARAMETER_TLS_AUTHZ),
+ params->tls_authz);
+
+ if (params->has_block_bitmap_mapping) {
+ const BitmapMigrationNodeAliasList *bmnal;
+
+ monitor_printf(mon, "%s:\n",
+ MigrationParameter_str(
+ MIGRATION_PARAMETER_BLOCK_BITMAP_MAPPING));
+
+ for (bmnal = params->block_bitmap_mapping;
+ bmnal;
+ bmnal = bmnal->next)
+ {
+ const BitmapMigrationNodeAlias *bmna = bmnal->value;
+ const BitmapMigrationBitmapAliasList *bmbal;
+
+ monitor_printf(mon, " '%s' -> '%s'\n",
+ bmna->node_name, bmna->alias);
+
+ for (bmbal = bmna->bitmaps; bmbal; bmbal = bmbal->next) {
+ const BitmapMigrationBitmapAlias *bmba = bmbal->value;
+
+ monitor_printf(mon, " '%s' -> '%s'\n",
+ bmba->name, bmba->alias);
+ }
+ }
+ }
+ }
+
+ qapi_free_MigrationParameters(params);
+}
+
+void hmp_loadvm(Monitor *mon, const QDict *qdict)
+{
+ int saved_vm_running = runstate_is_running();
+ const char *name = qdict_get_str(qdict, "name");
+ Error *err = NULL;
+
+ vm_stop(RUN_STATE_RESTORE_VM);
+
+ if (load_snapshot(name, NULL, false, NULL, &err) && saved_vm_running) {
+ vm_start();
+ }
+ hmp_handle_error(mon, err);
+}
+
+void hmp_savevm(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+
+ save_snapshot(qdict_get_try_str(qdict, "name"),
+ true, NULL, false, NULL, &err);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_delvm(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ const char *name = qdict_get_str(qdict, "name");
+
+ delete_snapshot(name, false, NULL, &err);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_migrate_cancel(Monitor *mon, const QDict *qdict)
+{
+ qmp_migrate_cancel(NULL);
+}
+
+void hmp_migrate_continue(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ const char *state = qdict_get_str(qdict, "state");
+ int val = qapi_enum_parse(&MigrationStatus_lookup, state, -1, &err);
+
+ if (val >= 0) {
+ qmp_migrate_continue(val, &err);
+ }
+
+ hmp_handle_error(mon, err);
+}
+
+void hmp_migrate_incoming(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ const char *uri = qdict_get_str(qdict, "uri");
+
+ qmp_migrate_incoming(uri, &err);
+
+ hmp_handle_error(mon, err);
+}
+
+void hmp_migrate_recover(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ const char *uri = qdict_get_str(qdict, "uri");
+
+ qmp_migrate_recover(uri, &err);
+
+ hmp_handle_error(mon, err);
+}
+
+void hmp_migrate_pause(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+
+ qmp_migrate_pause(&err);
+
+ hmp_handle_error(mon, err);
+}
+
+
+void hmp_migrate_set_capability(Monitor *mon, const QDict *qdict)
+{
+ const char *cap = qdict_get_str(qdict, "capability");
+ bool state = qdict_get_bool(qdict, "state");
+ Error *err = NULL;
+ MigrationCapabilityStatusList *caps = NULL;
+ MigrationCapabilityStatus *value;
+ int val;
+
+ val = qapi_enum_parse(&MigrationCapability_lookup, cap, -1, &err);
+ if (val < 0) {
+ goto end;
+ }
+
+ value = g_malloc0(sizeof(*value));
+ value->capability = val;
+ value->state = state;
+ QAPI_LIST_PREPEND(caps, value);
+ qmp_migrate_set_capabilities(caps, &err);
+ qapi_free_MigrationCapabilityStatusList(caps);
+
+end:
+ hmp_handle_error(mon, err);
+}
+
+void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
+{
+ const char *param = qdict_get_str(qdict, "parameter");
+ const char *valuestr = qdict_get_str(qdict, "value");
+ Visitor *v = string_input_visitor_new(valuestr);
+ MigrateSetParameters *p = g_new0(MigrateSetParameters, 1);
+ uint64_t valuebw = 0;
+ uint64_t cache_size;
+ Error *err = NULL;
+ int val, ret;
+
+ val = qapi_enum_parse(&MigrationParameter_lookup, param, -1, &err);
+ if (val < 0) {
+ goto cleanup;
+ }
+
+ switch (val) {
+ case MIGRATION_PARAMETER_COMPRESS_LEVEL:
+ p->has_compress_level = true;
+ visit_type_uint8(v, param, &p->compress_level, &err);
+ break;
+ case MIGRATION_PARAMETER_COMPRESS_THREADS:
+ p->has_compress_threads = true;
+ visit_type_uint8(v, param, &p->compress_threads, &err);
+ break;
+ case MIGRATION_PARAMETER_COMPRESS_WAIT_THREAD:
+ p->has_compress_wait_thread = true;
+ visit_type_bool(v, param, &p->compress_wait_thread, &err);
+ break;
+ case MIGRATION_PARAMETER_DECOMPRESS_THREADS:
+ p->has_decompress_threads = true;
+ visit_type_uint8(v, param, &p->decompress_threads, &err);
+ break;
+ case MIGRATION_PARAMETER_THROTTLE_TRIGGER_THRESHOLD:
+ p->has_throttle_trigger_threshold = true;
+ visit_type_uint8(v, param, &p->throttle_trigger_threshold, &err);
+ break;
+ case MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL:
+ p->has_cpu_throttle_initial = true;
+ visit_type_uint8(v, param, &p->cpu_throttle_initial, &err);
+ break;
+ case MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT:
+ p->has_cpu_throttle_increment = true;
+ visit_type_uint8(v, param, &p->cpu_throttle_increment, &err);
+ break;
+ case MIGRATION_PARAMETER_CPU_THROTTLE_TAILSLOW:
+ p->has_cpu_throttle_tailslow = true;
+ visit_type_bool(v, param, &p->cpu_throttle_tailslow, &err);
+ break;
+ case MIGRATION_PARAMETER_MAX_CPU_THROTTLE:
+ p->has_max_cpu_throttle = true;
+ visit_type_uint8(v, param, &p->max_cpu_throttle, &err);
+ break;
+ case MIGRATION_PARAMETER_TLS_CREDS:
+ p->tls_creds = g_new0(StrOrNull, 1);
+ p->tls_creds->type = QTYPE_QSTRING;
+ visit_type_str(v, param, &p->tls_creds->u.s, &err);
+ break;
+ case MIGRATION_PARAMETER_TLS_HOSTNAME:
+ p->tls_hostname = g_new0(StrOrNull, 1);
+ p->tls_hostname->type = QTYPE_QSTRING;
+ visit_type_str(v, param, &p->tls_hostname->u.s, &err);
+ break;
+ case MIGRATION_PARAMETER_TLS_AUTHZ:
+ p->tls_authz = g_new0(StrOrNull, 1);
+ p->tls_authz->type = QTYPE_QSTRING;
+ visit_type_str(v, param, &p->tls_authz->u.s, &err);
+ break;
+ case MIGRATION_PARAMETER_MAX_BANDWIDTH:
+ p->has_max_bandwidth = true;
+ /*
+ * Can't use visit_type_size() here, because it
+ * defaults to Bytes rather than Mebibytes.
+ */
+ ret = qemu_strtosz_MiB(valuestr, NULL, &valuebw);
+ if (ret < 0 || valuebw > INT64_MAX
+ || (size_t)valuebw != valuebw) {
+ error_setg(&err, "Invalid size %s", valuestr);
+ break;
+ }
+ p->max_bandwidth = valuebw;
+ break;
+ case MIGRATION_PARAMETER_DOWNTIME_LIMIT:
+ p->has_downtime_limit = true;
+ visit_type_size(v, param, &p->downtime_limit, &err);
+ break;
+ case MIGRATION_PARAMETER_X_CHECKPOINT_DELAY:
+ p->has_x_checkpoint_delay = true;
+ visit_type_uint32(v, param, &p->x_checkpoint_delay, &err);
+ break;
+ case MIGRATION_PARAMETER_BLOCK_INCREMENTAL:
+ p->has_block_incremental = true;
+ visit_type_bool(v, param, &p->block_incremental, &err);
+ break;
+ case MIGRATION_PARAMETER_MULTIFD_CHANNELS:
+ p->has_multifd_channels = true;
+ visit_type_uint8(v, param, &p->multifd_channels, &err);
+ break;
+ case MIGRATION_PARAMETER_MULTIFD_COMPRESSION:
+ p->has_multifd_compression = true;
+ visit_type_MultiFDCompression(v, param, &p->multifd_compression,
+ &err);
+ break;
+ case MIGRATION_PARAMETER_MULTIFD_ZLIB_LEVEL:
+ p->has_multifd_zlib_level = true;
+ visit_type_uint8(v, param, &p->multifd_zlib_level, &err);
+ break;
+ case MIGRATION_PARAMETER_MULTIFD_ZSTD_LEVEL:
+ p->has_multifd_zstd_level = true;
+ visit_type_uint8(v, param, &p->multifd_zstd_level, &err);
+ break;
+ case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE:
+ p->has_xbzrle_cache_size = true;
+ if (!visit_type_size(v, param, &cache_size, &err)) {
+ break;
+ }
+ if (cache_size > INT64_MAX || (size_t)cache_size != cache_size) {
+ error_setg(&err, "Invalid size %s", valuestr);
+ break;
+ }
+ p->xbzrle_cache_size = cache_size;
+ break;
+ case MIGRATION_PARAMETER_MAX_POSTCOPY_BANDWIDTH:
+ p->has_max_postcopy_bandwidth = true;
+ visit_type_size(v, param, &p->max_postcopy_bandwidth, &err);
+ break;
+ case MIGRATION_PARAMETER_ANNOUNCE_INITIAL:
+ p->has_announce_initial = true;
+ visit_type_size(v, param, &p->announce_initial, &err);
+ break;
+ case MIGRATION_PARAMETER_ANNOUNCE_MAX:
+ p->has_announce_max = true;
+ visit_type_size(v, param, &p->announce_max, &err);
+ break;
+ case MIGRATION_PARAMETER_ANNOUNCE_ROUNDS:
+ p->has_announce_rounds = true;
+ visit_type_size(v, param, &p->announce_rounds, &err);
+ break;
+ case MIGRATION_PARAMETER_ANNOUNCE_STEP:
+ p->has_announce_step = true;
+ visit_type_size(v, param, &p->announce_step, &err);
+ break;
+ case MIGRATION_PARAMETER_BLOCK_BITMAP_MAPPING:
+ error_setg(&err, "The block-bitmap-mapping parameter can only be set "
+ "through QMP");
+ break;
+ default:
+ assert(0);
+ }
+
+ if (err) {
+ goto cleanup;
+ }
+
+ qmp_migrate_set_parameters(p, &err);
+
+ cleanup:
+ qapi_free_MigrateSetParameters(p);
+ visit_free(v);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_client_migrate_info(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ const char *protocol = qdict_get_str(qdict, "protocol");
+ const char *hostname = qdict_get_str(qdict, "hostname");
+ bool has_port = qdict_haskey(qdict, "port");
+ int port = qdict_get_try_int(qdict, "port", -1);
+ bool has_tls_port = qdict_haskey(qdict, "tls-port");
+ int tls_port = qdict_get_try_int(qdict, "tls-port", -1);
+ const char *cert_subject = qdict_get_try_str(qdict, "cert-subject");
+
+ qmp_client_migrate_info(protocol, hostname,
+ has_port, port, has_tls_port, tls_port,
+ cert_subject, &err);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_migrate_start_postcopy(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ qmp_migrate_start_postcopy(&err);
+ hmp_handle_error(mon, err);
+}
+
+void hmp_x_colo_lost_heartbeat(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+
+ qmp_x_colo_lost_heartbeat(&err);
+ hmp_handle_error(mon, err);
+}
+
+typedef struct HMPMigrationStatus {
+ QEMUTimer *timer;
+ Monitor *mon;
+ bool is_block_migration;
+} HMPMigrationStatus;
+
+static void hmp_migrate_status_cb(void *opaque)
+{
+ HMPMigrationStatus *status = opaque;
+ MigrationInfo *info;
+
+ info = qmp_query_migrate(NULL);
+ if (!info->has_status || info->status == MIGRATION_STATUS_ACTIVE ||
+ info->status == MIGRATION_STATUS_SETUP) {
+ if (info->disk) {
+ int progress;
+
+ if (info->disk->remaining) {
+ progress = info->disk->transferred * 100 / info->disk->total;
+ } else {
+ progress = 100;
+ }
+
+ monitor_printf(status->mon, "Completed %d %%\r", progress);
+ monitor_flush(status->mon);
+ }
+
+ timer_mod(status->timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + 1000);
+ } else {
+ if (status->is_block_migration) {
+ monitor_printf(status->mon, "\n");
+ }
+ if (info->error_desc) {
+ error_report("%s", info->error_desc);
+ }
+ monitor_resume(status->mon);
+ timer_free(status->timer);
+ g_free(status);
+ }
+
+ qapi_free_MigrationInfo(info);
+}
+
+void hmp_migrate(Monitor *mon, const QDict *qdict)
+{
+ bool detach = qdict_get_try_bool(qdict, "detach", false);
+ bool blk = qdict_get_try_bool(qdict, "blk", false);
+ bool inc = qdict_get_try_bool(qdict, "inc", false);
+ bool resume = qdict_get_try_bool(qdict, "resume", false);
+ const char *uri = qdict_get_str(qdict, "uri");
+ Error *err = NULL;
+
+ qmp_migrate(uri, !!blk, blk, !!inc, inc,
+ false, false, true, resume, &err);
+ if (hmp_handle_error(mon, err)) {
+ return;
+ }
+
+ if (!detach) {
+ HMPMigrationStatus *status;
+
+ if (monitor_suspend(mon) < 0) {
+ monitor_printf(mon, "terminal does not allow synchronous "
+ "migration, continuing detached\n");
+ return;
+ }
+
+ status = g_malloc0(sizeof(*status));
+ status->mon = mon;
+ status->is_block_migration = blk || inc;
+ status->timer = timer_new_ms(QEMU_CLOCK_REALTIME, hmp_migrate_status_cb,
+ status);
+ timer_mod(status->timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME));
+ }
+}
+
+void migrate_set_capability_completion(ReadLineState *rs, int nb_args,
+ const char *str)
+{
+ size_t len;
+
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+ if (nb_args == 2) {
+ int i;
+ for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) {
+ readline_add_completion_of(rs, str, MigrationCapability_str(i));
+ }
+ } else if (nb_args == 3) {
+ readline_add_completion_of(rs, str, "on");
+ readline_add_completion_of(rs, str, "off");
+ }
+}
+
+void migrate_set_parameter_completion(ReadLineState *rs, int nb_args,
+ const char *str)
+{
+ size_t len;
+
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+ if (nb_args == 2) {
+ int i;
+ for (i = 0; i < MIGRATION_PARAMETER__MAX; i++) {
+ readline_add_completion_of(rs, str, MigrationParameter_str(i));
+ }
+ }
+}
+
+static void vm_completion(ReadLineState *rs, const char *str)
+{
+ size_t len;
+ BlockDriverState *bs;
+ BdrvNextIterator it;
+
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+
+ for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
+ SnapshotInfoList *snapshots, *snapshot;
+ AioContext *ctx = bdrv_get_aio_context(bs);
+ bool ok = false;
+
+ aio_context_acquire(ctx);
+ if (bdrv_can_snapshot(bs)) {
+ ok = bdrv_query_snapshot_info_list(bs, &snapshots, NULL) == 0;
+ }
+ aio_context_release(ctx);
+ if (!ok) {
+ continue;
+ }
+
+ snapshot = snapshots;
+ while (snapshot) {
+ readline_add_completion_of(rs, str, snapshot->value->name);
+ readline_add_completion_of(rs, str, snapshot->value->id);
+ snapshot = snapshot->next;
+ }
+ qapi_free_SnapshotInfoList(snapshots);
+ }
+
+}
+
+void delvm_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ if (nb_args == 2) {
+ vm_completion(rs, str);
+ }
+}
+
+void loadvm_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ if (nb_args == 2) {
+ vm_completion(rs, str);
+ }
+}
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index b059af7abd..4da6b7cccc 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -15,30 +15,20 @@
#include "qemu/osdep.h"
#include "monitor/hmp.h"
-#include "sysemu/runstate.h"
-#include "qemu/sockets.h"
#include "qemu/help_option.h"
#include "monitor/monitor.h"
#include "qapi/error.h"
-#include "qapi/qapi-builtin-visit.h"
#include "qapi/qapi-commands-control.h"
-#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-stats.h"
#include "qapi/qapi-commands-tpm.h"
#include "qapi/qapi-commands-virtio.h"
-#include "qapi/qapi-visit-migration.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
-#include "qapi/string-input-visitor.h"
-#include "qapi/string-output-visitor.h"
#include "qemu/cutils.h"
-#include "qemu/error-report.h"
#include "hw/core/cpu.h"
#include "hw/intc/intc.h"
-#include "migration/snapshot.h"
-#include "migration/misc.h"
bool hmp_handle_error(Monitor *mon, Error *err)
{
@@ -111,324 +101,6 @@ void hmp_info_status(Monitor *mon, const QDict *qdict)
qapi_free_StatusInfo(info);
}
-void hmp_info_migrate(Monitor *mon, const QDict *qdict)
-{
- MigrationInfo *info;
-
- info = qmp_query_migrate(NULL);
-
- migration_global_dump(mon);
-
- if (info->blocked_reasons) {
- strList *reasons = info->blocked_reasons;
- monitor_printf(mon, "Outgoing migration blocked:\n");
- while (reasons) {
- monitor_printf(mon, " %s\n", reasons->value);
- reasons = reasons->next;
- }
- }
-
- if (info->has_status) {
- monitor_printf(mon, "Migration status: %s",
- MigrationStatus_str(info->status));
- if (info->status == MIGRATION_STATUS_FAILED && info->error_desc) {
- monitor_printf(mon, " (%s)\n", info->error_desc);
- } else {
- monitor_printf(mon, "\n");
- }
-
- monitor_printf(mon, "total time: %" PRIu64 " ms\n",
- info->total_time);
- if (info->has_expected_downtime) {
- monitor_printf(mon, "expected downtime: %" PRIu64 " ms\n",
- info->expected_downtime);
- }
- if (info->has_downtime) {
- monitor_printf(mon, "downtime: %" PRIu64 " ms\n",
- info->downtime);
- }
- if (info->has_setup_time) {
- monitor_printf(mon, "setup: %" PRIu64 " ms\n",
- info->setup_time);
- }
- }
-
- if (info->ram) {
- monitor_printf(mon, "transferred ram: %" PRIu64 " kbytes\n",
- info->ram->transferred >> 10);
- monitor_printf(mon, "throughput: %0.2f mbps\n",
- info->ram->mbps);
- monitor_printf(mon, "remaining ram: %" PRIu64 " kbytes\n",
- info->ram->remaining >> 10);
- monitor_printf(mon, "total ram: %" PRIu64 " kbytes\n",
- info->ram->total >> 10);
- monitor_printf(mon, "duplicate: %" PRIu64 " pages\n",
- info->ram->duplicate);
- monitor_printf(mon, "skipped: %" PRIu64 " pages\n",
- info->ram->skipped);
- monitor_printf(mon, "normal: %" PRIu64 " pages\n",
- info->ram->normal);
- monitor_printf(mon, "normal bytes: %" PRIu64 " kbytes\n",
- info->ram->normal_bytes >> 10);
- monitor_printf(mon, "dirty sync count: %" PRIu64 "\n",
- info->ram->dirty_sync_count);
- monitor_printf(mon, "page size: %" PRIu64 " kbytes\n",
- info->ram->page_size >> 10);
- monitor_printf(mon, "multifd bytes: %" PRIu64 " kbytes\n",
- info->ram->multifd_bytes >> 10);
- monitor_printf(mon, "pages-per-second: %" PRIu64 "\n",
- info->ram->pages_per_second);
-
- if (info->ram->dirty_pages_rate) {
- monitor_printf(mon, "dirty pages rate: %" PRIu64 " pages\n",
- info->ram->dirty_pages_rate);
- }
- if (info->ram->postcopy_requests) {
- monitor_printf(mon, "postcopy request count: %" PRIu64 "\n",
- info->ram->postcopy_requests);
- }
- if (info->ram->precopy_bytes) {
- monitor_printf(mon, "precopy ram: %" PRIu64 " kbytes\n",
- info->ram->precopy_bytes >> 10);
- }
- if (info->ram->downtime_bytes) {
- monitor_printf(mon, "downtime ram: %" PRIu64 " kbytes\n",
- info->ram->downtime_bytes >> 10);
- }
- if (info->ram->postcopy_bytes) {
- monitor_printf(mon, "postcopy ram: %" PRIu64 " kbytes\n",
- info->ram->postcopy_bytes >> 10);
- }
- if (info->ram->dirty_sync_missed_zero_copy) {
- monitor_printf(mon,
- "Zero-copy-send fallbacks happened: %" PRIu64 " times\n",
- info->ram->dirty_sync_missed_zero_copy);
- }
- }
-
- if (info->disk) {
- monitor_printf(mon, "transferred disk: %" PRIu64 " kbytes\n",
- info->disk->transferred >> 10);
- monitor_printf(mon, "remaining disk: %" PRIu64 " kbytes\n",
- info->disk->remaining >> 10);
- monitor_printf(mon, "total disk: %" PRIu64 " kbytes\n",
- info->disk->total >> 10);
- }
-
- if (info->xbzrle_cache) {
- monitor_printf(mon, "cache size: %" PRIu64 " bytes\n",
- info->xbzrle_cache->cache_size);
- monitor_printf(mon, "xbzrle transferred: %" PRIu64 " kbytes\n",
- info->xbzrle_cache->bytes >> 10);
- monitor_printf(mon, "xbzrle pages: %" PRIu64 " pages\n",
- info->xbzrle_cache->pages);
- monitor_printf(mon, "xbzrle cache miss: %" PRIu64 " pages\n",
- info->xbzrle_cache->cache_miss);
- monitor_printf(mon, "xbzrle cache miss rate: %0.2f\n",
- info->xbzrle_cache->cache_miss_rate);
- monitor_printf(mon, "xbzrle encoding rate: %0.2f\n",
- info->xbzrle_cache->encoding_rate);
- monitor_printf(mon, "xbzrle overflow: %" PRIu64 "\n",
- info->xbzrle_cache->overflow);
- }
-
- if (info->compression) {
- monitor_printf(mon, "compression pages: %" PRIu64 " pages\n",
- info->compression->pages);
- monitor_printf(mon, "compression busy: %" PRIu64 "\n",
- info->compression->busy);
- monitor_printf(mon, "compression busy rate: %0.2f\n",
- info->compression->busy_rate);
- monitor_printf(mon, "compressed size: %" PRIu64 " kbytes\n",
- info->compression->compressed_size >> 10);
- monitor_printf(mon, "compression rate: %0.2f\n",
- info->compression->compression_rate);
- }
-
- if (info->has_cpu_throttle_percentage) {
- monitor_printf(mon, "cpu throttle percentage: %" PRIu64 "\n",
- info->cpu_throttle_percentage);
- }
-
- if (info->has_postcopy_blocktime) {
- monitor_printf(mon, "postcopy blocktime: %u\n",
- info->postcopy_blocktime);
- }
-
- if (info->has_postcopy_vcpu_blocktime) {
- Visitor *v;
- char *str;
- v = string_output_visitor_new(false, &str);
- visit_type_uint32List(v, NULL, &info->postcopy_vcpu_blocktime,
- &error_abort);
- visit_complete(v, &str);
- monitor_printf(mon, "postcopy vcpu blocktime: %s\n", str);
- g_free(str);
- visit_free(v);
- }
- if (info->has_socket_address) {
- SocketAddressList *addr;
-
- monitor_printf(mon, "socket address: [\n");
-
- for (addr = info->socket_address; addr; addr = addr->next) {
- char *s = socket_uri(addr->value);
- monitor_printf(mon, "\t%s\n", s);
- g_free(s);
- }
- monitor_printf(mon, "]\n");
- }
-
- if (info->vfio) {
- monitor_printf(mon, "vfio device transferred: %" PRIu64 " kbytes\n",
- info->vfio->transferred >> 10);
- }
-
- qapi_free_MigrationInfo(info);
-}
-
-void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict)
-{
- MigrationCapabilityStatusList *caps, *cap;
-
- caps = qmp_query_migrate_capabilities(NULL);
-
- if (caps) {
- for (cap = caps; cap; cap = cap->next) {
- monitor_printf(mon, "%s: %s\n",
- MigrationCapability_str(cap->value->capability),
- cap->value->state ? "on" : "off");
- }
- }
-
- qapi_free_MigrationCapabilityStatusList(caps);
-}
-
-void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
-{
- MigrationParameters *params;
-
- params = qmp_query_migrate_parameters(NULL);
-
- if (params) {
- monitor_printf(mon, "%s: %" PRIu64 " ms\n",
- MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_INITIAL),
- params->announce_initial);
- monitor_printf(mon, "%s: %" PRIu64 " ms\n",
- MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_MAX),
- params->announce_max);
- monitor_printf(mon, "%s: %" PRIu64 "\n",
- MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_ROUNDS),
- params->announce_rounds);
- monitor_printf(mon, "%s: %" PRIu64 " ms\n",
- MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_STEP),
- params->announce_step);
- assert(params->has_compress_level);
- monitor_printf(mon, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_COMPRESS_LEVEL),
- params->compress_level);
- assert(params->has_compress_threads);
- monitor_printf(mon, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_COMPRESS_THREADS),
- params->compress_threads);
- assert(params->has_compress_wait_thread);
- monitor_printf(mon, "%s: %s\n",
- MigrationParameter_str(MIGRATION_PARAMETER_COMPRESS_WAIT_THREAD),
- params->compress_wait_thread ? "on" : "off");
- assert(params->has_decompress_threads);
- monitor_printf(mon, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_DECOMPRESS_THREADS),
- params->decompress_threads);
- assert(params->has_throttle_trigger_threshold);
- monitor_printf(mon, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_THROTTLE_TRIGGER_THRESHOLD),
- params->throttle_trigger_threshold);
- assert(params->has_cpu_throttle_initial);
- monitor_printf(mon, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL),
- params->cpu_throttle_initial);
- assert(params->has_cpu_throttle_increment);
- monitor_printf(mon, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT),
- params->cpu_throttle_increment);
- assert(params->has_cpu_throttle_tailslow);
- monitor_printf(mon, "%s: %s\n",
- MigrationParameter_str(MIGRATION_PARAMETER_CPU_THROTTLE_TAILSLOW),
- params->cpu_throttle_tailslow ? "on" : "off");
- assert(params->has_max_cpu_throttle);
- monitor_printf(mon, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_MAX_CPU_THROTTLE),
- params->max_cpu_throttle);
- assert(params->tls_creds);
- monitor_printf(mon, "%s: '%s'\n",
- MigrationParameter_str(MIGRATION_PARAMETER_TLS_CREDS),
- params->tls_creds);
- assert(params->tls_hostname);
- monitor_printf(mon, "%s: '%s'\n",
- MigrationParameter_str(MIGRATION_PARAMETER_TLS_HOSTNAME),
- params->tls_hostname);
- assert(params->has_max_bandwidth);
- monitor_printf(mon, "%s: %" PRIu64 " bytes/second\n",
- MigrationParameter_str(MIGRATION_PARAMETER_MAX_BANDWIDTH),
- params->max_bandwidth);
- assert(params->has_downtime_limit);
- monitor_printf(mon, "%s: %" PRIu64 " ms\n",
- MigrationParameter_str(MIGRATION_PARAMETER_DOWNTIME_LIMIT),
- params->downtime_limit);
- assert(params->has_x_checkpoint_delay);
- monitor_printf(mon, "%s: %u ms\n",
- MigrationParameter_str(MIGRATION_PARAMETER_X_CHECKPOINT_DELAY),
- params->x_checkpoint_delay);
- assert(params->has_block_incremental);
- monitor_printf(mon, "%s: %s\n",
- MigrationParameter_str(MIGRATION_PARAMETER_BLOCK_INCREMENTAL),
- params->block_incremental ? "on" : "off");
- monitor_printf(mon, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_CHANNELS),
- params->multifd_channels);
- monitor_printf(mon, "%s: %s\n",
- MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_COMPRESSION),
- MultiFDCompression_str(params->multifd_compression));
- monitor_printf(mon, "%s: %" PRIu64 " bytes\n",
- MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE),
- params->xbzrle_cache_size);
- monitor_printf(mon, "%s: %" PRIu64 "\n",
- MigrationParameter_str(MIGRATION_PARAMETER_MAX_POSTCOPY_BANDWIDTH),
- params->max_postcopy_bandwidth);
- monitor_printf(mon, "%s: '%s'\n",
- MigrationParameter_str(MIGRATION_PARAMETER_TLS_AUTHZ),
- params->tls_authz);
-
- if (params->has_block_bitmap_mapping) {
- const BitmapMigrationNodeAliasList *bmnal;
-
- monitor_printf(mon, "%s:\n",
- MigrationParameter_str(
- MIGRATION_PARAMETER_BLOCK_BITMAP_MAPPING));
-
- for (bmnal = params->block_bitmap_mapping;
- bmnal;
- bmnal = bmnal->next)
- {
- const BitmapMigrationNodeAlias *bmna = bmnal->value;
- const BitmapMigrationBitmapAliasList *bmbal;
-
- monitor_printf(mon, " '%s' -> '%s'\n",
- bmna->node_name, bmna->alias);
-
- for (bmbal = bmna->bitmaps; bmbal; bmbal = bmbal->next) {
- const BitmapMigrationBitmapAlias *bmba = bmbal->value;
-
- monitor_printf(mon, " '%s' -> '%s'\n",
- bmba->name, bmba->alias);
- }
- }
- }
- }
-
- qapi_free_MigrationParameters(params);
-}
-
static int hmp_info_pic_foreach(Object *obj, void *opaque)
{
InterruptStatsProvider *intc;
@@ -571,305 +243,6 @@ void hmp_cont(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
-void hmp_loadvm(Monitor *mon, const QDict *qdict)
-{
- int saved_vm_running = runstate_is_running();
- const char *name = qdict_get_str(qdict, "name");
- Error *err = NULL;
-
- vm_stop(RUN_STATE_RESTORE_VM);
-
- if (load_snapshot(name, NULL, false, NULL, &err) && saved_vm_running) {
- vm_start();
- }
- hmp_handle_error(mon, err);
-}
-
-void hmp_savevm(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
-
- save_snapshot(qdict_get_try_str(qdict, "name"),
- true, NULL, false, NULL, &err);
- hmp_handle_error(mon, err);
-}
-
-void hmp_delvm(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- const char *name = qdict_get_str(qdict, "name");
-
- delete_snapshot(name, false, NULL, &err);
- hmp_handle_error(mon, err);
-}
-
-void hmp_migrate_cancel(Monitor *mon, const QDict *qdict)
-{
- qmp_migrate_cancel(NULL);
-}
-
-void hmp_migrate_continue(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- const char *state = qdict_get_str(qdict, "state");
- int val = qapi_enum_parse(&MigrationStatus_lookup, state, -1, &err);
-
- if (val >= 0) {
- qmp_migrate_continue(val, &err);
- }
-
- hmp_handle_error(mon, err);
-}
-
-void hmp_migrate_incoming(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- const char *uri = qdict_get_str(qdict, "uri");
-
- qmp_migrate_incoming(uri, &err);
-
- hmp_handle_error(mon, err);
-}
-
-void hmp_migrate_recover(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- const char *uri = qdict_get_str(qdict, "uri");
-
- qmp_migrate_recover(uri, &err);
-
- hmp_handle_error(mon, err);
-}
-
-void hmp_migrate_pause(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
-
- qmp_migrate_pause(&err);
-
- hmp_handle_error(mon, err);
-}
-
-
-void hmp_migrate_set_capability(Monitor *mon, const QDict *qdict)
-{
- const char *cap = qdict_get_str(qdict, "capability");
- bool state = qdict_get_bool(qdict, "state");
- Error *err = NULL;
- MigrationCapabilityStatusList *caps = NULL;
- MigrationCapabilityStatus *value;
- int val;
-
- val = qapi_enum_parse(&MigrationCapability_lookup, cap, -1, &err);
- if (val < 0) {
- goto end;
- }
-
- value = g_malloc0(sizeof(*value));
- value->capability = val;
- value->state = state;
- QAPI_LIST_PREPEND(caps, value);
- qmp_migrate_set_capabilities(caps, &err);
- qapi_free_MigrationCapabilityStatusList(caps);
-
-end:
- hmp_handle_error(mon, err);
-}
-
-void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
-{
- const char *param = qdict_get_str(qdict, "parameter");
- const char *valuestr = qdict_get_str(qdict, "value");
- Visitor *v = string_input_visitor_new(valuestr);
- MigrateSetParameters *p = g_new0(MigrateSetParameters, 1);
- uint64_t valuebw = 0;
- uint64_t cache_size;
- Error *err = NULL;
- int val, ret;
-
- val = qapi_enum_parse(&MigrationParameter_lookup, param, -1, &err);
- if (val < 0) {
- goto cleanup;
- }
-
- switch (val) {
- case MIGRATION_PARAMETER_COMPRESS_LEVEL:
- p->has_compress_level = true;
- visit_type_uint8(v, param, &p->compress_level, &err);
- break;
- case MIGRATION_PARAMETER_COMPRESS_THREADS:
- p->has_compress_threads = true;
- visit_type_uint8(v, param, &p->compress_threads, &err);
- break;
- case MIGRATION_PARAMETER_COMPRESS_WAIT_THREAD:
- p->has_compress_wait_thread = true;
- visit_type_bool(v, param, &p->compress_wait_thread, &err);
- break;
- case MIGRATION_PARAMETER_DECOMPRESS_THREADS:
- p->has_decompress_threads = true;
- visit_type_uint8(v, param, &p->decompress_threads, &err);
- break;
- case MIGRATION_PARAMETER_THROTTLE_TRIGGER_THRESHOLD:
- p->has_throttle_trigger_threshold = true;
- visit_type_uint8(v, param, &p->throttle_trigger_threshold, &err);
- break;
- case MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL:
- p->has_cpu_throttle_initial = true;
- visit_type_uint8(v, param, &p->cpu_throttle_initial, &err);
- break;
- case MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT:
- p->has_cpu_throttle_increment = true;
- visit_type_uint8(v, param, &p->cpu_throttle_increment, &err);
- break;
- case MIGRATION_PARAMETER_CPU_THROTTLE_TAILSLOW:
- p->has_cpu_throttle_tailslow = true;
- visit_type_bool(v, param, &p->cpu_throttle_tailslow, &err);
- break;
- case MIGRATION_PARAMETER_MAX_CPU_THROTTLE:
- p->has_max_cpu_throttle = true;
- visit_type_uint8(v, param, &p->max_cpu_throttle, &err);
- break;
- case MIGRATION_PARAMETER_TLS_CREDS:
- p->tls_creds = g_new0(StrOrNull, 1);
- p->tls_creds->type = QTYPE_QSTRING;
- visit_type_str(v, param, &p->tls_creds->u.s, &err);
- break;
- case MIGRATION_PARAMETER_TLS_HOSTNAME:
- p->tls_hostname = g_new0(StrOrNull, 1);
- p->tls_hostname->type = QTYPE_QSTRING;
- visit_type_str(v, param, &p->tls_hostname->u.s, &err);
- break;
- case MIGRATION_PARAMETER_TLS_AUTHZ:
- p->tls_authz = g_new0(StrOrNull, 1);
- p->tls_authz->type = QTYPE_QSTRING;
- visit_type_str(v, param, &p->tls_authz->u.s, &err);
- break;
- case MIGRATION_PARAMETER_MAX_BANDWIDTH:
- p->has_max_bandwidth = true;
- /*
- * Can't use visit_type_size() here, because it
- * defaults to Bytes rather than Mebibytes.
- */
- ret = qemu_strtosz_MiB(valuestr, NULL, &valuebw);
- if (ret < 0 || valuebw > INT64_MAX
- || (size_t)valuebw != valuebw) {
- error_setg(&err, "Invalid size %s", valuestr);
- break;
- }
- p->max_bandwidth = valuebw;
- break;
- case MIGRATION_PARAMETER_DOWNTIME_LIMIT:
- p->has_downtime_limit = true;
- visit_type_size(v, param, &p->downtime_limit, &err);
- break;
- case MIGRATION_PARAMETER_X_CHECKPOINT_DELAY:
- p->has_x_checkpoint_delay = true;
- visit_type_uint32(v, param, &p->x_checkpoint_delay, &err);
- break;
- case MIGRATION_PARAMETER_BLOCK_INCREMENTAL:
- p->has_block_incremental = true;
- visit_type_bool(v, param, &p->block_incremental, &err);
- break;
- case MIGRATION_PARAMETER_MULTIFD_CHANNELS:
- p->has_multifd_channels = true;
- visit_type_uint8(v, param, &p->multifd_channels, &err);
- break;
- case MIGRATION_PARAMETER_MULTIFD_COMPRESSION:
- p->has_multifd_compression = true;
- visit_type_MultiFDCompression(v, param, &p->multifd_compression,
- &err);
- break;
- case MIGRATION_PARAMETER_MULTIFD_ZLIB_LEVEL:
- p->has_multifd_zlib_level = true;
- visit_type_uint8(v, param, &p->multifd_zlib_level, &err);
- break;
- case MIGRATION_PARAMETER_MULTIFD_ZSTD_LEVEL:
- p->has_multifd_zstd_level = true;
- visit_type_uint8(v, param, &p->multifd_zstd_level, &err);
- break;
- case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE:
- p->has_xbzrle_cache_size = true;
- if (!visit_type_size(v, param, &cache_size, &err)) {
- break;
- }
- if (cache_size > INT64_MAX || (size_t)cache_size != cache_size) {
- error_setg(&err, "Invalid size %s", valuestr);
- break;
- }
- p->xbzrle_cache_size = cache_size;
- break;
- case MIGRATION_PARAMETER_MAX_POSTCOPY_BANDWIDTH:
- p->has_max_postcopy_bandwidth = true;
- visit_type_size(v, param, &p->max_postcopy_bandwidth, &err);
- break;
- case MIGRATION_PARAMETER_ANNOUNCE_INITIAL:
- p->has_announce_initial = true;
- visit_type_size(v, param, &p->announce_initial, &err);
- break;
- case MIGRATION_PARAMETER_ANNOUNCE_MAX:
- p->has_announce_max = true;
- visit_type_size(v, param, &p->announce_max, &err);
- break;
- case MIGRATION_PARAMETER_ANNOUNCE_ROUNDS:
- p->has_announce_rounds = true;
- visit_type_size(v, param, &p->announce_rounds, &err);
- break;
- case MIGRATION_PARAMETER_ANNOUNCE_STEP:
- p->has_announce_step = true;
- visit_type_size(v, param, &p->announce_step, &err);
- break;
- case MIGRATION_PARAMETER_BLOCK_BITMAP_MAPPING:
- error_setg(&err, "The block-bitmap-mapping parameter can only be set "
- "through QMP");
- break;
- default:
- assert(0);
- }
-
- if (err) {
- goto cleanup;
- }
-
- qmp_migrate_set_parameters(p, &err);
-
- cleanup:
- qapi_free_MigrateSetParameters(p);
- visit_free(v);
- hmp_handle_error(mon, err);
-}
-
-void hmp_client_migrate_info(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- const char *protocol = qdict_get_str(qdict, "protocol");
- const char *hostname = qdict_get_str(qdict, "hostname");
- bool has_port = qdict_haskey(qdict, "port");
- int port = qdict_get_try_int(qdict, "port", -1);
- bool has_tls_port = qdict_haskey(qdict, "tls-port");
- int tls_port = qdict_get_try_int(qdict, "tls-port", -1);
- const char *cert_subject = qdict_get_try_str(qdict, "cert-subject");
-
- qmp_client_migrate_info(protocol, hostname,
- has_port, port, has_tls_port, tls_port,
- cert_subject, &err);
- hmp_handle_error(mon, err);
-}
-
-void hmp_migrate_start_postcopy(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- qmp_migrate_start_postcopy(&err);
- hmp_handle_error(mon, err);
-}
-
-void hmp_x_colo_lost_heartbeat(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
-
- qmp_x_colo_lost_heartbeat(&err);
- hmp_handle_error(mon, err);
-}
-
void hmp_change(Monitor *mon, const QDict *qdict)
{
const char *device = qdict_get_str(qdict, "device");
@@ -891,82 +264,6 @@ void hmp_change(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
-typedef struct HMPMigrationStatus {
- QEMUTimer *timer;
- Monitor *mon;
- bool is_block_migration;
-} HMPMigrationStatus;
-
-static void hmp_migrate_status_cb(void *opaque)
-{
- HMPMigrationStatus *status = opaque;
- MigrationInfo *info;
-
- info = qmp_query_migrate(NULL);
- if (!info->has_status || info->status == MIGRATION_STATUS_ACTIVE ||
- info->status == MIGRATION_STATUS_SETUP) {
- if (info->disk) {
- int progress;
-
- if (info->disk->remaining) {
- progress = info->disk->transferred * 100 / info->disk->total;
- } else {
- progress = 100;
- }
-
- monitor_printf(status->mon, "Completed %d %%\r", progress);
- monitor_flush(status->mon);
- }
-
- timer_mod(status->timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + 1000);
- } else {
- if (status->is_block_migration) {
- monitor_printf(status->mon, "\n");
- }
- if (info->error_desc) {
- error_report("%s", info->error_desc);
- }
- monitor_resume(status->mon);
- timer_free(status->timer);
- g_free(status);
- }
-
- qapi_free_MigrationInfo(info);
-}
-
-void hmp_migrate(Monitor *mon, const QDict *qdict)
-{
- bool detach = qdict_get_try_bool(qdict, "detach", false);
- bool blk = qdict_get_try_bool(qdict, "blk", false);
- bool inc = qdict_get_try_bool(qdict, "inc", false);
- bool resume = qdict_get_try_bool(qdict, "resume", false);
- const char *uri = qdict_get_str(qdict, "uri");
- Error *err = NULL;
-
- qmp_migrate(uri, !!blk, blk, !!inc, inc,
- false, false, true, resume, &err);
- if (hmp_handle_error(mon, err)) {
- return;
- }
-
- if (!detach) {
- HMPMigrationStatus *status;
-
- if (monitor_suspend(mon) < 0) {
- monitor_printf(mon, "terminal does not allow synchronous "
- "migration, continuing detached\n");
- return;
- }
-
- status = g_malloc0(sizeof(*status));
- status->mon = mon;
- status->is_block_migration = blk || inc;
- status->timer = timer_new_ms(QEMU_CLOCK_REALTIME, hmp_migrate_status_cb,
- status);
- timer_mod(status->timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME));
- }
-}
-
void hmp_getfd(Monitor *mon, const QDict *qdict)
{
const char *fdname = qdict_get_str(qdict, "fdname");
diff --git a/monitor/misc.c b/monitor/misc.c
index 77a76b2b5f..780f2a6b04 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -41,7 +41,6 @@
#include "monitor/hmp.h"
#include "exec/address-spaces.h"
#include "exec/ioport.h"
-#include "block/qapi.h"
#include "block/block-hmp-cmds.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-migration.h"
@@ -1362,87 +1361,6 @@ void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str)
}
}
-void migrate_set_capability_completion(ReadLineState *rs, int nb_args,
- const char *str)
-{
- size_t len;
-
- len = strlen(str);
- readline_set_completion_index(rs, len);
- if (nb_args == 2) {
- int i;
- for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) {
- readline_add_completion_of(rs, str, MigrationCapability_str(i));
- }
- } else if (nb_args == 3) {
- readline_add_completion_of(rs, str, "on");
- readline_add_completion_of(rs, str, "off");
- }
-}
-
-void migrate_set_parameter_completion(ReadLineState *rs, int nb_args,
- const char *str)
-{
- size_t len;
-
- len = strlen(str);
- readline_set_completion_index(rs, len);
- if (nb_args == 2) {
- int i;
- for (i = 0; i < MIGRATION_PARAMETER__MAX; i++) {
- readline_add_completion_of(rs, str, MigrationParameter_str(i));
- }
- }
-}
-
-static void vm_completion(ReadLineState *rs, const char *str)
-{
- size_t len;
- BlockDriverState *bs;
- BdrvNextIterator it;
-
- len = strlen(str);
- readline_set_completion_index(rs, len);
-
- for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
- SnapshotInfoList *snapshots, *snapshot;
- AioContext *ctx = bdrv_get_aio_context(bs);
- bool ok = false;
-
- aio_context_acquire(ctx);
- if (bdrv_can_snapshot(bs)) {
- ok = bdrv_query_snapshot_info_list(bs, &snapshots, NULL) == 0;
- }
- aio_context_release(ctx);
- if (!ok) {
- continue;
- }
-
- snapshot = snapshots;
- while (snapshot) {
- readline_add_completion_of(rs, str, snapshot->value->name);
- readline_add_completion_of(rs, str, snapshot->value->id);
- snapshot = snapshot->next;
- }
- qapi_free_SnapshotInfoList(snapshots);
- }
-
-}
-
-void delvm_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- if (nb_args == 2) {
- vm_completion(rs, str);
- }
-}
-
-void loadvm_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- if (nb_args == 2) {
- vm_completion(rs, str);
- }
-}
-
static int
compare_mon_cmd(const void *a, const void *b)
{
diff --git a/migration/meson.build b/migration/meson.build
index 690487cf1a..a9e7e18793 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -18,6 +18,7 @@ softmmu_ss.add(files(
'exec.c',
'fd.c',
'global_state.c',
+ 'migration-hmp-cmds.c',
'migration.c',
'multifd.c',
'multifd-zlib.c',
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* Re: [PATCH 17/32] migration: Move HMP commands from monitor/ to migration/
2023-01-24 12:19 ` [PATCH 17/32] migration: Move HMP commands from monitor/ to migration/ Markus Armbruster
@ 2023-02-01 20:46 ` Juan Quintela
0 siblings, 0 replies; 44+ messages in thread
From: Juan Quintela @ 2023-02-01 20:46 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, pbonzini, kraxel, kwolf, hreitz, marcandre.lureau,
dgilbert, mst, imammedo, ani, eduardo, marcel.apfelbaum, philmd,
wangyanan55, jasowang, jiri, berrange, thuth, stefanb, stefanha,
kvm, qemu-block
Markus Armbruster <armbru@redhat.com> wrote:
> This moves these commands from MAINTAINERS sections "Human
> Monitor (HMP)" and "QMP" to "Migration".
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH 18/32] migration: Move the QMP command from monitor/ to migration/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (16 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 17/32] migration: Move HMP commands from monitor/ to migration/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-02-01 20:46 ` Juan Quintela
2023-01-24 12:19 ` [PATCH 19/32] virtio: Move HMP commands from monitor/ to hw/virtio/ Markus Armbruster
` (13 subsequent siblings)
31 siblings, 1 reply; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves the command from MAINTAINERS sections "Human Monitor (HMP)"
and "QMP" to "Migration".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
migration/migration.c | 30 ++++++++++++++++++++++++++++++
monitor/misc.c | 31 -------------------------------
2 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 52b5d39244..56859d5869 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -61,6 +61,7 @@
#include "sysemu/cpus.h"
#include "yank_functions.h"
#include "sysemu/qtest.h"
+#include "ui/qemu-spice.h"
#define MAX_THROTTLE (128 << 20) /* Migration transfer speed throttling */
@@ -963,6 +964,35 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)
return params;
}
+void qmp_client_migrate_info(const char *protocol, const char *hostname,
+ bool has_port, int64_t port,
+ bool has_tls_port, int64_t tls_port,
+ const char *cert_subject,
+ Error **errp)
+{
+ if (strcmp(protocol, "spice") == 0) {
+ if (!qemu_using_spice(errp)) {
+ return;
+ }
+
+ if (!has_port && !has_tls_port) {
+ error_setg(errp, QERR_MISSING_PARAMETER, "port/tls-port");
+ return;
+ }
+
+ if (qemu_spice.migrate_info(hostname,
+ has_port ? port : -1,
+ has_tls_port ? tls_port : -1,
+ cert_subject)) {
+ error_setg(errp, "Could not set up display for migration");
+ return;
+ }
+ return;
+ }
+
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "'spice'");
+}
+
AnnounceParameters *migrate_announce_params(void)
{
static AnnounceParameters ap;
diff --git a/monitor/misc.c b/monitor/misc.c
index 780f2a6b04..ff3002a880 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -27,7 +27,6 @@
#include "monitor/qdev.h"
#include "exec/gdbstub.h"
#include "net/slirp.h"
-#include "ui/qemu-spice.h"
#include "qemu/ctype.h"
#include "disas/disas.h"
#include "qemu/log.h"
@@ -43,7 +42,6 @@
#include "exec/ioport.h"
#include "block/block-hmp-cmds.h"
#include "qapi/qapi-commands-control.h"
-#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-machine.h"
@@ -291,35 +289,6 @@ static void hmp_info_history(Monitor *mon, const QDict *qdict)
}
}
-void qmp_client_migrate_info(const char *protocol, const char *hostname,
- bool has_port, int64_t port,
- bool has_tls_port, int64_t tls_port,
- const char *cert_subject,
- Error **errp)
-{
- if (strcmp(protocol, "spice") == 0) {
- if (!qemu_using_spice(errp)) {
- return;
- }
-
- if (!has_port && !has_tls_port) {
- error_setg(errp, QERR_MISSING_PARAMETER, "port/tls-port");
- return;
- }
-
- if (qemu_spice.migrate_info(hostname,
- has_port ? port : -1,
- has_tls_port ? tls_port : -1,
- cert_subject)) {
- error_setg(errp, "Could not set up display for migration");
- return;
- }
- return;
- }
-
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "'spice'");
-}
-
static void hmp_logfile(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* Re: [PATCH 18/32] migration: Move the QMP command from monitor/ to migration/
2023-01-24 12:19 ` [PATCH 18/32] migration: Move the QMP command " Markus Armbruster
@ 2023-02-01 20:46 ` Juan Quintela
0 siblings, 0 replies; 44+ messages in thread
From: Juan Quintela @ 2023-02-01 20:46 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, pbonzini, kraxel, kwolf, hreitz, marcandre.lureau,
dgilbert, mst, imammedo, ani, eduardo, marcel.apfelbaum, philmd,
wangyanan55, jasowang, jiri, berrange, thuth, stefanb, stefanha,
kvm, qemu-block
Markus Armbruster <armbru@redhat.com> wrote:
> This moves the command from MAINTAINERS sections "Human Monitor (HMP)"
> and "QMP" to "Migration".
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH 19/32] virtio: Move HMP commands from monitor/ to hw/virtio/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (17 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 18/32] migration: Move the QMP command " Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:24 ` Philippe Mathieu-Daudé
2023-01-24 12:19 ` [PATCH 20/32] tpm: Move HMP commands from monitor/ to softmmu/ Markus Armbruster
` (12 subsequent siblings)
31 siblings, 1 reply; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS section "Human
Monitor (HMP)" to "virtio".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/virtio/virtio-hmp-cmds.c | 321 ++++++++++++++++++++++++++++++++++++
monitor/hmp-cmds.c | 309 ----------------------------------
hw/virtio/meson.build | 1 +
3 files changed, 322 insertions(+), 309 deletions(-)
create mode 100644 hw/virtio/virtio-hmp-cmds.c
diff --git a/hw/virtio/virtio-hmp-cmds.c b/hw/virtio/virtio-hmp-cmds.c
new file mode 100644
index 0000000000..477c97dea2
--- /dev/null
+++ b/hw/virtio/virtio-hmp-cmds.c
@@ -0,0 +1,321 @@
+/*
+ * HMP commands related to virtio
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * (at your option) any later version.
+ */
+
+#include "qemu/osdep.h"
+#include "monitor/hmp.h"
+#include "monitor/monitor.h"
+#include "qapi/qapi-commands-virtio.h"
+#include "qapi/qmp/qdict.h"
+
+
+static void hmp_virtio_dump_protocols(Monitor *mon,
+ VhostDeviceProtocols *pcol)
+{
+ strList *pcol_list = pcol->protocols;
+ while (pcol_list) {
+ monitor_printf(mon, "\t%s", pcol_list->value);
+ pcol_list = pcol_list->next;
+ if (pcol_list != NULL) {
+ monitor_printf(mon, ",\n");
+ }
+ }
+ monitor_printf(mon, "\n");
+ if (pcol->has_unknown_protocols) {
+ monitor_printf(mon, " unknown-protocols(0x%016"PRIx64")\n",
+ pcol->unknown_protocols);
+ }
+}
+
+static void hmp_virtio_dump_status(Monitor *mon,
+ VirtioDeviceStatus *status)
+{
+ strList *status_list = status->statuses;
+ while (status_list) {
+ monitor_printf(mon, "\t%s", status_list->value);
+ status_list = status_list->next;
+ if (status_list != NULL) {
+ monitor_printf(mon, ",\n");
+ }
+ }
+ monitor_printf(mon, "\n");
+ if (status->has_unknown_statuses) {
+ monitor_printf(mon, " unknown-statuses(0x%016"PRIx32")\n",
+ status->unknown_statuses);
+ }
+}
+
+static void hmp_virtio_dump_features(Monitor *mon,
+ VirtioDeviceFeatures *features)
+{
+ strList *transport_list = features->transports;
+ while (transport_list) {
+ monitor_printf(mon, "\t%s", transport_list->value);
+ transport_list = transport_list->next;
+ if (transport_list != NULL) {
+ monitor_printf(mon, ",\n");
+ }
+ }
+
+ monitor_printf(mon, "\n");
+ strList *list = features->dev_features;
+ if (list) {
+ while (list) {
+ monitor_printf(mon, "\t%s", list->value);
+ list = list->next;
+ if (list != NULL) {
+ monitor_printf(mon, ",\n");
+ }
+ }
+ monitor_printf(mon, "\n");
+ }
+
+ if (features->has_unknown_dev_features) {
+ monitor_printf(mon, " unknown-features(0x%016"PRIx64")\n",
+ features->unknown_dev_features);
+ }
+}
+
+void hmp_virtio_query(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ VirtioInfoList *list = qmp_x_query_virtio(&err);
+ VirtioInfoList *node;
+
+ if (err != NULL) {
+ hmp_handle_error(mon, err);
+ return;
+ }
+
+ if (list == NULL) {
+ monitor_printf(mon, "No VirtIO devices\n");
+ return;
+ }
+
+ node = list;
+ while (node) {
+ monitor_printf(mon, "%s [%s]\n", node->value->path,
+ node->value->name);
+ node = node->next;
+ }
+ qapi_free_VirtioInfoList(list);
+}
+
+void hmp_virtio_status(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ const char *path = qdict_get_try_str(qdict, "path");
+ VirtioStatus *s = qmp_x_query_virtio_status(path, &err);
+
+ if (err != NULL) {
+ hmp_handle_error(mon, err);
+ return;
+ }
+
+ monitor_printf(mon, "%s:\n", path);
+ monitor_printf(mon, " device_name: %s %s\n",
+ s->name, s->vhost_dev ? "(vhost)" : "");
+ monitor_printf(mon, " device_id: %d\n", s->device_id);
+ monitor_printf(mon, " vhost_started: %s\n",
+ s->vhost_started ? "true" : "false");
+ monitor_printf(mon, " bus_name: %s\n", s->bus_name);
+ monitor_printf(mon, " broken: %s\n",
+ s->broken ? "true" : "false");
+ monitor_printf(mon, " disabled: %s\n",
+ s->disabled ? "true" : "false");
+ monitor_printf(mon, " disable_legacy_check: %s\n",
+ s->disable_legacy_check ? "true" : "false");
+ monitor_printf(mon, " started: %s\n",
+ s->started ? "true" : "false");
+ monitor_printf(mon, " use_started: %s\n",
+ s->use_started ? "true" : "false");
+ monitor_printf(mon, " start_on_kick: %s\n",
+ s->start_on_kick ? "true" : "false");
+ monitor_printf(mon, " use_guest_notifier_mask: %s\n",
+ s->use_guest_notifier_mask ? "true" : "false");
+ monitor_printf(mon, " vm_running: %s\n",
+ s->vm_running ? "true" : "false");
+ monitor_printf(mon, " num_vqs: %"PRId64"\n", s->num_vqs);
+ monitor_printf(mon, " queue_sel: %d\n",
+ s->queue_sel);
+ monitor_printf(mon, " isr: %d\n", s->isr);
+ monitor_printf(mon, " endianness: %s\n",
+ s->device_endian);
+ monitor_printf(mon, " status:\n");
+ hmp_virtio_dump_status(mon, s->status);
+ monitor_printf(mon, " Guest features:\n");
+ hmp_virtio_dump_features(mon, s->guest_features);
+ monitor_printf(mon, " Host features:\n");
+ hmp_virtio_dump_features(mon, s->host_features);
+ monitor_printf(mon, " Backend features:\n");
+ hmp_virtio_dump_features(mon, s->backend_features);
+
+ if (s->vhost_dev) {
+ monitor_printf(mon, " VHost:\n");
+ monitor_printf(mon, " nvqs: %d\n",
+ s->vhost_dev->nvqs);
+ monitor_printf(mon, " vq_index: %"PRId64"\n",
+ s->vhost_dev->vq_index);
+ monitor_printf(mon, " max_queues: %"PRId64"\n",
+ s->vhost_dev->max_queues);
+ monitor_printf(mon, " n_mem_sections: %"PRId64"\n",
+ s->vhost_dev->n_mem_sections);
+ monitor_printf(mon, " n_tmp_sections: %"PRId64"\n",
+ s->vhost_dev->n_tmp_sections);
+ monitor_printf(mon, " backend_cap: %"PRId64"\n",
+ s->vhost_dev->backend_cap);
+ monitor_printf(mon, " log_enabled: %s\n",
+ s->vhost_dev->log_enabled ? "true" : "false");
+ monitor_printf(mon, " log_size: %"PRId64"\n",
+ s->vhost_dev->log_size);
+ monitor_printf(mon, " Features:\n");
+ hmp_virtio_dump_features(mon, s->vhost_dev->features);
+ monitor_printf(mon, " Acked features:\n");
+ hmp_virtio_dump_features(mon, s->vhost_dev->acked_features);
+ monitor_printf(mon, " Backend features:\n");
+ hmp_virtio_dump_features(mon, s->vhost_dev->backend_features);
+ monitor_printf(mon, " Protocol features:\n");
+ hmp_virtio_dump_protocols(mon, s->vhost_dev->protocol_features);
+ }
+
+ qapi_free_VirtioStatus(s);
+}
+
+void hmp_vhost_queue_status(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ const char *path = qdict_get_try_str(qdict, "path");
+ int queue = qdict_get_int(qdict, "queue");
+ VirtVhostQueueStatus *s =
+ qmp_x_query_virtio_vhost_queue_status(path, queue, &err);
+
+ if (err != NULL) {
+ hmp_handle_error(mon, err);
+ return;
+ }
+
+ monitor_printf(mon, "%s:\n", path);
+ monitor_printf(mon, " device_name: %s (vhost)\n",
+ s->name);
+ monitor_printf(mon, " kick: %"PRId64"\n", s->kick);
+ monitor_printf(mon, " call: %"PRId64"\n", s->call);
+ monitor_printf(mon, " VRing:\n");
+ monitor_printf(mon, " num: %"PRId64"\n", s->num);
+ monitor_printf(mon, " desc: 0x%016"PRIx64"\n", s->desc);
+ monitor_printf(mon, " desc_phys: 0x%016"PRIx64"\n",
+ s->desc_phys);
+ monitor_printf(mon, " desc_size: %"PRId32"\n", s->desc_size);
+ monitor_printf(mon, " avail: 0x%016"PRIx64"\n", s->avail);
+ monitor_printf(mon, " avail_phys: 0x%016"PRIx64"\n",
+ s->avail_phys);
+ monitor_printf(mon, " avail_size: %"PRId32"\n", s->avail_size);
+ monitor_printf(mon, " used: 0x%016"PRIx64"\n", s->used);
+ monitor_printf(mon, " used_phys: 0x%016"PRIx64"\n",
+ s->used_phys);
+ monitor_printf(mon, " used_size: %"PRId32"\n", s->used_size);
+
+ qapi_free_VirtVhostQueueStatus(s);
+}
+
+void hmp_virtio_queue_status(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ const char *path = qdict_get_try_str(qdict, "path");
+ int queue = qdict_get_int(qdict, "queue");
+ VirtQueueStatus *s = qmp_x_query_virtio_queue_status(path, queue, &err);
+
+ if (err != NULL) {
+ hmp_handle_error(mon, err);
+ return;
+ }
+
+ monitor_printf(mon, "%s:\n", path);
+ monitor_printf(mon, " device_name: %s\n", s->name);
+ monitor_printf(mon, " queue_index: %d\n", s->queue_index);
+ monitor_printf(mon, " inuse: %d\n", s->inuse);
+ monitor_printf(mon, " used_idx: %d\n", s->used_idx);
+ monitor_printf(mon, " signalled_used: %d\n",
+ s->signalled_used);
+ monitor_printf(mon, " signalled_used_valid: %s\n",
+ s->signalled_used_valid ? "true" : "false");
+ if (s->has_last_avail_idx) {
+ monitor_printf(mon, " last_avail_idx: %d\n",
+ s->last_avail_idx);
+ }
+ if (s->has_shadow_avail_idx) {
+ monitor_printf(mon, " shadow_avail_idx: %d\n",
+ s->shadow_avail_idx);
+ }
+ monitor_printf(mon, " VRing:\n");
+ monitor_printf(mon, " num: %"PRId32"\n", s->vring_num);
+ monitor_printf(mon, " num_default: %"PRId32"\n",
+ s->vring_num_default);
+ monitor_printf(mon, " align: %"PRId32"\n",
+ s->vring_align);
+ monitor_printf(mon, " desc: 0x%016"PRIx64"\n",
+ s->vring_desc);
+ monitor_printf(mon, " avail: 0x%016"PRIx64"\n",
+ s->vring_avail);
+ monitor_printf(mon, " used: 0x%016"PRIx64"\n",
+ s->vring_used);
+
+ qapi_free_VirtQueueStatus(s);
+}
+
+void hmp_virtio_queue_element(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ const char *path = qdict_get_try_str(qdict, "path");
+ int queue = qdict_get_int(qdict, "queue");
+ int index = qdict_get_try_int(qdict, "index", -1);
+ VirtioQueueElement *e;
+ VirtioRingDescList *list;
+
+ e = qmp_x_query_virtio_queue_element(path, queue, index != -1,
+ index, &err);
+ if (err != NULL) {
+ hmp_handle_error(mon, err);
+ return;
+ }
+
+ monitor_printf(mon, "%s:\n", path);
+ monitor_printf(mon, " device_name: %s\n", e->name);
+ monitor_printf(mon, " index: %d\n", e->index);
+ monitor_printf(mon, " desc:\n");
+ monitor_printf(mon, " descs:\n");
+
+ list = e->descs;
+ while (list) {
+ monitor_printf(mon, " addr 0x%"PRIx64" len %d",
+ list->value->addr, list->value->len);
+ if (list->value->flags) {
+ strList *flag = list->value->flags;
+ monitor_printf(mon, " (");
+ while (flag) {
+ monitor_printf(mon, "%s", flag->value);
+ flag = flag->next;
+ if (flag) {
+ monitor_printf(mon, ", ");
+ }
+ }
+ monitor_printf(mon, ")");
+ }
+ list = list->next;
+ if (list) {
+ monitor_printf(mon, ",\n");
+ }
+ }
+ monitor_printf(mon, "\n");
+ monitor_printf(mon, " avail:\n");
+ monitor_printf(mon, " flags: %d\n", e->avail->flags);
+ monitor_printf(mon, " idx: %d\n", e->avail->idx);
+ monitor_printf(mon, " ring: %d\n", e->avail->ring);
+ monitor_printf(mon, " used:\n");
+ monitor_printf(mon, " flags: %d\n", e->used->flags);
+ monitor_printf(mon, " idx: %d\n", e->used->idx);
+
+ qapi_free_VirtioQueueElement(e);
+}
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 4da6b7cccc..6b1d5358f7 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -23,7 +23,6 @@
#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-stats.h"
#include "qapi/qapi-commands-tpm.h"
-#include "qapi/qapi-commands-virtio.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
#include "qemu/cutils.h"
@@ -533,311 +532,3 @@ exit:
exit_no_print:
error_free(err);
}
-
-static void hmp_virtio_dump_protocols(Monitor *mon,
- VhostDeviceProtocols *pcol)
-{
- strList *pcol_list = pcol->protocols;
- while (pcol_list) {
- monitor_printf(mon, "\t%s", pcol_list->value);
- pcol_list = pcol_list->next;
- if (pcol_list != NULL) {
- monitor_printf(mon, ",\n");
- }
- }
- monitor_printf(mon, "\n");
- if (pcol->has_unknown_protocols) {
- monitor_printf(mon, " unknown-protocols(0x%016"PRIx64")\n",
- pcol->unknown_protocols);
- }
-}
-
-static void hmp_virtio_dump_status(Monitor *mon,
- VirtioDeviceStatus *status)
-{
- strList *status_list = status->statuses;
- while (status_list) {
- monitor_printf(mon, "\t%s", status_list->value);
- status_list = status_list->next;
- if (status_list != NULL) {
- monitor_printf(mon, ",\n");
- }
- }
- monitor_printf(mon, "\n");
- if (status->has_unknown_statuses) {
- monitor_printf(mon, " unknown-statuses(0x%016"PRIx32")\n",
- status->unknown_statuses);
- }
-}
-
-static void hmp_virtio_dump_features(Monitor *mon,
- VirtioDeviceFeatures *features)
-{
- strList *transport_list = features->transports;
- while (transport_list) {
- monitor_printf(mon, "\t%s", transport_list->value);
- transport_list = transport_list->next;
- if (transport_list != NULL) {
- monitor_printf(mon, ",\n");
- }
- }
-
- monitor_printf(mon, "\n");
- strList *list = features->dev_features;
- if (list) {
- while (list) {
- monitor_printf(mon, "\t%s", list->value);
- list = list->next;
- if (list != NULL) {
- monitor_printf(mon, ",\n");
- }
- }
- monitor_printf(mon, "\n");
- }
-
- if (features->has_unknown_dev_features) {
- monitor_printf(mon, " unknown-features(0x%016"PRIx64")\n",
- features->unknown_dev_features);
- }
-}
-
-void hmp_virtio_query(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- VirtioInfoList *list = qmp_x_query_virtio(&err);
- VirtioInfoList *node;
-
- if (err != NULL) {
- hmp_handle_error(mon, err);
- return;
- }
-
- if (list == NULL) {
- monitor_printf(mon, "No VirtIO devices\n");
- return;
- }
-
- node = list;
- while (node) {
- monitor_printf(mon, "%s [%s]\n", node->value->path,
- node->value->name);
- node = node->next;
- }
- qapi_free_VirtioInfoList(list);
-}
-
-void hmp_virtio_status(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- const char *path = qdict_get_try_str(qdict, "path");
- VirtioStatus *s = qmp_x_query_virtio_status(path, &err);
-
- if (err != NULL) {
- hmp_handle_error(mon, err);
- return;
- }
-
- monitor_printf(mon, "%s:\n", path);
- monitor_printf(mon, " device_name: %s %s\n",
- s->name, s->vhost_dev ? "(vhost)" : "");
- monitor_printf(mon, " device_id: %d\n", s->device_id);
- monitor_printf(mon, " vhost_started: %s\n",
- s->vhost_started ? "true" : "false");
- monitor_printf(mon, " bus_name: %s\n", s->bus_name);
- monitor_printf(mon, " broken: %s\n",
- s->broken ? "true" : "false");
- monitor_printf(mon, " disabled: %s\n",
- s->disabled ? "true" : "false");
- monitor_printf(mon, " disable_legacy_check: %s\n",
- s->disable_legacy_check ? "true" : "false");
- monitor_printf(mon, " started: %s\n",
- s->started ? "true" : "false");
- monitor_printf(mon, " use_started: %s\n",
- s->use_started ? "true" : "false");
- monitor_printf(mon, " start_on_kick: %s\n",
- s->start_on_kick ? "true" : "false");
- monitor_printf(mon, " use_guest_notifier_mask: %s\n",
- s->use_guest_notifier_mask ? "true" : "false");
- monitor_printf(mon, " vm_running: %s\n",
- s->vm_running ? "true" : "false");
- monitor_printf(mon, " num_vqs: %"PRId64"\n", s->num_vqs);
- monitor_printf(mon, " queue_sel: %d\n",
- s->queue_sel);
- monitor_printf(mon, " isr: %d\n", s->isr);
- monitor_printf(mon, " endianness: %s\n",
- s->device_endian);
- monitor_printf(mon, " status:\n");
- hmp_virtio_dump_status(mon, s->status);
- monitor_printf(mon, " Guest features:\n");
- hmp_virtio_dump_features(mon, s->guest_features);
- monitor_printf(mon, " Host features:\n");
- hmp_virtio_dump_features(mon, s->host_features);
- monitor_printf(mon, " Backend features:\n");
- hmp_virtio_dump_features(mon, s->backend_features);
-
- if (s->vhost_dev) {
- monitor_printf(mon, " VHost:\n");
- monitor_printf(mon, " nvqs: %d\n",
- s->vhost_dev->nvqs);
- monitor_printf(mon, " vq_index: %"PRId64"\n",
- s->vhost_dev->vq_index);
- monitor_printf(mon, " max_queues: %"PRId64"\n",
- s->vhost_dev->max_queues);
- monitor_printf(mon, " n_mem_sections: %"PRId64"\n",
- s->vhost_dev->n_mem_sections);
- monitor_printf(mon, " n_tmp_sections: %"PRId64"\n",
- s->vhost_dev->n_tmp_sections);
- monitor_printf(mon, " backend_cap: %"PRId64"\n",
- s->vhost_dev->backend_cap);
- monitor_printf(mon, " log_enabled: %s\n",
- s->vhost_dev->log_enabled ? "true" : "false");
- monitor_printf(mon, " log_size: %"PRId64"\n",
- s->vhost_dev->log_size);
- monitor_printf(mon, " Features:\n");
- hmp_virtio_dump_features(mon, s->vhost_dev->features);
- monitor_printf(mon, " Acked features:\n");
- hmp_virtio_dump_features(mon, s->vhost_dev->acked_features);
- monitor_printf(mon, " Backend features:\n");
- hmp_virtio_dump_features(mon, s->vhost_dev->backend_features);
- monitor_printf(mon, " Protocol features:\n");
- hmp_virtio_dump_protocols(mon, s->vhost_dev->protocol_features);
- }
-
- qapi_free_VirtioStatus(s);
-}
-
-void hmp_vhost_queue_status(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- const char *path = qdict_get_try_str(qdict, "path");
- int queue = qdict_get_int(qdict, "queue");
- VirtVhostQueueStatus *s =
- qmp_x_query_virtio_vhost_queue_status(path, queue, &err);
-
- if (err != NULL) {
- hmp_handle_error(mon, err);
- return;
- }
-
- monitor_printf(mon, "%s:\n", path);
- monitor_printf(mon, " device_name: %s (vhost)\n",
- s->name);
- monitor_printf(mon, " kick: %"PRId64"\n", s->kick);
- monitor_printf(mon, " call: %"PRId64"\n", s->call);
- monitor_printf(mon, " VRing:\n");
- monitor_printf(mon, " num: %"PRId64"\n", s->num);
- monitor_printf(mon, " desc: 0x%016"PRIx64"\n", s->desc);
- monitor_printf(mon, " desc_phys: 0x%016"PRIx64"\n",
- s->desc_phys);
- monitor_printf(mon, " desc_size: %"PRId32"\n", s->desc_size);
- monitor_printf(mon, " avail: 0x%016"PRIx64"\n", s->avail);
- monitor_printf(mon, " avail_phys: 0x%016"PRIx64"\n",
- s->avail_phys);
- monitor_printf(mon, " avail_size: %"PRId32"\n", s->avail_size);
- monitor_printf(mon, " used: 0x%016"PRIx64"\n", s->used);
- monitor_printf(mon, " used_phys: 0x%016"PRIx64"\n",
- s->used_phys);
- monitor_printf(mon, " used_size: %"PRId32"\n", s->used_size);
-
- qapi_free_VirtVhostQueueStatus(s);
-}
-
-void hmp_virtio_queue_status(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- const char *path = qdict_get_try_str(qdict, "path");
- int queue = qdict_get_int(qdict, "queue");
- VirtQueueStatus *s = qmp_x_query_virtio_queue_status(path, queue, &err);
-
- if (err != NULL) {
- hmp_handle_error(mon, err);
- return;
- }
-
- monitor_printf(mon, "%s:\n", path);
- monitor_printf(mon, " device_name: %s\n", s->name);
- monitor_printf(mon, " queue_index: %d\n", s->queue_index);
- monitor_printf(mon, " inuse: %d\n", s->inuse);
- monitor_printf(mon, " used_idx: %d\n", s->used_idx);
- monitor_printf(mon, " signalled_used: %d\n",
- s->signalled_used);
- monitor_printf(mon, " signalled_used_valid: %s\n",
- s->signalled_used_valid ? "true" : "false");
- if (s->has_last_avail_idx) {
- monitor_printf(mon, " last_avail_idx: %d\n",
- s->last_avail_idx);
- }
- if (s->has_shadow_avail_idx) {
- monitor_printf(mon, " shadow_avail_idx: %d\n",
- s->shadow_avail_idx);
- }
- monitor_printf(mon, " VRing:\n");
- monitor_printf(mon, " num: %"PRId32"\n", s->vring_num);
- monitor_printf(mon, " num_default: %"PRId32"\n",
- s->vring_num_default);
- monitor_printf(mon, " align: %"PRId32"\n",
- s->vring_align);
- monitor_printf(mon, " desc: 0x%016"PRIx64"\n",
- s->vring_desc);
- monitor_printf(mon, " avail: 0x%016"PRIx64"\n",
- s->vring_avail);
- monitor_printf(mon, " used: 0x%016"PRIx64"\n",
- s->vring_used);
-
- qapi_free_VirtQueueStatus(s);
-}
-
-void hmp_virtio_queue_element(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- const char *path = qdict_get_try_str(qdict, "path");
- int queue = qdict_get_int(qdict, "queue");
- int index = qdict_get_try_int(qdict, "index", -1);
- VirtioQueueElement *e;
- VirtioRingDescList *list;
-
- e = qmp_x_query_virtio_queue_element(path, queue, index != -1,
- index, &err);
- if (err != NULL) {
- hmp_handle_error(mon, err);
- return;
- }
-
- monitor_printf(mon, "%s:\n", path);
- monitor_printf(mon, " device_name: %s\n", e->name);
- monitor_printf(mon, " index: %d\n", e->index);
- monitor_printf(mon, " desc:\n");
- monitor_printf(mon, " descs:\n");
-
- list = e->descs;
- while (list) {
- monitor_printf(mon, " addr 0x%"PRIx64" len %d",
- list->value->addr, list->value->len);
- if (list->value->flags) {
- strList *flag = list->value->flags;
- monitor_printf(mon, " (");
- while (flag) {
- monitor_printf(mon, "%s", flag->value);
- flag = flag->next;
- if (flag) {
- monitor_printf(mon, ", ");
- }
- }
- monitor_printf(mon, ")");
- }
- list = list->next;
- if (list) {
- monitor_printf(mon, ",\n");
- }
- }
- monitor_printf(mon, "\n");
- monitor_printf(mon, " avail:\n");
- monitor_printf(mon, " flags: %d\n", e->avail->flags);
- monitor_printf(mon, " idx: %d\n", e->avail->idx);
- monitor_printf(mon, " ring: %d\n", e->avail->ring);
- monitor_printf(mon, " used:\n");
- monitor_printf(mon, " flags: %d\n", e->used->flags);
- monitor_printf(mon, " idx: %d\n", e->used->idx);
-
- qapi_free_VirtioQueueElement(e);
-}
diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
index f93be2e137..bdec78bfc6 100644
--- a/hw/virtio/meson.build
+++ b/hw/virtio/meson.build
@@ -67,5 +67,6 @@ softmmu_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c'))
softmmu_ss.add(when: 'CONFIG_VIRTIO', if_false: files('virtio-stub.c'))
softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c'))
softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('virtio-stub.c'))
+softmmu_ss.add(files('virtio-hmp-cmds.c'))
specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: specific_virtio_ss)
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* Re: [PATCH 19/32] virtio: Move HMP commands from monitor/ to hw/virtio/
2023-01-24 12:19 ` [PATCH 19/32] virtio: Move HMP commands from monitor/ to hw/virtio/ Markus Armbruster
@ 2023-01-24 12:24 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 44+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-01-24 12:24 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, wangyanan55, jasowang,
jiri, berrange, thuth, quintela, stefanb, stefanha, kvm,
qemu-block
On 24/1/23 13:19, Markus Armbruster wrote:
> This moves these commands from MAINTAINERS section "Human
> Monitor (HMP)" to "virtio".
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> hw/virtio/virtio-hmp-cmds.c | 321 ++++++++++++++++++++++++++++++++++++
> monitor/hmp-cmds.c | 309 ----------------------------------
> hw/virtio/meson.build | 1 +
> 3 files changed, 322 insertions(+), 309 deletions(-)
> create mode 100644 hw/virtio/virtio-hmp-cmds.c
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH 20/32] tpm: Move HMP commands from monitor/ to softmmu/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (18 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 19/32] virtio: Move HMP commands from monitor/ to hw/virtio/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 22:39 ` Stefan Berger
2023-01-24 12:19 ` [PATCH 21/32] runstate: " Markus Armbruster
` (11 subsequent siblings)
31 siblings, 1 reply; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS section "Human
Monitor (HMP)" to "TPM".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
MAINTAINERS | 2 +-
monitor/hmp-cmds.c | 54 -----------------------------------
softmmu/tpm-hmp-cmds.c | 65 ++++++++++++++++++++++++++++++++++++++++++
softmmu/meson.build | 1 +
4 files changed, 67 insertions(+), 55 deletions(-)
create mode 100644 softmmu/tpm-hmp-cmds.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 3bd4d101d3..dab4def753 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3067,7 +3067,7 @@ T: git https://github.com/stefanha/qemu.git tracing
TPM
M: Stefan Berger <stefanb@linux.ibm.com>
S: Maintained
-F: softmmu/tpm.c
+F: softmmu/tpm*
F: hw/tpm/*
F: include/hw/acpi/tpm.h
F: include/sysemu/tpm*
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 6b1d5358f7..81f63fa8ec 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -22,7 +22,6 @@
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-stats.h"
-#include "qapi/qapi-commands-tpm.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
#include "qemu/cutils.h"
@@ -126,59 +125,6 @@ void hmp_info_pic(Monitor *mon, const QDict *qdict)
hmp_info_pic_foreach, mon);
}
-void hmp_info_tpm(Monitor *mon, const QDict *qdict)
-{
-#ifdef CONFIG_TPM
- TPMInfoList *info_list, *info;
- Error *err = NULL;
- unsigned int c = 0;
- TPMPassthroughOptions *tpo;
- TPMEmulatorOptions *teo;
-
- info_list = qmp_query_tpm(&err);
- if (err) {
- monitor_printf(mon, "TPM device not supported\n");
- error_free(err);
- return;
- }
-
- if (info_list) {
- monitor_printf(mon, "TPM device:\n");
- }
-
- for (info = info_list; info; info = info->next) {
- TPMInfo *ti = info->value;
- monitor_printf(mon, " tpm%d: model=%s\n",
- c, TpmModel_str(ti->model));
-
- monitor_printf(mon, " \\ %s: type=%s",
- ti->id, TpmType_str(ti->options->type));
-
- switch (ti->options->type) {
- case TPM_TYPE_PASSTHROUGH:
- tpo = ti->options->u.passthrough.data;
- monitor_printf(mon, "%s%s%s%s",
- tpo->path ? ",path=" : "",
- tpo->path ?: "",
- tpo->cancel_path ? ",cancel-path=" : "",
- tpo->cancel_path ?: "");
- break;
- case TPM_TYPE_EMULATOR:
- teo = ti->options->u.emulator.data;
- monitor_printf(mon, ",chardev=%s", teo->chardev);
- break;
- case TPM_TYPE__MAX:
- break;
- }
- monitor_printf(mon, "\n");
- c++;
- }
- qapi_free_TPMInfoList(info_list);
-#else
- monitor_printf(mon, "TPM device not supported\n");
-#endif /* CONFIG_TPM */
-}
-
void hmp_quit(Monitor *mon, const QDict *qdict)
{
monitor_suspend(mon);
diff --git a/softmmu/tpm-hmp-cmds.c b/softmmu/tpm-hmp-cmds.c
new file mode 100644
index 0000000000..9ed6ad6c4d
--- /dev/null
+++ b/softmmu/tpm-hmp-cmds.c
@@ -0,0 +1,65 @@
+/*
+ * HMP commands related to TPM
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * (at your option) any later version.
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/qapi-commands-tpm.h"
+#include "monitor/monitor.h"
+#include "monitor/hmp.h"
+#include "qapi/error.h"
+
+void hmp_info_tpm(Monitor *mon, const QDict *qdict)
+{
+#ifdef CONFIG_TPM
+ TPMInfoList *info_list, *info;
+ Error *err = NULL;
+ unsigned int c = 0;
+ TPMPassthroughOptions *tpo;
+ TPMEmulatorOptions *teo;
+
+ info_list = qmp_query_tpm(&err);
+ if (err) {
+ monitor_printf(mon, "TPM device not supported\n");
+ error_free(err);
+ return;
+ }
+
+ if (info_list) {
+ monitor_printf(mon, "TPM device:\n");
+ }
+
+ for (info = info_list; info; info = info->next) {
+ TPMInfo *ti = info->value;
+ monitor_printf(mon, " tpm%d: model=%s\n",
+ c, TpmModel_str(ti->model));
+
+ monitor_printf(mon, " \\ %s: type=%s",
+ ti->id, TpmType_str(ti->options->type));
+
+ switch (ti->options->type) {
+ case TPM_TYPE_PASSTHROUGH:
+ tpo = ti->options->u.passthrough.data;
+ monitor_printf(mon, "%s%s%s%s",
+ tpo->path ? ",path=" : "",
+ tpo->path ?: "",
+ tpo->cancel_path ? ",cancel-path=" : "",
+ tpo->cancel_path ?: "");
+ break;
+ case TPM_TYPE_EMULATOR:
+ teo = ti->options->u.emulator.data;
+ monitor_printf(mon, ",chardev=%s", teo->chardev);
+ break;
+ case TPM_TYPE__MAX:
+ break;
+ }
+ monitor_printf(mon, "\n");
+ c++;
+ }
+ qapi_free_TPMInfoList(info_list);
+#else
+ monitor_printf(mon, "TPM device not supported\n");
+#endif /* CONFIG_TPM */
+}
diff --git a/softmmu/meson.build b/softmmu/meson.build
index 3272af1f31..efbf4ec029 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -25,6 +25,7 @@ softmmu_ss.add(files(
'rtc.c',
'runstate-action.c',
'runstate.c',
+ 'tpm-hmp-cmds.c',
'vl.c',
), sdl, libpmem, libdaxctl)
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* Re: [PATCH 20/32] tpm: Move HMP commands from monitor/ to softmmu/
2023-01-24 12:19 ` [PATCH 20/32] tpm: Move HMP commands from monitor/ to softmmu/ Markus Armbruster
@ 2023-01-24 22:39 ` Stefan Berger
0 siblings, 0 replies; 44+ messages in thread
From: Stefan Berger @ 2023-01-24 22:39 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
On 1/24/23 07:19, Markus Armbruster wrote:
> This moves these commands from MAINTAINERS section "Human
> Monitor (HMP)" to "TPM".
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
> ---
> MAINTAINERS | 2 +-
> monitor/hmp-cmds.c | 54 -----------------------------------
> softmmu/tpm-hmp-cmds.c | 65 ++++++++++++++++++++++++++++++++++++++++++
> softmmu/meson.build | 1 +
> 4 files changed, 67 insertions(+), 55 deletions(-)
> create mode 100644 softmmu/tpm-hmp-cmds.c
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 3bd4d101d3..dab4def753 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3067,7 +3067,7 @@ T: git https://github.com/stefanha/qemu.git tracing
> TPM
> M: Stefan Berger <stefanb@linux.ibm.com>
> S: Maintained
> -F: softmmu/tpm.c
> +F: softmmu/tpm*
> F: hw/tpm/*
> F: include/hw/acpi/tpm.h
> F: include/sysemu/tpm*
> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> index 6b1d5358f7..81f63fa8ec 100644
> --- a/monitor/hmp-cmds.c
> +++ b/monitor/hmp-cmds.c
> @@ -22,7 +22,6 @@
> #include "qapi/qapi-commands-misc.h"
> #include "qapi/qapi-commands-run-state.h"
> #include "qapi/qapi-commands-stats.h"
> -#include "qapi/qapi-commands-tpm.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qerror.h"
> #include "qemu/cutils.h"
> @@ -126,59 +125,6 @@ void hmp_info_pic(Monitor *mon, const QDict *qdict)
> hmp_info_pic_foreach, mon);
> }
>
> -void hmp_info_tpm(Monitor *mon, const QDict *qdict)
> -{
> -#ifdef CONFIG_TPM
> - TPMInfoList *info_list, *info;
> - Error *err = NULL;
> - unsigned int c = 0;
> - TPMPassthroughOptions *tpo;
> - TPMEmulatorOptions *teo;
> -
> - info_list = qmp_query_tpm(&err);
> - if (err) {
> - monitor_printf(mon, "TPM device not supported\n");
> - error_free(err);
> - return;
> - }
> -
> - if (info_list) {
> - monitor_printf(mon, "TPM device:\n");
> - }
> -
> - for (info = info_list; info; info = info->next) {
> - TPMInfo *ti = info->value;
> - monitor_printf(mon, " tpm%d: model=%s\n",
> - c, TpmModel_str(ti->model));
> -
> - monitor_printf(mon, " \\ %s: type=%s",
> - ti->id, TpmType_str(ti->options->type));
> -
> - switch (ti->options->type) {
> - case TPM_TYPE_PASSTHROUGH:
> - tpo = ti->options->u.passthrough.data;
> - monitor_printf(mon, "%s%s%s%s",
> - tpo->path ? ",path=" : "",
> - tpo->path ?: "",
> - tpo->cancel_path ? ",cancel-path=" : "",
> - tpo->cancel_path ?: "");
> - break;
> - case TPM_TYPE_EMULATOR:
> - teo = ti->options->u.emulator.data;
> - monitor_printf(mon, ",chardev=%s", teo->chardev);
> - break;
> - case TPM_TYPE__MAX:
> - break;
> - }
> - monitor_printf(mon, "\n");
> - c++;
> - }
> - qapi_free_TPMInfoList(info_list);
> -#else
> - monitor_printf(mon, "TPM device not supported\n");
> -#endif /* CONFIG_TPM */
> -}
> -
> void hmp_quit(Monitor *mon, const QDict *qdict)
> {
> monitor_suspend(mon);
> diff --git a/softmmu/tpm-hmp-cmds.c b/softmmu/tpm-hmp-cmds.c
> new file mode 100644
> index 0000000000..9ed6ad6c4d
> --- /dev/null
> +++ b/softmmu/tpm-hmp-cmds.c
> @@ -0,0 +1,65 @@
> +/*
> + * HMP commands related to TPM
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or
> + * (at your option) any later version.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/qapi-commands-tpm.h"
> +#include "monitor/monitor.h"
> +#include "monitor/hmp.h"
> +#include "qapi/error.h"
> +
> +void hmp_info_tpm(Monitor *mon, const QDict *qdict)
> +{
> +#ifdef CONFIG_TPM
> + TPMInfoList *info_list, *info;
> + Error *err = NULL;
> + unsigned int c = 0;
> + TPMPassthroughOptions *tpo;
> + TPMEmulatorOptions *teo;
> +
> + info_list = qmp_query_tpm(&err);
> + if (err) {
> + monitor_printf(mon, "TPM device not supported\n");
> + error_free(err);
> + return;
> + }
> +
> + if (info_list) {
> + monitor_printf(mon, "TPM device:\n");
> + }
> +
> + for (info = info_list; info; info = info->next) {
> + TPMInfo *ti = info->value;
> + monitor_printf(mon, " tpm%d: model=%s\n",
> + c, TpmModel_str(ti->model));
> +
> + monitor_printf(mon, " \\ %s: type=%s",
> + ti->id, TpmType_str(ti->options->type));
> +
> + switch (ti->options->type) {
> + case TPM_TYPE_PASSTHROUGH:
> + tpo = ti->options->u.passthrough.data;
> + monitor_printf(mon, "%s%s%s%s",
> + tpo->path ? ",path=" : "",
> + tpo->path ?: "",
> + tpo->cancel_path ? ",cancel-path=" : "",
> + tpo->cancel_path ?: "");
> + break;
> + case TPM_TYPE_EMULATOR:
> + teo = ti->options->u.emulator.data;
> + monitor_printf(mon, ",chardev=%s", teo->chardev);
> + break;
> + case TPM_TYPE__MAX:
> + break;
> + }
> + monitor_printf(mon, "\n");
> + c++;
> + }
> + qapi_free_TPMInfoList(info_list);
> +#else
> + monitor_printf(mon, "TPM device not supported\n");
> +#endif /* CONFIG_TPM */
> +}
> diff --git a/softmmu/meson.build b/softmmu/meson.build
> index 3272af1f31..efbf4ec029 100644
> --- a/softmmu/meson.build
> +++ b/softmmu/meson.build
> @@ -25,6 +25,7 @@ softmmu_ss.add(files(
> 'rtc.c',
> 'runstate-action.c',
> 'runstate.c',
> + 'tpm-hmp-cmds.c',
> 'vl.c',
> ), sdl, libpmem, libdaxctl)
>
^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH 21/32] runstate: Move HMP commands from monitor/ to softmmu/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (19 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 20/32] tpm: Move HMP commands from monitor/ to softmmu/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 22/32] stats: Move QMP commands from monitor/ to stats/ Markus Armbruster
` (10 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS section "Human
Monitor (HMP)" and "QMP" to "Main loop".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
MAINTAINERS | 3 +-
include/monitor/hmp.h | 2 +
monitor/hmp-cmds.c | 20 ---------
monitor/misc.c | 42 -------------------
softmmu/runstate-hmp-cmds.c | 82 +++++++++++++++++++++++++++++++++++++
softmmu/meson.build | 1 +
6 files changed, 86 insertions(+), 64 deletions(-)
create mode 100644 softmmu/runstate-hmp-cmds.c
diff --git a/MAINTAINERS b/MAINTAINERS
index dab4def753..b2f1d2518b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2804,8 +2804,7 @@ F: softmmu/cpus.c
F: softmmu/cpu-throttle.c
F: softmmu/cpu-timers.c
F: softmmu/icount.c
-F: softmmu/runstate-action.c
-F: softmmu/runstate.c
+F: softmmu/runstate*
F: qapi/run-state.json
Read, Copy, Update (RCU)
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index a248ee9ed1..941da9fde6 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -156,6 +156,8 @@ void hmp_info_vcpu_dirty_limit(Monitor *mon, const QDict *qdict);
void hmp_human_readable_text_helper(Monitor *mon,
HumanReadableText *(*qmp_handler)(Error **));
void hmp_info_stats(Monitor *mon, const QDict *qdict);
+void hmp_singlestep(Monitor *mon, const QDict *qdict);
+void hmp_watchdog_action(Monitor *mon, const QDict *qdict);
void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict);
void hmp_info_capture(Monitor *mon, const QDict *qdict);
void hmp_stopcapture(Monitor *mon, const QDict *qdict);
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 81f63fa8ec..34e98b0e0b 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -20,7 +20,6 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-stats.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
@@ -80,25 +79,6 @@ void hmp_info_version(Monitor *mon, const QDict *qdict)
qapi_free_VersionInfo(info);
}
-void hmp_info_status(Monitor *mon, const QDict *qdict)
-{
- StatusInfo *info;
-
- info = qmp_query_status(NULL);
-
- monitor_printf(mon, "VM status: %s%s",
- info->running ? "running" : "paused",
- info->singlestep ? " (single step mode)" : "");
-
- if (!info->running && info->status != RUN_STATE_PAUSED) {
- monitor_printf(mon, " (%s)", RunState_str(info->status));
- }
-
- monitor_printf(mon, "\n");
-
- qapi_free_StatusInfo(info);
-}
-
static int hmp_info_pic_foreach(Object *obj, void *opaque)
{
InterruptStatsProvider *intc;
diff --git a/monitor/misc.c b/monitor/misc.c
index ff3002a880..a2584df0ca 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -43,7 +43,6 @@
#include "block/block-hmp-cmds.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-init-commands.h"
#include "qapi/error.h"
@@ -319,18 +318,6 @@ static void hmp_log(Monitor *mon, const QDict *qdict)
}
}
-static void hmp_singlestep(Monitor *mon, const QDict *qdict)
-{
- const char *option = qdict_get_try_str(qdict, "option");
- if (!option || !strcmp(option, "on")) {
- singlestep = 1;
- } else if (!strcmp(option, "off")) {
- singlestep = 0;
- } else {
- monitor_printf(mon, "unexpected option %s\n", option);
- }
-}
-
static void hmp_gdbserver(Monitor *mon, const QDict *qdict)
{
const char *device = qdict_get_try_str(qdict, "device");
@@ -349,22 +336,6 @@ static void hmp_gdbserver(Monitor *mon, const QDict *qdict)
}
}
-static void hmp_watchdog_action(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- WatchdogAction action;
- char *qapi_value;
-
- qapi_value = g_ascii_strdown(qdict_get_str(qdict, "action"), -1);
- action = qapi_enum_parse(&WatchdogAction_lookup, qapi_value, -1, &err);
- g_free(qapi_value);
- if (err) {
- hmp_handle_error(mon, err);
- return;
- }
- qmp_watchdog_set_action(action, &error_abort);
-}
-
static void monitor_printc(Monitor *mon, int c)
{
monitor_printf(mon, "'");
@@ -1317,19 +1288,6 @@ void device_del_completion(ReadLineState *rs, int nb_args, const char *str)
peripheral_device_del_completion(rs, str);
}
-void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- int i;
-
- if (nb_args != 2) {
- return;
- }
- readline_set_completion_index(rs, strlen(str));
- for (i = 0; i < WATCHDOG_ACTION__MAX; i++) {
- readline_add_completion_of(rs, str, WatchdogAction_str(i));
- }
-}
-
static int
compare_mon_cmd(const void *a, const void *b)
{
diff --git a/softmmu/runstate-hmp-cmds.c b/softmmu/runstate-hmp-cmds.c
new file mode 100644
index 0000000000..d55a7d4db8
--- /dev/null
+++ b/softmmu/runstate-hmp-cmds.c
@@ -0,0 +1,82 @@
+/*
+ * HMP commands related to run state
+ *
+ * Copyright IBM, Corp. 2011
+ *
+ * Authors:
+ * Anthony Liguori <aliguori@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
+ */
+
+#include "qemu/osdep.h"
+#include "exec/cpu-common.h"
+#include "monitor/hmp.h"
+#include "monitor/monitor.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-run-state.h"
+#include "qapi/qmp/qdict.h"
+
+void hmp_info_status(Monitor *mon, const QDict *qdict)
+{
+ StatusInfo *info;
+
+ info = qmp_query_status(NULL);
+
+ monitor_printf(mon, "VM status: %s%s",
+ info->running ? "running" : "paused",
+ info->singlestep ? " (single step mode)" : "");
+
+ if (!info->running && info->status != RUN_STATE_PAUSED) {
+ monitor_printf(mon, " (%s)", RunState_str(info->status));
+ }
+
+ monitor_printf(mon, "\n");
+
+ qapi_free_StatusInfo(info);
+}
+
+void hmp_singlestep(Monitor *mon, const QDict *qdict)
+{
+ const char *option = qdict_get_try_str(qdict, "option");
+ if (!option || !strcmp(option, "on")) {
+ singlestep = 1;
+ } else if (!strcmp(option, "off")) {
+ singlestep = 0;
+ } else {
+ monitor_printf(mon, "unexpected option %s\n", option);
+ }
+}
+
+void hmp_watchdog_action(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ WatchdogAction action;
+ char *qapi_value;
+
+ qapi_value = g_ascii_strdown(qdict_get_str(qdict, "action"), -1);
+ action = qapi_enum_parse(&WatchdogAction_lookup, qapi_value, -1, &err);
+ g_free(qapi_value);
+ if (err) {
+ hmp_handle_error(mon, err);
+ return;
+ }
+ qmp_watchdog_set_action(action, &error_abort);
+}
+
+void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ int i;
+
+ if (nb_args != 2) {
+ return;
+ }
+ readline_set_completion_index(rs, strlen(str));
+ for (i = 0; i < WATCHDOG_ACTION__MAX; i++) {
+ readline_add_completion_of(rs, str, WatchdogAction_str(i));
+ }
+}
diff --git a/softmmu/meson.build b/softmmu/meson.build
index efbf4ec029..1828db149c 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -24,6 +24,7 @@ softmmu_ss.add(files(
'qdev-monitor.c',
'rtc.c',
'runstate-action.c',
+ 'runstate-hmp-cmds.c',
'runstate.c',
'tpm-hmp-cmds.c',
'vl.c',
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 22/32] stats: Move QMP commands from monitor/ to stats/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (20 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 21/32] runstate: " Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 23/32] stats: Move HMP " Markus Armbruster
` (9 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS section "QMP" to new
section "Stats". Status is Orphan. Volunteers welcome!
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
MAINTAINERS | 5 +
meson.build | 1 +
include/{monitor => sysemu}/stats.h | 0
accel/kvm/kvm-all.c | 2 +-
monitor/qmp-cmds.c | 152 --------------------------
stats/stats-qmp-cmds.c | 162 ++++++++++++++++++++++++++++
stats/meson.build | 1 +
7 files changed, 170 insertions(+), 153 deletions(-)
rename include/{monitor => sysemu}/stats.h (100%)
create mode 100644 stats/stats-qmp-cmds.c
create mode 100644 stats/meson.build
diff --git a/MAINTAINERS b/MAINTAINERS
index b2f1d2518b..b377ac1476 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3038,6 +3038,11 @@ F: net/slirp.c
F: include/net/slirp.h
T: git https://people.debian.org/~sthibault/qemu.git slirp
+Stats
+S: Orphan
+F: include/sysemu/stats.h
+F: stats/
+
Streams
M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
S: Maintained
diff --git a/meson.build b/meson.build
index 6d3b665629..57b35d721e 100644
--- a/meson.build
+++ b/meson.build
@@ -3132,6 +3132,7 @@ subdir('monitor')
subdir('net')
subdir('replay')
subdir('semihosting')
+subdir('stats')
subdir('tcg')
subdir('fpu')
subdir('accel')
diff --git a/include/monitor/stats.h b/include/sysemu/stats.h
similarity index 100%
rename from include/monitor/stats.h
rename to include/sysemu/stats.h
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 7e6a6076b1..9b26582655 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -50,7 +50,7 @@
#include "qemu/range.h"
#include "hw/boards.h"
-#include "monitor/stats.h"
+#include "sysemu/stats.h"
/* This check must be after config-host.h is included */
#ifdef CONFIG_EVENTFD
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index 4a8d1e9a15..ab23e52f97 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -25,13 +25,11 @@
#include "qapi/qapi-commands-acpi.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qapi-commands-stats.h"
#include "qapi/type-helpers.h"
#include "hw/mem/memory-device.h"
#include "hw/acpi/acpi_dev_interface.h"
#include "hw/intc/intc.h"
#include "hw/rdma/rdma.h"
-#include "monitor/stats.h"
NameInfo *qmp_query_name(Error **errp)
{
@@ -174,153 +172,3 @@ ACPIOSTInfoList *qmp_query_acpi_ospm_status(Error **errp)
return head;
}
-
-typedef struct StatsCallbacks {
- StatsProvider provider;
- StatRetrieveFunc *stats_cb;
- SchemaRetrieveFunc *schemas_cb;
- QTAILQ_ENTRY(StatsCallbacks) next;
-} StatsCallbacks;
-
-static QTAILQ_HEAD(, StatsCallbacks) stats_callbacks =
- QTAILQ_HEAD_INITIALIZER(stats_callbacks);
-
-void add_stats_callbacks(StatsProvider provider,
- StatRetrieveFunc *stats_fn,
- SchemaRetrieveFunc *schemas_fn)
-{
- StatsCallbacks *entry = g_new(StatsCallbacks, 1);
- entry->provider = provider;
- entry->stats_cb = stats_fn;
- entry->schemas_cb = schemas_fn;
-
- QTAILQ_INSERT_TAIL(&stats_callbacks, entry, next);
-}
-
-static bool invoke_stats_cb(StatsCallbacks *entry,
- StatsResultList **stats_results,
- StatsFilter *filter, StatsRequest *request,
- Error **errp)
-{
- ERRP_GUARD();
- strList *targets = NULL;
- strList *names = NULL;
-
- if (request) {
- if (request->provider != entry->provider) {
- return true;
- }
- if (request->has_names && !request->names) {
- return true;
- }
- names = request->has_names ? request->names : NULL;
- }
-
- switch (filter->target) {
- case STATS_TARGET_VM:
- break;
- case STATS_TARGET_VCPU:
- if (filter->u.vcpu.has_vcpus) {
- if (!filter->u.vcpu.vcpus) {
- /* No targets allowed? Return no statistics. */
- return true;
- }
- targets = filter->u.vcpu.vcpus;
- }
- break;
- default:
- abort();
- }
-
- entry->stats_cb(stats_results, filter->target, names, targets, errp);
- if (*errp) {
- qapi_free_StatsResultList(*stats_results);
- *stats_results = NULL;
- return false;
- }
- return true;
-}
-
-StatsResultList *qmp_query_stats(StatsFilter *filter, Error **errp)
-{
- StatsResultList *stats_results = NULL;
- StatsCallbacks *entry;
- StatsRequestList *request;
-
- QTAILQ_FOREACH(entry, &stats_callbacks, next) {
- if (filter->has_providers) {
- for (request = filter->providers; request; request = request->next) {
- if (!invoke_stats_cb(entry, &stats_results, filter,
- request->value, errp)) {
- break;
- }
- }
- } else {
- if (!invoke_stats_cb(entry, &stats_results, filter, NULL, errp)) {
- break;
- }
- }
- }
-
- return stats_results;
-}
-
-StatsSchemaList *qmp_query_stats_schemas(bool has_provider,
- StatsProvider provider,
- Error **errp)
-{
- ERRP_GUARD();
- StatsSchemaList *stats_results = NULL;
- StatsCallbacks *entry;
-
- QTAILQ_FOREACH(entry, &stats_callbacks, next) {
- if (!has_provider || provider == entry->provider) {
- entry->schemas_cb(&stats_results, errp);
- if (*errp) {
- qapi_free_StatsSchemaList(stats_results);
- return NULL;
- }
- }
- }
-
- return stats_results;
-}
-
-void add_stats_entry(StatsResultList **stats_results, StatsProvider provider,
- const char *qom_path, StatsList *stats_list)
-{
- StatsResult *entry = g_new0(StatsResult, 1);
-
- entry->provider = provider;
- entry->qom_path = g_strdup(qom_path);
- entry->stats = stats_list;
-
- QAPI_LIST_PREPEND(*stats_results, entry);
-}
-
-void add_stats_schema(StatsSchemaList **schema_results,
- StatsProvider provider, StatsTarget target,
- StatsSchemaValueList *stats_list)
-{
- StatsSchema *entry = g_new0(StatsSchema, 1);
-
- entry->provider = provider;
- entry->target = target;
- entry->stats = stats_list;
- QAPI_LIST_PREPEND(*schema_results, entry);
-}
-
-bool apply_str_list_filter(const char *string, strList *list)
-{
- strList *str_list = NULL;
-
- if (!list) {
- return true;
- }
- for (str_list = list; str_list; str_list = str_list->next) {
- if (g_str_equal(string, str_list->value)) {
- return true;
- }
- }
- return false;
-}
diff --git a/stats/stats-qmp-cmds.c b/stats/stats-qmp-cmds.c
new file mode 100644
index 0000000000..bc973747fb
--- /dev/null
+++ b/stats/stats-qmp-cmds.c
@@ -0,0 +1,162 @@
+/*
+ * QMP commands related to stats
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * (at your option) any later version.
+ */
+
+#include "qemu/osdep.h"
+#include "sysemu/stats.h"
+#include "qapi/qapi-commands-stats.h"
+#include "qemu/queue.h"
+#include "qapi/error.h"
+
+typedef struct StatsCallbacks {
+ StatsProvider provider;
+ StatRetrieveFunc *stats_cb;
+ SchemaRetrieveFunc *schemas_cb;
+ QTAILQ_ENTRY(StatsCallbacks) next;
+} StatsCallbacks;
+
+static QTAILQ_HEAD(, StatsCallbacks) stats_callbacks =
+ QTAILQ_HEAD_INITIALIZER(stats_callbacks);
+
+void add_stats_callbacks(StatsProvider provider,
+ StatRetrieveFunc *stats_fn,
+ SchemaRetrieveFunc *schemas_fn)
+{
+ StatsCallbacks *entry = g_new(StatsCallbacks, 1);
+ entry->provider = provider;
+ entry->stats_cb = stats_fn;
+ entry->schemas_cb = schemas_fn;
+
+ QTAILQ_INSERT_TAIL(&stats_callbacks, entry, next);
+}
+
+static bool invoke_stats_cb(StatsCallbacks *entry,
+ StatsResultList **stats_results,
+ StatsFilter *filter, StatsRequest *request,
+ Error **errp)
+{
+ ERRP_GUARD();
+ strList *targets = NULL;
+ strList *names = NULL;
+
+ if (request) {
+ if (request->provider != entry->provider) {
+ return true;
+ }
+ if (request->has_names && !request->names) {
+ return true;
+ }
+ names = request->has_names ? request->names : NULL;
+ }
+
+ switch (filter->target) {
+ case STATS_TARGET_VM:
+ break;
+ case STATS_TARGET_VCPU:
+ if (filter->u.vcpu.has_vcpus) {
+ if (!filter->u.vcpu.vcpus) {
+ /* No targets allowed? Return no statistics. */
+ return true;
+ }
+ targets = filter->u.vcpu.vcpus;
+ }
+ break;
+ default:
+ abort();
+ }
+
+ entry->stats_cb(stats_results, filter->target, names, targets, errp);
+ if (*errp) {
+ qapi_free_StatsResultList(*stats_results);
+ *stats_results = NULL;
+ return false;
+ }
+ return true;
+}
+
+StatsResultList *qmp_query_stats(StatsFilter *filter, Error **errp)
+{
+ StatsResultList *stats_results = NULL;
+ StatsCallbacks *entry;
+ StatsRequestList *request;
+
+ QTAILQ_FOREACH(entry, &stats_callbacks, next) {
+ if (filter->has_providers) {
+ for (request = filter->providers; request; request = request->next) {
+ if (!invoke_stats_cb(entry, &stats_results, filter,
+ request->value, errp)) {
+ break;
+ }
+ }
+ } else {
+ if (!invoke_stats_cb(entry, &stats_results, filter, NULL, errp)) {
+ break;
+ }
+ }
+ }
+
+ return stats_results;
+}
+
+StatsSchemaList *qmp_query_stats_schemas(bool has_provider,
+ StatsProvider provider,
+ Error **errp)
+{
+ ERRP_GUARD();
+ StatsSchemaList *stats_results = NULL;
+ StatsCallbacks *entry;
+
+ QTAILQ_FOREACH(entry, &stats_callbacks, next) {
+ if (!has_provider || provider == entry->provider) {
+ entry->schemas_cb(&stats_results, errp);
+ if (*errp) {
+ qapi_free_StatsSchemaList(stats_results);
+ return NULL;
+ }
+ }
+ }
+
+ return stats_results;
+}
+
+void add_stats_entry(StatsResultList **stats_results, StatsProvider provider,
+ const char *qom_path, StatsList *stats_list)
+{
+ StatsResult *entry = g_new0(StatsResult, 1);
+
+ entry->provider = provider;
+ entry->qom_path = g_strdup(qom_path);
+ entry->stats = stats_list;
+
+ QAPI_LIST_PREPEND(*stats_results, entry);
+}
+
+void add_stats_schema(StatsSchemaList **schema_results,
+ StatsProvider provider, StatsTarget target,
+ StatsSchemaValueList *stats_list)
+{
+ StatsSchema *entry = g_new0(StatsSchema, 1);
+
+ entry->provider = provider;
+ entry->target = target;
+ entry->stats = stats_list;
+ QAPI_LIST_PREPEND(*schema_results, entry);
+}
+
+bool apply_str_list_filter(const char *string, strList *list)
+{
+ strList *str_list = NULL;
+
+ if (!list) {
+ return true;
+ }
+ for (str_list = list; str_list; str_list = str_list->next) {
+ if (g_str_equal(string, str_list->value)) {
+ return true;
+ }
+ }
+ return false;
+}
diff --git a/stats/meson.build b/stats/meson.build
new file mode 100644
index 0000000000..4ddb4d096b
--- /dev/null
+++ b/stats/meson.build
@@ -0,0 +1 @@
+softmmu_ss.add(files('stats-qmp-cmds.c'))
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 23/32] stats: Move HMP commands from monitor/ to stats/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (21 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 22/32] stats: Move QMP commands from monitor/ to stats/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 24/32] acpi: Move the QMP command from monitor/ to hw/acpi/ Markus Armbruster
` (8 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves these commands from MAINTAINERS section "Human
Monitor (HMP)" to section "Stats".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor/hmp-cmds.c | 234 --------------------------------------
stats/stats-hmp-cmds.c | 247 +++++++++++++++++++++++++++++++++++++++++
stats/meson.build | 2 +-
3 files changed, 248 insertions(+), 235 deletions(-)
create mode 100644 stats/stats-hmp-cmds.c
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 34e98b0e0b..8a3d56bcde 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -20,11 +20,9 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qapi-commands-stats.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
#include "qemu/cutils.h"
-#include "hw/core/cpu.h"
#include "hw/intc/intc.h"
bool hmp_handle_error(Monitor *mon, Error *err)
@@ -226,235 +224,3 @@ void hmp_info_iothreads(Monitor *mon, const QDict *qdict)
qapi_free_IOThreadInfoList(info_list);
}
-
-static void print_stats_schema_value(Monitor *mon, StatsSchemaValue *value)
-{
- const char *unit = NULL;
- monitor_printf(mon, " %s (%s%s", value->name, StatsType_str(value->type),
- value->has_unit || value->exponent ? ", " : "");
-
- if (value->has_unit) {
- if (value->unit == STATS_UNIT_SECONDS) {
- unit = "s";
- } else if (value->unit == STATS_UNIT_BYTES) {
- unit = "B";
- }
- }
-
- if (unit && value->base == 10 &&
- value->exponent >= -18 && value->exponent <= 18 &&
- value->exponent % 3 == 0) {
- monitor_puts(mon, si_prefix(value->exponent));
- } else if (unit && value->base == 2 &&
- value->exponent >= 0 && value->exponent <= 60 &&
- value->exponent % 10 == 0) {
-
- monitor_puts(mon, iec_binary_prefix(value->exponent));
- } else if (value->exponent) {
- /* Use exponential notation and write the unit's English name */
- monitor_printf(mon, "* %d^%d%s",
- value->base, value->exponent,
- value->has_unit ? " " : "");
- unit = NULL;
- }
-
- if (value->has_unit) {
- monitor_puts(mon, unit ? unit : StatsUnit_str(value->unit));
- }
-
- /* Print bucket size for linear histograms */
- if (value->type == STATS_TYPE_LINEAR_HISTOGRAM && value->has_bucket_size) {
- monitor_printf(mon, ", bucket size=%d", value->bucket_size);
- }
- monitor_printf(mon, ")");
-}
-
-static StatsSchemaValueList *find_schema_value_list(
- StatsSchemaList *list, StatsProvider provider,
- StatsTarget target)
-{
- StatsSchemaList *node;
-
- for (node = list; node; node = node->next) {
- if (node->value->provider == provider &&
- node->value->target == target) {
- return node->value->stats;
- }
- }
- return NULL;
-}
-
-static void print_stats_results(Monitor *mon, StatsTarget target,
- bool show_provider,
- StatsResult *result,
- StatsSchemaList *schema)
-{
- /* Find provider schema */
- StatsSchemaValueList *schema_value_list =
- find_schema_value_list(schema, result->provider, target);
- StatsList *stats_list;
-
- if (!schema_value_list) {
- monitor_printf(mon, "failed to find schema list for %s\n",
- StatsProvider_str(result->provider));
- return;
- }
-
- if (show_provider) {
- monitor_printf(mon, "provider: %s\n",
- StatsProvider_str(result->provider));
- }
-
- for (stats_list = result->stats; stats_list;
- stats_list = stats_list->next,
- schema_value_list = schema_value_list->next) {
-
- Stats *stats = stats_list->value;
- StatsValue *stats_value = stats->value;
- StatsSchemaValue *schema_value = schema_value_list->value;
-
- /* Find schema entry */
- while (!g_str_equal(stats->name, schema_value->name)) {
- if (!schema_value_list->next) {
- monitor_printf(mon, "failed to find schema entry for %s\n",
- stats->name);
- return;
- }
- schema_value_list = schema_value_list->next;
- schema_value = schema_value_list->value;
- }
-
- print_stats_schema_value(mon, schema_value);
-
- if (stats_value->type == QTYPE_QNUM) {
- monitor_printf(mon, ": %" PRId64 "\n", stats_value->u.scalar);
- } else if (stats_value->type == QTYPE_QBOOL) {
- monitor_printf(mon, ": %s\n", stats_value->u.boolean ? "yes" : "no");
- } else if (stats_value->type == QTYPE_QLIST) {
- uint64List *list;
- int i;
-
- monitor_printf(mon, ": ");
- for (list = stats_value->u.list, i = 1;
- list;
- list = list->next, i++) {
- monitor_printf(mon, "[%d]=%" PRId64 " ", i, list->value);
- }
- monitor_printf(mon, "\n");
- }
- }
-}
-
-/* Create the StatsFilter that is needed for an "info stats" invocation. */
-static StatsFilter *stats_filter(StatsTarget target, const char *names,
- int cpu_index, StatsProvider provider)
-{
- StatsFilter *filter = g_malloc0(sizeof(*filter));
- StatsProvider provider_idx;
- StatsRequestList *request_list = NULL;
-
- filter->target = target;
- switch (target) {
- case STATS_TARGET_VM:
- break;
- case STATS_TARGET_VCPU:
- {
- strList *vcpu_list = NULL;
- CPUState *cpu = qemu_get_cpu(cpu_index);
- char *canonical_path = object_get_canonical_path(OBJECT(cpu));
-
- QAPI_LIST_PREPEND(vcpu_list, canonical_path);
- filter->u.vcpu.has_vcpus = true;
- filter->u.vcpu.vcpus = vcpu_list;
- break;
- }
- default:
- break;
- }
-
- if (!names && provider == STATS_PROVIDER__MAX) {
- return filter;
- }
-
- /*
- * "info stats" can only query either one or all the providers. Querying
- * by name, but not by provider, requires the creation of one filter per
- * provider.
- */
- for (provider_idx = 0; provider_idx < STATS_PROVIDER__MAX; provider_idx++) {
- if (provider == STATS_PROVIDER__MAX || provider == provider_idx) {
- StatsRequest *request = g_new0(StatsRequest, 1);
- request->provider = provider_idx;
- if (names && !g_str_equal(names, "*")) {
- request->has_names = true;
- request->names = hmp_split_at_comma(names);
- }
- QAPI_LIST_PREPEND(request_list, request);
- }
- }
-
- filter->has_providers = true;
- filter->providers = request_list;
- return filter;
-}
-
-void hmp_info_stats(Monitor *mon, const QDict *qdict)
-{
- const char *target_str = qdict_get_str(qdict, "target");
- const char *provider_str = qdict_get_try_str(qdict, "provider");
- const char *names = qdict_get_try_str(qdict, "names");
-
- StatsProvider provider = STATS_PROVIDER__MAX;
- StatsTarget target;
- Error *err = NULL;
- g_autoptr(StatsSchemaList) schema = NULL;
- g_autoptr(StatsResultList) stats = NULL;
- g_autoptr(StatsFilter) filter = NULL;
- StatsResultList *entry;
-
- target = qapi_enum_parse(&StatsTarget_lookup, target_str, -1, &err);
- if (err) {
- monitor_printf(mon, "invalid stats target %s\n", target_str);
- goto exit_no_print;
- }
- if (provider_str) {
- provider = qapi_enum_parse(&StatsProvider_lookup, provider_str, -1, &err);
- if (err) {
- monitor_printf(mon, "invalid stats provider %s\n", provider_str);
- goto exit_no_print;
- }
- }
-
- schema = qmp_query_stats_schemas(provider_str ? true : false,
- provider, &err);
- if (err) {
- goto exit;
- }
-
- switch (target) {
- case STATS_TARGET_VM:
- filter = stats_filter(target, names, -1, provider);
- break;
- case STATS_TARGET_VCPU: {}
- int cpu_index = monitor_get_cpu_index(mon);
- filter = stats_filter(target, names, cpu_index, provider);
- break;
- default:
- abort();
- }
-
- stats = qmp_query_stats(filter, &err);
- if (err) {
- goto exit;
- }
- for (entry = stats; entry; entry = entry->next) {
- print_stats_results(mon, target, provider_str == NULL, entry->value, schema);
- }
-
-exit:
- if (err) {
- monitor_printf(mon, "%s\n", error_get_pretty(err));
- }
-exit_no_print:
- error_free(err);
-}
diff --git a/stats/stats-hmp-cmds.c b/stats/stats-hmp-cmds.c
new file mode 100644
index 0000000000..531e35d128
--- /dev/null
+++ b/stats/stats-hmp-cmds.c
@@ -0,0 +1,247 @@
+/*
+ * HMP commands related to stats
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * (at your option) any later version.
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/qapi-commands-stats.h"
+#include "monitor/hmp.h"
+#include "monitor/monitor.h"
+#include "qemu/cutils.h"
+#include "hw/core/cpu.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/error.h"
+
+static void print_stats_schema_value(Monitor *mon, StatsSchemaValue *value)
+{
+ const char *unit = NULL;
+ monitor_printf(mon, " %s (%s%s", value->name, StatsType_str(value->type),
+ value->has_unit || value->exponent ? ", " : "");
+
+ if (value->has_unit) {
+ if (value->unit == STATS_UNIT_SECONDS) {
+ unit = "s";
+ } else if (value->unit == STATS_UNIT_BYTES) {
+ unit = "B";
+ }
+ }
+
+ if (unit && value->base == 10 &&
+ value->exponent >= -18 && value->exponent <= 18 &&
+ value->exponent % 3 == 0) {
+ monitor_puts(mon, si_prefix(value->exponent));
+ } else if (unit && value->base == 2 &&
+ value->exponent >= 0 && value->exponent <= 60 &&
+ value->exponent % 10 == 0) {
+
+ monitor_puts(mon, iec_binary_prefix(value->exponent));
+ } else if (value->exponent) {
+ /* Use exponential notation and write the unit's English name */
+ monitor_printf(mon, "* %d^%d%s",
+ value->base, value->exponent,
+ value->has_unit ? " " : "");
+ unit = NULL;
+ }
+
+ if (value->has_unit) {
+ monitor_puts(mon, unit ? unit : StatsUnit_str(value->unit));
+ }
+
+ /* Print bucket size for linear histograms */
+ if (value->type == STATS_TYPE_LINEAR_HISTOGRAM && value->has_bucket_size) {
+ monitor_printf(mon, ", bucket size=%d", value->bucket_size);
+ }
+ monitor_printf(mon, ")");
+}
+
+static StatsSchemaValueList *find_schema_value_list(
+ StatsSchemaList *list, StatsProvider provider,
+ StatsTarget target)
+{
+ StatsSchemaList *node;
+
+ for (node = list; node; node = node->next) {
+ if (node->value->provider == provider &&
+ node->value->target == target) {
+ return node->value->stats;
+ }
+ }
+ return NULL;
+}
+
+static void print_stats_results(Monitor *mon, StatsTarget target,
+ bool show_provider,
+ StatsResult *result,
+ StatsSchemaList *schema)
+{
+ /* Find provider schema */
+ StatsSchemaValueList *schema_value_list =
+ find_schema_value_list(schema, result->provider, target);
+ StatsList *stats_list;
+
+ if (!schema_value_list) {
+ monitor_printf(mon, "failed to find schema list for %s\n",
+ StatsProvider_str(result->provider));
+ return;
+ }
+
+ if (show_provider) {
+ monitor_printf(mon, "provider: %s\n",
+ StatsProvider_str(result->provider));
+ }
+
+ for (stats_list = result->stats; stats_list;
+ stats_list = stats_list->next,
+ schema_value_list = schema_value_list->next) {
+
+ Stats *stats = stats_list->value;
+ StatsValue *stats_value = stats->value;
+ StatsSchemaValue *schema_value = schema_value_list->value;
+
+ /* Find schema entry */
+ while (!g_str_equal(stats->name, schema_value->name)) {
+ if (!schema_value_list->next) {
+ monitor_printf(mon, "failed to find schema entry for %s\n",
+ stats->name);
+ return;
+ }
+ schema_value_list = schema_value_list->next;
+ schema_value = schema_value_list->value;
+ }
+
+ print_stats_schema_value(mon, schema_value);
+
+ if (stats_value->type == QTYPE_QNUM) {
+ monitor_printf(mon, ": %" PRId64 "\n", stats_value->u.scalar);
+ } else if (stats_value->type == QTYPE_QBOOL) {
+ monitor_printf(mon, ": %s\n", stats_value->u.boolean ? "yes" : "no");
+ } else if (stats_value->type == QTYPE_QLIST) {
+ uint64List *list;
+ int i;
+
+ monitor_printf(mon, ": ");
+ for (list = stats_value->u.list, i = 1;
+ list;
+ list = list->next, i++) {
+ monitor_printf(mon, "[%d]=%" PRId64 " ", i, list->value);
+ }
+ monitor_printf(mon, "\n");
+ }
+ }
+}
+
+/* Create the StatsFilter that is needed for an "info stats" invocation. */
+static StatsFilter *stats_filter(StatsTarget target, const char *names,
+ int cpu_index, StatsProvider provider)
+{
+ StatsFilter *filter = g_malloc0(sizeof(*filter));
+ StatsProvider provider_idx;
+ StatsRequestList *request_list = NULL;
+
+ filter->target = target;
+ switch (target) {
+ case STATS_TARGET_VM:
+ break;
+ case STATS_TARGET_VCPU:
+ {
+ strList *vcpu_list = NULL;
+ CPUState *cpu = qemu_get_cpu(cpu_index);
+ char *canonical_path = object_get_canonical_path(OBJECT(cpu));
+
+ QAPI_LIST_PREPEND(vcpu_list, canonical_path);
+ filter->u.vcpu.has_vcpus = true;
+ filter->u.vcpu.vcpus = vcpu_list;
+ break;
+ }
+ default:
+ break;
+ }
+
+ if (!names && provider == STATS_PROVIDER__MAX) {
+ return filter;
+ }
+
+ /*
+ * "info stats" can only query either one or all the providers. Querying
+ * by name, but not by provider, requires the creation of one filter per
+ * provider.
+ */
+ for (provider_idx = 0; provider_idx < STATS_PROVIDER__MAX; provider_idx++) {
+ if (provider == STATS_PROVIDER__MAX || provider == provider_idx) {
+ StatsRequest *request = g_new0(StatsRequest, 1);
+ request->provider = provider_idx;
+ if (names && !g_str_equal(names, "*")) {
+ request->has_names = true;
+ request->names = hmp_split_at_comma(names);
+ }
+ QAPI_LIST_PREPEND(request_list, request);
+ }
+ }
+
+ filter->has_providers = true;
+ filter->providers = request_list;
+ return filter;
+}
+
+void hmp_info_stats(Monitor *mon, const QDict *qdict)
+{
+ const char *target_str = qdict_get_str(qdict, "target");
+ const char *provider_str = qdict_get_try_str(qdict, "provider");
+ const char *names = qdict_get_try_str(qdict, "names");
+
+ StatsProvider provider = STATS_PROVIDER__MAX;
+ StatsTarget target;
+ Error *err = NULL;
+ g_autoptr(StatsSchemaList) schema = NULL;
+ g_autoptr(StatsResultList) stats = NULL;
+ g_autoptr(StatsFilter) filter = NULL;
+ StatsResultList *entry;
+
+ target = qapi_enum_parse(&StatsTarget_lookup, target_str, -1, &err);
+ if (err) {
+ monitor_printf(mon, "invalid stats target %s\n", target_str);
+ goto exit_no_print;
+ }
+ if (provider_str) {
+ provider = qapi_enum_parse(&StatsProvider_lookup, provider_str, -1, &err);
+ if (err) {
+ monitor_printf(mon, "invalid stats provider %s\n", provider_str);
+ goto exit_no_print;
+ }
+ }
+
+ schema = qmp_query_stats_schemas(provider_str ? true : false,
+ provider, &err);
+ if (err) {
+ goto exit;
+ }
+
+ switch (target) {
+ case STATS_TARGET_VM:
+ filter = stats_filter(target, names, -1, provider);
+ break;
+ case STATS_TARGET_VCPU: {}
+ int cpu_index = monitor_get_cpu_index(mon);
+ filter = stats_filter(target, names, cpu_index, provider);
+ break;
+ default:
+ abort();
+ }
+
+ stats = qmp_query_stats(filter, &err);
+ if (err) {
+ goto exit;
+ }
+ for (entry = stats; entry; entry = entry->next) {
+ print_stats_results(mon, target, provider_str == NULL, entry->value, schema);
+ }
+
+exit:
+ if (err) {
+ monitor_printf(mon, "%s\n", error_get_pretty(err));
+ }
+exit_no_print:
+ error_free(err);
+}
diff --git a/stats/meson.build b/stats/meson.build
index 4ddb4d096b..c4153f979e 100644
--- a/stats/meson.build
+++ b/stats/meson.build
@@ -1 +1 @@
-softmmu_ss.add(files('stats-qmp-cmds.c'))
+softmmu_ss.add(files('stats-hmp-cmds.c', 'stats-qmp-cmds.c'))
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 24/32] acpi: Move the QMP command from monitor/ to hw/acpi/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (22 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 23/32] stats: Move HMP " Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:25 ` Philippe Mathieu-Daudé
2023-01-24 12:19 ` [PATCH 25/32] qdev: Move HMP command completion from monitor to softmmu/ Markus Armbruster
` (7 subsequent siblings)
31 siblings, 1 reply; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves the command from MAINTAINERS section "QMP" to section
"ACPI/SMBIOS)".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/acpi/acpi-qmp-cmds.c | 30 ++++++++++++++++++++++++++++++
monitor/qmp-cmds.c | 21 ---------------------
hw/acpi/meson.build | 1 +
3 files changed, 31 insertions(+), 21 deletions(-)
create mode 100644 hw/acpi/acpi-qmp-cmds.c
diff --git a/hw/acpi/acpi-qmp-cmds.c b/hw/acpi/acpi-qmp-cmds.c
new file mode 100644
index 0000000000..2d47cac52c
--- /dev/null
+++ b/hw/acpi/acpi-qmp-cmds.c
@@ -0,0 +1,30 @@
+/*
+ * QMP commands related to ACPI
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * (at your option) any later version.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/acpi/acpi_dev_interface.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-acpi.h"
+
+ACPIOSTInfoList *qmp_query_acpi_ospm_status(Error **errp)
+{
+ bool ambig;
+ ACPIOSTInfoList *head = NULL;
+ ACPIOSTInfoList **prev = &head;
+ Object *obj = object_resolve_path_type("", TYPE_ACPI_DEVICE_IF, &ambig);
+
+ if (obj) {
+ AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(obj);
+ AcpiDeviceIf *adev = ACPI_DEVICE_IF(obj);
+
+ adevc->ospm_status(adev, &prev);
+ } else {
+ error_setg(errp, "command is not supported, missing ACPI device");
+ }
+
+ return head;
+}
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index ab23e52f97..cc22f3fcc7 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -22,12 +22,10 @@
#include "sysemu/runstate-action.h"
#include "sysemu/block-backend.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-acpi.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/type-helpers.h"
#include "hw/mem/memory-device.h"
-#include "hw/acpi/acpi_dev_interface.h"
#include "hw/intc/intc.h"
#include "hw/rdma/rdma.h"
@@ -153,22 +151,3 @@ void qmp_add_client(const char *protocol, const char *fdname,
close(fd);
}
}
-
-ACPIOSTInfoList *qmp_query_acpi_ospm_status(Error **errp)
-{
- bool ambig;
- ACPIOSTInfoList *head = NULL;
- ACPIOSTInfoList **prev = &head;
- Object *obj = object_resolve_path_type("", TYPE_ACPI_DEVICE_IF, &ambig);
-
- if (obj) {
- AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(obj);
- AcpiDeviceIf *adev = ACPI_DEVICE_IF(obj);
-
- adevc->ospm_status(adev, &prev);
- } else {
- error_setg(errp, "command is not supported, missing ACPI device");
- }
-
- return head;
-}
diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
index 30054a8cdc..7818846d88 100644
--- a/hw/acpi/meson.build
+++ b/hw/acpi/meson.build
@@ -36,3 +36,4 @@ softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'aml-build-stub
'acpi-mem-hotplug-stub.c', 'acpi-cpu-hotplug-stub.c',
'acpi-pci-hotplug-stub.c', 'acpi-nvdimm-stub.c',
'cxl-stub.c'))
+softmmu_ss.add(files('acpi-qmp-cmds.c'))
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* Re: [PATCH 24/32] acpi: Move the QMP command from monitor/ to hw/acpi/
2023-01-24 12:19 ` [PATCH 24/32] acpi: Move the QMP command from monitor/ to hw/acpi/ Markus Armbruster
@ 2023-01-24 12:25 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 44+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-01-24 12:25 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, wangyanan55, jasowang,
jiri, berrange, thuth, quintela, stefanb, stefanha, kvm,
qemu-block
On 24/1/23 13:19, Markus Armbruster wrote:
> This moves the command from MAINTAINERS section "QMP" to section
> "ACPI/SMBIOS)".
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> hw/acpi/acpi-qmp-cmds.c | 30 ++++++++++++++++++++++++++++++
> monitor/qmp-cmds.c | 21 ---------------------
> hw/acpi/meson.build | 1 +
> 3 files changed, 31 insertions(+), 21 deletions(-)
> create mode 100644 hw/acpi/acpi-qmp-cmds.c
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH 25/32] qdev: Move HMP command completion from monitor to softmmu/
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (23 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 24/32] acpi: Move the QMP command from monitor/ to hw/acpi/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 26/32] monitor: Split file descriptor passing stuff off misc.c Markus Armbruster
` (6 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This moves the completion code from MAINTAINERS sections "Human
Monitor (HMP)" and "QMP" to section "QOM".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor/misc.c | 82 ------------------------------------------
softmmu/qdev-monitor.c | 82 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/monitor/misc.c b/monitor/misc.c
index a2584df0ca..c76d583b4f 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -1206,88 +1206,6 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const char *name)
return ret;
}
-void device_add_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- GSList *list, *elt;
- size_t len;
-
- if (nb_args != 2) {
- return;
- }
-
- len = strlen(str);
- readline_set_completion_index(rs, len);
- list = elt = object_class_get_list(TYPE_DEVICE, false);
- while (elt) {
- DeviceClass *dc = OBJECT_CLASS_CHECK(DeviceClass, elt->data,
- TYPE_DEVICE);
-
- if (dc->user_creatable) {
- readline_add_completion_of(rs, str,
- object_class_get_name(OBJECT_CLASS(dc)));
- }
- elt = elt->next;
- }
- g_slist_free(list);
-}
-
-static int qdev_add_hotpluggable_device(Object *obj, void *opaque)
-{
- GSList **list = opaque;
- DeviceState *dev = (DeviceState *)object_dynamic_cast(obj, TYPE_DEVICE);
-
- if (dev == NULL) {
- return 0;
- }
-
- if (dev->realized && object_property_get_bool(obj, "hotpluggable", NULL)) {
- *list = g_slist_append(*list, dev);
- }
-
- return 0;
-}
-
-static GSList *qdev_build_hotpluggable_device_list(Object *peripheral)
-{
- GSList *list = NULL;
-
- object_child_foreach(peripheral, qdev_add_hotpluggable_device, &list);
-
- return list;
-}
-
-static void peripheral_device_del_completion(ReadLineState *rs,
- const char *str)
-{
- Object *peripheral = container_get(qdev_get_machine(), "/peripheral");
- GSList *list, *item;
-
- list = qdev_build_hotpluggable_device_list(peripheral);
- if (!list) {
- return;
- }
-
- for (item = list; item; item = g_slist_next(item)) {
- DeviceState *dev = item->data;
-
- if (dev->id) {
- readline_add_completion_of(rs, str, dev->id);
- }
- }
-
- g_slist_free(list);
-}
-
-void device_del_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- if (nb_args != 2) {
- return;
- }
-
- readline_set_completion_index(rs, strlen(str));
- peripheral_device_del_completion(rs, str);
-}
-
static int
compare_mon_cmd(const void *a, const void *b)
{
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index 4b0ef65780..b8d2c4dadd 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -973,6 +973,88 @@ void hmp_device_del(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
+void device_add_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ GSList *list, *elt;
+ size_t len;
+
+ if (nb_args != 2) {
+ return;
+ }
+
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+ list = elt = object_class_get_list(TYPE_DEVICE, false);
+ while (elt) {
+ DeviceClass *dc = OBJECT_CLASS_CHECK(DeviceClass, elt->data,
+ TYPE_DEVICE);
+
+ if (dc->user_creatable) {
+ readline_add_completion_of(rs, str,
+ object_class_get_name(OBJECT_CLASS(dc)));
+ }
+ elt = elt->next;
+ }
+ g_slist_free(list);
+}
+
+static int qdev_add_hotpluggable_device(Object *obj, void *opaque)
+{
+ GSList **list = opaque;
+ DeviceState *dev = (DeviceState *)object_dynamic_cast(obj, TYPE_DEVICE);
+
+ if (dev == NULL) {
+ return 0;
+ }
+
+ if (dev->realized && object_property_get_bool(obj, "hotpluggable", NULL)) {
+ *list = g_slist_append(*list, dev);
+ }
+
+ return 0;
+}
+
+static GSList *qdev_build_hotpluggable_device_list(Object *peripheral)
+{
+ GSList *list = NULL;
+
+ object_child_foreach(peripheral, qdev_add_hotpluggable_device, &list);
+
+ return list;
+}
+
+static void peripheral_device_del_completion(ReadLineState *rs,
+ const char *str)
+{
+ Object *peripheral = container_get(qdev_get_machine(), "/peripheral");
+ GSList *list, *item;
+
+ list = qdev_build_hotpluggable_device_list(peripheral);
+ if (!list) {
+ return;
+ }
+
+ for (item = list; item; item = g_slist_next(item)) {
+ DeviceState *dev = item->data;
+
+ if (dev->id) {
+ readline_add_completion_of(rs, str, dev->id);
+ }
+ }
+
+ g_slist_free(list);
+}
+
+void device_del_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ if (nb_args != 2) {
+ return;
+ }
+
+ readline_set_completion_index(rs, strlen(str));
+ peripheral_device_del_completion(rs, str);
+}
+
BlockBackend *blk_by_qdev_id(const char *id, Error **errp)
{
DeviceState *dev;
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 26/32] monitor: Split file descriptor passing stuff off misc.c
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (24 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 25/32] qdev: Move HMP command completion from monitor to softmmu/ Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 27/32] monitor: Move monitor_putc() next to monitor_puts & external linkage Markus Armbruster
` (5 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor/fds.c | 468 ++++++++++++++++++++++++++++++++++++++++++++
monitor/misc.c | 434 ----------------------------------------
monitor/meson.build | 1 +
3 files changed, 469 insertions(+), 434 deletions(-)
create mode 100644 monitor/fds.c
diff --git a/monitor/fds.c b/monitor/fds.c
new file mode 100644
index 0000000000..26b39a0ce6
--- /dev/null
+++ b/monitor/fds.c
@@ -0,0 +1,468 @@
+/*
+ * QEMU monitor file descriptor passing
+ *
+ * Copyright (c) 2003-2004 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "qemu/osdep.h"
+#include "monitor-internal.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-misc.h"
+#include "qapi/qmp/qerror.h"
+#include "qemu/ctype.h"
+#include "qemu/cutils.h"
+#include "sysemu/runstate.h"
+
+/* file descriptors passed via SCM_RIGHTS */
+typedef struct mon_fd_t mon_fd_t;
+struct mon_fd_t {
+ char *name;
+ int fd;
+ QLIST_ENTRY(mon_fd_t) next;
+};
+
+/* file descriptor associated with a file descriptor set */
+typedef struct MonFdsetFd MonFdsetFd;
+struct MonFdsetFd {
+ int fd;
+ bool removed;
+ char *opaque;
+ QLIST_ENTRY(MonFdsetFd) next;
+};
+
+/* file descriptor set containing fds passed via SCM_RIGHTS */
+typedef struct MonFdset MonFdset;
+struct MonFdset {
+ int64_t id;
+ QLIST_HEAD(, MonFdsetFd) fds;
+ QLIST_HEAD(, MonFdsetFd) dup_fds;
+ QLIST_ENTRY(MonFdset) next;
+};
+
+/* Protects mon_fdsets */
+static QemuMutex mon_fdsets_lock;
+static QLIST_HEAD(, MonFdset) mon_fdsets;
+
+void qmp_getfd(const char *fdname, Error **errp)
+{
+ Monitor *cur_mon = monitor_cur();
+ mon_fd_t *monfd;
+ int fd, tmp_fd;
+
+ fd = qemu_chr_fe_get_msgfd(&cur_mon->chr);
+ if (fd == -1) {
+ error_setg(errp, "No file descriptor supplied via SCM_RIGHTS");
+ return;
+ }
+
+ if (qemu_isdigit(fdname[0])) {
+ close(fd);
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "fdname",
+ "a name not starting with a digit");
+ return;
+ }
+
+ QEMU_LOCK_GUARD(&cur_mon->mon_lock);
+ QLIST_FOREACH(monfd, &cur_mon->fds, next) {
+ if (strcmp(monfd->name, fdname) != 0) {
+ continue;
+ }
+
+ tmp_fd = monfd->fd;
+ monfd->fd = fd;
+ /* Make sure close() is outside critical section */
+ close(tmp_fd);
+ return;
+ }
+
+ monfd = g_new0(mon_fd_t, 1);
+ monfd->name = g_strdup(fdname);
+ monfd->fd = fd;
+
+ QLIST_INSERT_HEAD(&cur_mon->fds, monfd, next);
+}
+
+void qmp_closefd(const char *fdname, Error **errp)
+{
+ Monitor *cur_mon = monitor_cur();
+ mon_fd_t *monfd;
+ int tmp_fd;
+
+ qemu_mutex_lock(&cur_mon->mon_lock);
+ QLIST_FOREACH(monfd, &cur_mon->fds, next) {
+ if (strcmp(monfd->name, fdname) != 0) {
+ continue;
+ }
+
+ QLIST_REMOVE(monfd, next);
+ tmp_fd = monfd->fd;
+ g_free(monfd->name);
+ g_free(monfd);
+ qemu_mutex_unlock(&cur_mon->mon_lock);
+ /* Make sure close() is outside critical section */
+ close(tmp_fd);
+ return;
+ }
+
+ qemu_mutex_unlock(&cur_mon->mon_lock);
+ error_setg(errp, "File descriptor named '%s' not found", fdname);
+}
+
+int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)
+{
+ mon_fd_t *monfd;
+
+ QEMU_LOCK_GUARD(&mon->mon_lock);
+ QLIST_FOREACH(monfd, &mon->fds, next) {
+ int fd;
+
+ if (strcmp(monfd->name, fdname) != 0) {
+ continue;
+ }
+
+ fd = monfd->fd;
+ assert(fd >= 0);
+
+ /* caller takes ownership of fd */
+ QLIST_REMOVE(monfd, next);
+ g_free(monfd->name);
+ g_free(monfd);
+
+ return fd;
+ }
+
+ error_setg(errp, "File descriptor named '%s' has not been found", fdname);
+ return -1;
+}
+
+static void monitor_fdset_cleanup(MonFdset *mon_fdset)
+{
+ MonFdsetFd *mon_fdset_fd;
+ MonFdsetFd *mon_fdset_fd_next;
+
+ QLIST_FOREACH_SAFE(mon_fdset_fd, &mon_fdset->fds, next, mon_fdset_fd_next) {
+ if ((mon_fdset_fd->removed ||
+ (QLIST_EMPTY(&mon_fdset->dup_fds) && mon_refcount == 0)) &&
+ runstate_is_running()) {
+ close(mon_fdset_fd->fd);
+ g_free(mon_fdset_fd->opaque);
+ QLIST_REMOVE(mon_fdset_fd, next);
+ g_free(mon_fdset_fd);
+ }
+ }
+
+ if (QLIST_EMPTY(&mon_fdset->fds) && QLIST_EMPTY(&mon_fdset->dup_fds)) {
+ QLIST_REMOVE(mon_fdset, next);
+ g_free(mon_fdset);
+ }
+}
+
+void monitor_fdsets_cleanup(void)
+{
+ MonFdset *mon_fdset;
+ MonFdset *mon_fdset_next;
+
+ QEMU_LOCK_GUARD(&mon_fdsets_lock);
+ QLIST_FOREACH_SAFE(mon_fdset, &mon_fdsets, next, mon_fdset_next) {
+ monitor_fdset_cleanup(mon_fdset);
+ }
+}
+
+AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id,
+ const char *opaque, Error **errp)
+{
+ int fd;
+ Monitor *mon = monitor_cur();
+ AddfdInfo *fdinfo;
+
+ fd = qemu_chr_fe_get_msgfd(&mon->chr);
+ if (fd == -1) {
+ error_setg(errp, "No file descriptor supplied via SCM_RIGHTS");
+ goto error;
+ }
+
+ fdinfo = monitor_fdset_add_fd(fd, has_fdset_id, fdset_id, opaque, errp);
+ if (fdinfo) {
+ return fdinfo;
+ }
+
+error:
+ if (fd != -1) {
+ close(fd);
+ }
+ return NULL;
+}
+
+void qmp_remove_fd(int64_t fdset_id, bool has_fd, int64_t fd, Error **errp)
+{
+ MonFdset *mon_fdset;
+ MonFdsetFd *mon_fdset_fd;
+ char fd_str[60];
+
+ QEMU_LOCK_GUARD(&mon_fdsets_lock);
+ QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
+ if (mon_fdset->id != fdset_id) {
+ continue;
+ }
+ QLIST_FOREACH(mon_fdset_fd, &mon_fdset->fds, next) {
+ if (has_fd) {
+ if (mon_fdset_fd->fd != fd) {
+ continue;
+ }
+ mon_fdset_fd->removed = true;
+ break;
+ } else {
+ mon_fdset_fd->removed = true;
+ }
+ }
+ if (has_fd && !mon_fdset_fd) {
+ goto error;
+ }
+ monitor_fdset_cleanup(mon_fdset);
+ return;
+ }
+
+error:
+ if (has_fd) {
+ snprintf(fd_str, sizeof(fd_str), "fdset-id:%" PRId64 ", fd:%" PRId64,
+ fdset_id, fd);
+ } else {
+ snprintf(fd_str, sizeof(fd_str), "fdset-id:%" PRId64, fdset_id);
+ }
+ error_setg(errp, "File descriptor named '%s' not found", fd_str);
+}
+
+FdsetInfoList *qmp_query_fdsets(Error **errp)
+{
+ MonFdset *mon_fdset;
+ MonFdsetFd *mon_fdset_fd;
+ FdsetInfoList *fdset_list = NULL;
+
+ QEMU_LOCK_GUARD(&mon_fdsets_lock);
+ QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
+ FdsetInfo *fdset_info = g_malloc0(sizeof(*fdset_info));
+
+ fdset_info->fdset_id = mon_fdset->id;
+
+ QLIST_FOREACH(mon_fdset_fd, &mon_fdset->fds, next) {
+ FdsetFdInfo *fdsetfd_info;
+
+ fdsetfd_info = g_malloc0(sizeof(*fdsetfd_info));
+ fdsetfd_info->fd = mon_fdset_fd->fd;
+ fdsetfd_info->opaque = g_strdup(mon_fdset_fd->opaque);
+
+ QAPI_LIST_PREPEND(fdset_info->fds, fdsetfd_info);
+ }
+
+ QAPI_LIST_PREPEND(fdset_list, fdset_info);
+ }
+
+ return fdset_list;
+}
+
+AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id,
+ const char *opaque, Error **errp)
+{
+ MonFdset *mon_fdset = NULL;
+ MonFdsetFd *mon_fdset_fd;
+ AddfdInfo *fdinfo;
+
+ QEMU_LOCK_GUARD(&mon_fdsets_lock);
+ if (has_fdset_id) {
+ QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
+ /* Break if match found or match impossible due to ordering by ID */
+ if (fdset_id <= mon_fdset->id) {
+ if (fdset_id < mon_fdset->id) {
+ mon_fdset = NULL;
+ }
+ break;
+ }
+ }
+ }
+
+ if (mon_fdset == NULL) {
+ int64_t fdset_id_prev = -1;
+ MonFdset *mon_fdset_cur = QLIST_FIRST(&mon_fdsets);
+
+ if (has_fdset_id) {
+ if (fdset_id < 0) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "fdset-id",
+ "a non-negative value");
+ return NULL;
+ }
+ /* Use specified fdset ID */
+ QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
+ mon_fdset_cur = mon_fdset;
+ if (fdset_id < mon_fdset_cur->id) {
+ break;
+ }
+ }
+ } else {
+ /* Use first available fdset ID */
+ QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
+ mon_fdset_cur = mon_fdset;
+ if (fdset_id_prev == mon_fdset_cur->id - 1) {
+ fdset_id_prev = mon_fdset_cur->id;
+ continue;
+ }
+ break;
+ }
+ }
+
+ mon_fdset = g_malloc0(sizeof(*mon_fdset));
+ if (has_fdset_id) {
+ mon_fdset->id = fdset_id;
+ } else {
+ mon_fdset->id = fdset_id_prev + 1;
+ }
+
+ /* The fdset list is ordered by fdset ID */
+ if (!mon_fdset_cur) {
+ QLIST_INSERT_HEAD(&mon_fdsets, mon_fdset, next);
+ } else if (mon_fdset->id < mon_fdset_cur->id) {
+ QLIST_INSERT_BEFORE(mon_fdset_cur, mon_fdset, next);
+ } else {
+ QLIST_INSERT_AFTER(mon_fdset_cur, mon_fdset, next);
+ }
+ }
+
+ mon_fdset_fd = g_malloc0(sizeof(*mon_fdset_fd));
+ mon_fdset_fd->fd = fd;
+ mon_fdset_fd->removed = false;
+ mon_fdset_fd->opaque = g_strdup(opaque);
+ QLIST_INSERT_HEAD(&mon_fdset->fds, mon_fdset_fd, next);
+
+ fdinfo = g_malloc0(sizeof(*fdinfo));
+ fdinfo->fdset_id = mon_fdset->id;
+ fdinfo->fd = mon_fdset_fd->fd;
+
+ return fdinfo;
+}
+
+int monitor_fdset_dup_fd_add(int64_t fdset_id, int flags)
+{
+#ifdef _WIN32
+ return -ENOENT;
+#else
+ MonFdset *mon_fdset;
+
+ QEMU_LOCK_GUARD(&mon_fdsets_lock);
+ QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
+ MonFdsetFd *mon_fdset_fd;
+ MonFdsetFd *mon_fdset_fd_dup;
+ int fd = -1;
+ int dup_fd;
+ int mon_fd_flags;
+
+ if (mon_fdset->id != fdset_id) {
+ continue;
+ }
+
+ QLIST_FOREACH(mon_fdset_fd, &mon_fdset->fds, next) {
+ mon_fd_flags = fcntl(mon_fdset_fd->fd, F_GETFL);
+ if (mon_fd_flags == -1) {
+ return -1;
+ }
+
+ if ((flags & O_ACCMODE) == (mon_fd_flags & O_ACCMODE)) {
+ fd = mon_fdset_fd->fd;
+ break;
+ }
+ }
+
+ if (fd == -1) {
+ errno = EACCES;
+ return -1;
+ }
+
+ dup_fd = qemu_dup_flags(fd, flags);
+ if (dup_fd == -1) {
+ return -1;
+ }
+
+ mon_fdset_fd_dup = g_malloc0(sizeof(*mon_fdset_fd_dup));
+ mon_fdset_fd_dup->fd = dup_fd;
+ QLIST_INSERT_HEAD(&mon_fdset->dup_fds, mon_fdset_fd_dup, next);
+ return dup_fd;
+ }
+
+ errno = ENOENT;
+ return -1;
+#endif
+}
+
+static int64_t monitor_fdset_dup_fd_find_remove(int dup_fd, bool remove)
+{
+ MonFdset *mon_fdset;
+ MonFdsetFd *mon_fdset_fd_dup;
+
+ QEMU_LOCK_GUARD(&mon_fdsets_lock);
+ QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
+ QLIST_FOREACH(mon_fdset_fd_dup, &mon_fdset->dup_fds, next) {
+ if (mon_fdset_fd_dup->fd == dup_fd) {
+ if (remove) {
+ QLIST_REMOVE(mon_fdset_fd_dup, next);
+ g_free(mon_fdset_fd_dup);
+ if (QLIST_EMPTY(&mon_fdset->dup_fds)) {
+ monitor_fdset_cleanup(mon_fdset);
+ }
+ return -1;
+ } else {
+ return mon_fdset->id;
+ }
+ }
+ }
+ }
+
+ return -1;
+}
+
+int64_t monitor_fdset_dup_fd_find(int dup_fd)
+{
+ return monitor_fdset_dup_fd_find_remove(dup_fd, false);
+}
+
+void monitor_fdset_dup_fd_remove(int dup_fd)
+{
+ monitor_fdset_dup_fd_find_remove(dup_fd, true);
+}
+
+int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp)
+{
+ int fd;
+
+ if (!qemu_isdigit(fdname[0]) && mon) {
+ fd = monitor_get_fd(mon, fdname, errp);
+ } else {
+ fd = qemu_parse_fd(fdname);
+ if (fd < 0) {
+ error_setg(errp, "Invalid file descriptor number '%s'",
+ fdname);
+ }
+ }
+
+ return fd;
+}
+
+static void __attribute__((__constructor__)) monitor_fds_init(void)
+{
+ qemu_mutex_init(&mon_fdsets_lock);
+}
diff --git a/monitor/misc.c b/monitor/misc.c
index c76d583b4f..c531d95b5b 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -27,11 +27,9 @@
#include "monitor/qdev.h"
#include "exec/gdbstub.h"
#include "net/slirp.h"
-#include "qemu/ctype.h"
#include "disas/disas.h"
#include "qemu/log.h"
#include "sysemu/hw_accel.h"
-#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
#include "sysemu/device_tree.h"
#include "qapi/qmp/qdict.h"
@@ -56,36 +54,6 @@
/* Make devices configuration available for use in hmp-commands*.hx templates */
#include CONFIG_DEVICES
-/* file descriptors passed via SCM_RIGHTS */
-typedef struct mon_fd_t mon_fd_t;
-struct mon_fd_t {
- char *name;
- int fd;
- QLIST_ENTRY(mon_fd_t) next;
-};
-
-/* file descriptor associated with a file descriptor set */
-typedef struct MonFdsetFd MonFdsetFd;
-struct MonFdsetFd {
- int fd;
- bool removed;
- char *opaque;
- QLIST_ENTRY(MonFdsetFd) next;
-};
-
-/* file descriptor set containing fds passed via SCM_RIGHTS */
-typedef struct MonFdset MonFdset;
-struct MonFdset {
- int64_t id;
- QLIST_HEAD(, MonFdsetFd) fds;
- QLIST_HEAD(, MonFdsetFd) dup_fds;
- QLIST_ENTRY(MonFdset) next;
-};
-
-/* Protects mon_fdsets */
-static QemuMutex mon_fdsets_lock;
-static QLIST_HEAD(, MonFdset) mon_fdsets;
-
static HMPCommand hmp_info_cmds[];
char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
@@ -746,407 +714,6 @@ static void hmp_info_mtree(Monitor *mon, const QDict *qdict)
mtree_info(flatview, dispatch_tree, owner, disabled);
}
-void qmp_getfd(const char *fdname, Error **errp)
-{
- Monitor *cur_mon = monitor_cur();
- mon_fd_t *monfd;
- int fd, tmp_fd;
-
- fd = qemu_chr_fe_get_msgfd(&cur_mon->chr);
- if (fd == -1) {
- error_setg(errp, "No file descriptor supplied via SCM_RIGHTS");
- return;
- }
-
- if (qemu_isdigit(fdname[0])) {
- close(fd);
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "fdname",
- "a name not starting with a digit");
- return;
- }
-
- QEMU_LOCK_GUARD(&cur_mon->mon_lock);
- QLIST_FOREACH(monfd, &cur_mon->fds, next) {
- if (strcmp(monfd->name, fdname) != 0) {
- continue;
- }
-
- tmp_fd = monfd->fd;
- monfd->fd = fd;
- /* Make sure close() is outside critical section */
- close(tmp_fd);
- return;
- }
-
- monfd = g_new0(mon_fd_t, 1);
- monfd->name = g_strdup(fdname);
- monfd->fd = fd;
-
- QLIST_INSERT_HEAD(&cur_mon->fds, monfd, next);
-}
-
-void qmp_closefd(const char *fdname, Error **errp)
-{
- Monitor *cur_mon = monitor_cur();
- mon_fd_t *monfd;
- int tmp_fd;
-
- qemu_mutex_lock(&cur_mon->mon_lock);
- QLIST_FOREACH(monfd, &cur_mon->fds, next) {
- if (strcmp(monfd->name, fdname) != 0) {
- continue;
- }
-
- QLIST_REMOVE(monfd, next);
- tmp_fd = monfd->fd;
- g_free(monfd->name);
- g_free(monfd);
- qemu_mutex_unlock(&cur_mon->mon_lock);
- /* Make sure close() is outside critical section */
- close(tmp_fd);
- return;
- }
-
- qemu_mutex_unlock(&cur_mon->mon_lock);
- error_setg(errp, "File descriptor named '%s' not found", fdname);
-}
-
-int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)
-{
- mon_fd_t *monfd;
-
- QEMU_LOCK_GUARD(&mon->mon_lock);
- QLIST_FOREACH(monfd, &mon->fds, next) {
- int fd;
-
- if (strcmp(monfd->name, fdname) != 0) {
- continue;
- }
-
- fd = monfd->fd;
- assert(fd >= 0);
-
- /* caller takes ownership of fd */
- QLIST_REMOVE(monfd, next);
- g_free(monfd->name);
- g_free(monfd);
-
- return fd;
- }
-
- error_setg(errp, "File descriptor named '%s' has not been found", fdname);
- return -1;
-}
-
-static void monitor_fdset_cleanup(MonFdset *mon_fdset)
-{
- MonFdsetFd *mon_fdset_fd;
- MonFdsetFd *mon_fdset_fd_next;
-
- QLIST_FOREACH_SAFE(mon_fdset_fd, &mon_fdset->fds, next, mon_fdset_fd_next) {
- if ((mon_fdset_fd->removed ||
- (QLIST_EMPTY(&mon_fdset->dup_fds) && mon_refcount == 0)) &&
- runstate_is_running()) {
- close(mon_fdset_fd->fd);
- g_free(mon_fdset_fd->opaque);
- QLIST_REMOVE(mon_fdset_fd, next);
- g_free(mon_fdset_fd);
- }
- }
-
- if (QLIST_EMPTY(&mon_fdset->fds) && QLIST_EMPTY(&mon_fdset->dup_fds)) {
- QLIST_REMOVE(mon_fdset, next);
- g_free(mon_fdset);
- }
-}
-
-void monitor_fdsets_cleanup(void)
-{
- MonFdset *mon_fdset;
- MonFdset *mon_fdset_next;
-
- QEMU_LOCK_GUARD(&mon_fdsets_lock);
- QLIST_FOREACH_SAFE(mon_fdset, &mon_fdsets, next, mon_fdset_next) {
- monitor_fdset_cleanup(mon_fdset);
- }
-}
-
-AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id,
- const char *opaque, Error **errp)
-{
- int fd;
- Monitor *mon = monitor_cur();
- AddfdInfo *fdinfo;
-
- fd = qemu_chr_fe_get_msgfd(&mon->chr);
- if (fd == -1) {
- error_setg(errp, "No file descriptor supplied via SCM_RIGHTS");
- goto error;
- }
-
- fdinfo = monitor_fdset_add_fd(fd, has_fdset_id, fdset_id, opaque, errp);
- if (fdinfo) {
- return fdinfo;
- }
-
-error:
- if (fd != -1) {
- close(fd);
- }
- return NULL;
-}
-
-void qmp_remove_fd(int64_t fdset_id, bool has_fd, int64_t fd, Error **errp)
-{
- MonFdset *mon_fdset;
- MonFdsetFd *mon_fdset_fd;
- char fd_str[60];
-
- QEMU_LOCK_GUARD(&mon_fdsets_lock);
- QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
- if (mon_fdset->id != fdset_id) {
- continue;
- }
- QLIST_FOREACH(mon_fdset_fd, &mon_fdset->fds, next) {
- if (has_fd) {
- if (mon_fdset_fd->fd != fd) {
- continue;
- }
- mon_fdset_fd->removed = true;
- break;
- } else {
- mon_fdset_fd->removed = true;
- }
- }
- if (has_fd && !mon_fdset_fd) {
- goto error;
- }
- monitor_fdset_cleanup(mon_fdset);
- return;
- }
-
-error:
- if (has_fd) {
- snprintf(fd_str, sizeof(fd_str), "fdset-id:%" PRId64 ", fd:%" PRId64,
- fdset_id, fd);
- } else {
- snprintf(fd_str, sizeof(fd_str), "fdset-id:%" PRId64, fdset_id);
- }
- error_setg(errp, "File descriptor named '%s' not found", fd_str);
-}
-
-FdsetInfoList *qmp_query_fdsets(Error **errp)
-{
- MonFdset *mon_fdset;
- MonFdsetFd *mon_fdset_fd;
- FdsetInfoList *fdset_list = NULL;
-
- QEMU_LOCK_GUARD(&mon_fdsets_lock);
- QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
- FdsetInfo *fdset_info = g_malloc0(sizeof(*fdset_info));
-
- fdset_info->fdset_id = mon_fdset->id;
-
- QLIST_FOREACH(mon_fdset_fd, &mon_fdset->fds, next) {
- FdsetFdInfo *fdsetfd_info;
-
- fdsetfd_info = g_malloc0(sizeof(*fdsetfd_info));
- fdsetfd_info->fd = mon_fdset_fd->fd;
- fdsetfd_info->opaque = g_strdup(mon_fdset_fd->opaque);
-
- QAPI_LIST_PREPEND(fdset_info->fds, fdsetfd_info);
- }
-
- QAPI_LIST_PREPEND(fdset_list, fdset_info);
- }
-
- return fdset_list;
-}
-
-AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id,
- const char *opaque, Error **errp)
-{
- MonFdset *mon_fdset = NULL;
- MonFdsetFd *mon_fdset_fd;
- AddfdInfo *fdinfo;
-
- QEMU_LOCK_GUARD(&mon_fdsets_lock);
- if (has_fdset_id) {
- QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
- /* Break if match found or match impossible due to ordering by ID */
- if (fdset_id <= mon_fdset->id) {
- if (fdset_id < mon_fdset->id) {
- mon_fdset = NULL;
- }
- break;
- }
- }
- }
-
- if (mon_fdset == NULL) {
- int64_t fdset_id_prev = -1;
- MonFdset *mon_fdset_cur = QLIST_FIRST(&mon_fdsets);
-
- if (has_fdset_id) {
- if (fdset_id < 0) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "fdset-id",
- "a non-negative value");
- return NULL;
- }
- /* Use specified fdset ID */
- QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
- mon_fdset_cur = mon_fdset;
- if (fdset_id < mon_fdset_cur->id) {
- break;
- }
- }
- } else {
- /* Use first available fdset ID */
- QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
- mon_fdset_cur = mon_fdset;
- if (fdset_id_prev == mon_fdset_cur->id - 1) {
- fdset_id_prev = mon_fdset_cur->id;
- continue;
- }
- break;
- }
- }
-
- mon_fdset = g_malloc0(sizeof(*mon_fdset));
- if (has_fdset_id) {
- mon_fdset->id = fdset_id;
- } else {
- mon_fdset->id = fdset_id_prev + 1;
- }
-
- /* The fdset list is ordered by fdset ID */
- if (!mon_fdset_cur) {
- QLIST_INSERT_HEAD(&mon_fdsets, mon_fdset, next);
- } else if (mon_fdset->id < mon_fdset_cur->id) {
- QLIST_INSERT_BEFORE(mon_fdset_cur, mon_fdset, next);
- } else {
- QLIST_INSERT_AFTER(mon_fdset_cur, mon_fdset, next);
- }
- }
-
- mon_fdset_fd = g_malloc0(sizeof(*mon_fdset_fd));
- mon_fdset_fd->fd = fd;
- mon_fdset_fd->removed = false;
- mon_fdset_fd->opaque = g_strdup(opaque);
- QLIST_INSERT_HEAD(&mon_fdset->fds, mon_fdset_fd, next);
-
- fdinfo = g_malloc0(sizeof(*fdinfo));
- fdinfo->fdset_id = mon_fdset->id;
- fdinfo->fd = mon_fdset_fd->fd;
-
- return fdinfo;
-}
-
-int monitor_fdset_dup_fd_add(int64_t fdset_id, int flags)
-{
-#ifdef _WIN32
- return -ENOENT;
-#else
- MonFdset *mon_fdset;
-
- QEMU_LOCK_GUARD(&mon_fdsets_lock);
- QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
- MonFdsetFd *mon_fdset_fd;
- MonFdsetFd *mon_fdset_fd_dup;
- int fd = -1;
- int dup_fd;
- int mon_fd_flags;
-
- if (mon_fdset->id != fdset_id) {
- continue;
- }
-
- QLIST_FOREACH(mon_fdset_fd, &mon_fdset->fds, next) {
- mon_fd_flags = fcntl(mon_fdset_fd->fd, F_GETFL);
- if (mon_fd_flags == -1) {
- return -1;
- }
-
- if ((flags & O_ACCMODE) == (mon_fd_flags & O_ACCMODE)) {
- fd = mon_fdset_fd->fd;
- break;
- }
- }
-
- if (fd == -1) {
- errno = EACCES;
- return -1;
- }
-
- dup_fd = qemu_dup_flags(fd, flags);
- if (dup_fd == -1) {
- return -1;
- }
-
- mon_fdset_fd_dup = g_malloc0(sizeof(*mon_fdset_fd_dup));
- mon_fdset_fd_dup->fd = dup_fd;
- QLIST_INSERT_HEAD(&mon_fdset->dup_fds, mon_fdset_fd_dup, next);
- return dup_fd;
- }
-
- errno = ENOENT;
- return -1;
-#endif
-}
-
-static int64_t monitor_fdset_dup_fd_find_remove(int dup_fd, bool remove)
-{
- MonFdset *mon_fdset;
- MonFdsetFd *mon_fdset_fd_dup;
-
- QEMU_LOCK_GUARD(&mon_fdsets_lock);
- QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
- QLIST_FOREACH(mon_fdset_fd_dup, &mon_fdset->dup_fds, next) {
- if (mon_fdset_fd_dup->fd == dup_fd) {
- if (remove) {
- QLIST_REMOVE(mon_fdset_fd_dup, next);
- g_free(mon_fdset_fd_dup);
- if (QLIST_EMPTY(&mon_fdset->dup_fds)) {
- monitor_fdset_cleanup(mon_fdset);
- }
- return -1;
- } else {
- return mon_fdset->id;
- }
- }
- }
- }
-
- return -1;
-}
-
-int64_t monitor_fdset_dup_fd_find(int dup_fd)
-{
- return monitor_fdset_dup_fd_find_remove(dup_fd, false);
-}
-
-void monitor_fdset_dup_fd_remove(int dup_fd)
-{
- monitor_fdset_dup_fd_find_remove(dup_fd, true);
-}
-
-int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp)
-{
- int fd;
-
- if (!qemu_isdigit(fdname[0]) && mon) {
- fd = monitor_get_fd(mon, fdname, errp);
- } else {
- fd = qemu_parse_fd(fdname);
- if (fd < 0) {
- error_setg(errp, "Invalid file descriptor number '%s'",
- fdname);
- }
- }
-
- return fd;
-}
-
/* Please update hmp-commands.hx when adding or changing commands */
static HMPCommand hmp_info_cmds[] = {
#include "hmp-commands-info.h"
@@ -1260,5 +827,4 @@ void monitor_init_globals(void)
monitor_init_globals_core();
monitor_init_qmp_commands();
sortcmdlist();
- qemu_mutex_init(&mon_fdsets_lock);
}
diff --git a/monitor/meson.build b/monitor/meson.build
index 6d00985ace..435d8abd06 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -1,6 +1,7 @@
qmp_ss.add(files('monitor.c', 'qmp.c', 'qmp-cmds-control.c'))
softmmu_ss.add(files(
+ 'fds.c',
'hmp-cmds.c',
'hmp.c',
))
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 27/32] monitor: Move monitor_putc() next to monitor_puts & external linkage
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (25 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 26/32] monitor: Split file descriptor passing stuff off misc.c Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 28/32] monitor: Move target-dependent HMP commands to hmp-cmds-target.c Markus Armbruster
` (4 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
monitor_putc() will soon be used from more than one .c file.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/monitor/monitor.h | 1 +
monitor/misc.c | 27 ---------------------------
monitor/monitor.c | 27 +++++++++++++++++++++++++++
3 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index 1e6f4c9bd7..033390f699 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -35,6 +35,7 @@ int monitor_puts(Monitor *mon, const char *str);
int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
G_GNUC_PRINTF(2, 0);
int monitor_printf(Monitor *mon, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
+void monitor_printc(Monitor *mon, int ch);
void monitor_flush(Monitor *mon);
int monitor_set_cpu(Monitor *mon, int cpu_index);
int monitor_get_cpu_index(Monitor *mon);
diff --git a/monitor/misc.c b/monitor/misc.c
index c531d95b5b..7a0ba35923 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -304,33 +304,6 @@ static void hmp_gdbserver(Monitor *mon, const QDict *qdict)
}
}
-static void monitor_printc(Monitor *mon, int c)
-{
- monitor_printf(mon, "'");
- switch(c) {
- case '\'':
- monitor_printf(mon, "\\'");
- break;
- case '\\':
- monitor_printf(mon, "\\\\");
- break;
- case '\n':
- monitor_printf(mon, "\\n");
- break;
- case '\r':
- monitor_printf(mon, "\\r");
- break;
- default:
- if (c >= 32 && c <= 126) {
- monitor_printf(mon, "%c", c);
- } else {
- monitor_printf(mon, "\\x%02x", c);
- }
- break;
- }
- monitor_printf(mon, "'");
-}
-
static void memory_dump(Monitor *mon, int count, int format, int wsize,
hwaddr addr, int is_physical)
{
diff --git a/monitor/monitor.c b/monitor/monitor.c
index 605fe41748..0a990633d8 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -259,6 +259,33 @@ int monitor_printf(Monitor *mon, const char *fmt, ...)
return ret;
}
+void monitor_printc(Monitor *mon, int c)
+{
+ monitor_printf(mon, "'");
+ switch(c) {
+ case '\'':
+ monitor_printf(mon, "\\'");
+ break;
+ case '\\':
+ monitor_printf(mon, "\\\\");
+ break;
+ case '\n':
+ monitor_printf(mon, "\\n");
+ break;
+ case '\r':
+ monitor_printf(mon, "\\r");
+ break;
+ default:
+ if (c >= 32 && c <= 126) {
+ monitor_printf(mon, "%c", c);
+ } else {
+ monitor_printf(mon, "\\x%02x", c);
+ }
+ break;
+ }
+ monitor_printf(mon, "'");
+}
+
/*
* Print to current monitor if we have one, else to stderr.
*/
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 28/32] monitor: Move target-dependent HMP commands to hmp-cmds-target.c
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (26 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 27/32] monitor: Move monitor_putc() next to monitor_puts & external linkage Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 29/32] monitor: Move remaining HMP commands from misc.c to hmp-cmds.c Markus Armbruster
` (3 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
Target-independent hmp_gpa2hva(), hmp_gpa2hpa() move along to stay
next to hmp_gva2gpa().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/monitor/hmp-target.h | 6 +
monitor/hmp-cmds-target.c | 380 +++++++++++++++++++++++++++++++++++
monitor/misc.c | 350 --------------------------------
monitor/meson.build | 3 +-
4 files changed, 388 insertions(+), 351 deletions(-)
create mode 100644 monitor/hmp-cmds-target.c
diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h
index 1891a19b21..d78e979f05 100644
--- a/include/monitor/hmp-target.h
+++ b/include/monitor/hmp-target.h
@@ -51,5 +51,11 @@ void hmp_info_local_apic(Monitor *mon, const QDict *qdict);
void hmp_info_sev(Monitor *mon, const QDict *qdict);
void hmp_info_sgx(Monitor *mon, const QDict *qdict);
void hmp_info_via(Monitor *mon, const QDict *qdict);
+void hmp_memory_dump(Monitor *mon, const QDict *qdict);
+void hmp_physical_memory_dump(Monitor *mon, const QDict *qdict);
+void hmp_info_registers(Monitor *mon, const QDict *qdict);
+void hmp_gva2gpa(Monitor *mon, const QDict *qdict);
+void hmp_gpa2hva(Monitor *mon, const QDict *qdict);
+void hmp_gpa2hpa(Monitor *mon, const QDict *qdict);
#endif /* MONITOR_HMP_TARGET_H */
diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c
new file mode 100644
index 0000000000..0d3e84d960
--- /dev/null
+++ b/monitor/hmp-cmds-target.c
@@ -0,0 +1,380 @@
+/*
+ * Miscellaneous target-dependent HMP commands
+ *
+ * Copyright (c) 2003-2004 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "qemu/osdep.h"
+#include "disas/disas.h"
+#include "exec/address-spaces.h"
+#include "monitor/hmp-target.h"
+#include "monitor/monitor-internal.h"
+#include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
+#include "sysemu/hw_accel.h"
+
+/* Set the current CPU defined by the user. Callers must hold BQL. */
+int monitor_set_cpu(Monitor *mon, int cpu_index)
+{
+ CPUState *cpu;
+
+ cpu = qemu_get_cpu(cpu_index);
+ if (cpu == NULL) {
+ return -1;
+ }
+ g_free(mon->mon_cpu_path);
+ mon->mon_cpu_path = object_get_canonical_path(OBJECT(cpu));
+ return 0;
+}
+
+/* Callers must hold BQL. */
+static CPUState *mon_get_cpu_sync(Monitor *mon, bool synchronize)
+{
+ CPUState *cpu = NULL;
+
+ if (mon->mon_cpu_path) {
+ cpu = (CPUState *) object_resolve_path_type(mon->mon_cpu_path,
+ TYPE_CPU, NULL);
+ if (!cpu) {
+ g_free(mon->mon_cpu_path);
+ mon->mon_cpu_path = NULL;
+ }
+ }
+ if (!mon->mon_cpu_path) {
+ if (!first_cpu) {
+ return NULL;
+ }
+ monitor_set_cpu(mon, first_cpu->cpu_index);
+ cpu = first_cpu;
+ }
+ assert(cpu != NULL);
+ if (synchronize) {
+ cpu_synchronize_state(cpu);
+ }
+ return cpu;
+}
+
+CPUState *mon_get_cpu(Monitor *mon)
+{
+ return mon_get_cpu_sync(mon, true);
+}
+
+CPUArchState *mon_get_cpu_env(Monitor *mon)
+{
+ CPUState *cs = mon_get_cpu(mon);
+
+ return cs ? cs->env_ptr : NULL;
+}
+
+int monitor_get_cpu_index(Monitor *mon)
+{
+ CPUState *cs = mon_get_cpu_sync(mon, false);
+
+ return cs ? cs->cpu_index : UNASSIGNED_CPU_INDEX;
+}
+
+void hmp_info_registers(Monitor *mon, const QDict *qdict)
+{
+ bool all_cpus = qdict_get_try_bool(qdict, "cpustate_all", false);
+ int vcpu = qdict_get_try_int(qdict, "vcpu", -1);
+ CPUState *cs;
+
+ if (all_cpus) {
+ CPU_FOREACH(cs) {
+ monitor_printf(mon, "\nCPU#%d\n", cs->cpu_index);
+ cpu_dump_state(cs, NULL, CPU_DUMP_FPU);
+ }
+ } else {
+ cs = vcpu >= 0 ? qemu_get_cpu(vcpu) : mon_get_cpu(mon);
+
+ if (!cs) {
+ if (vcpu >= 0) {
+ monitor_printf(mon, "CPU#%d not available\n", vcpu);
+ } else {
+ monitor_printf(mon, "No CPU available\n");
+ }
+ return;
+ }
+
+ monitor_printf(mon, "\nCPU#%d\n", cs->cpu_index);
+ cpu_dump_state(cs, NULL, CPU_DUMP_FPU);
+ }
+}
+
+static void memory_dump(Monitor *mon, int count, int format, int wsize,
+ hwaddr addr, int is_physical)
+{
+ int l, line_size, i, max_digits, len;
+ uint8_t buf[16];
+ uint64_t v;
+ CPUState *cs = mon_get_cpu(mon);
+
+ if (!cs && (format == 'i' || !is_physical)) {
+ monitor_printf(mon, "Can not dump without CPU\n");
+ return;
+ }
+
+ if (format == 'i') {
+ monitor_disas(mon, cs, addr, count, is_physical);
+ return;
+ }
+
+ len = wsize * count;
+ if (wsize == 1) {
+ line_size = 8;
+ } else {
+ line_size = 16;
+ }
+ max_digits = 0;
+
+ switch(format) {
+ case 'o':
+ max_digits = DIV_ROUND_UP(wsize * 8, 3);
+ break;
+ default:
+ case 'x':
+ max_digits = (wsize * 8) / 4;
+ break;
+ case 'u':
+ case 'd':
+ max_digits = DIV_ROUND_UP(wsize * 8 * 10, 33);
+ break;
+ case 'c':
+ wsize = 1;
+ break;
+ }
+
+ while (len > 0) {
+ if (is_physical) {
+ monitor_printf(mon, HWADDR_FMT_plx ":", addr);
+ } else {
+ monitor_printf(mon, TARGET_FMT_lx ":", (target_ulong)addr);
+ }
+ l = len;
+ if (l > line_size)
+ l = line_size;
+ if (is_physical) {
+ AddressSpace *as = cs ? cs->as : &address_space_memory;
+ MemTxResult r = address_space_read(as, addr,
+ MEMTXATTRS_UNSPECIFIED, buf, l);
+ if (r != MEMTX_OK) {
+ monitor_printf(mon, " Cannot access memory\n");
+ break;
+ }
+ } else {
+ if (cpu_memory_rw_debug(cs, addr, buf, l, 0) < 0) {
+ monitor_printf(mon, " Cannot access memory\n");
+ break;
+ }
+ }
+ i = 0;
+ while (i < l) {
+ switch(wsize) {
+ default:
+ case 1:
+ v = ldub_p(buf + i);
+ break;
+ case 2:
+ v = lduw_p(buf + i);
+ break;
+ case 4:
+ v = (uint32_t)ldl_p(buf + i);
+ break;
+ case 8:
+ v = ldq_p(buf + i);
+ break;
+ }
+ monitor_printf(mon, " ");
+ switch(format) {
+ case 'o':
+ monitor_printf(mon, "%#*" PRIo64, max_digits, v);
+ break;
+ case 'x':
+ monitor_printf(mon, "0x%0*" PRIx64, max_digits, v);
+ break;
+ case 'u':
+ monitor_printf(mon, "%*" PRIu64, max_digits, v);
+ break;
+ case 'd':
+ monitor_printf(mon, "%*" PRId64, max_digits, v);
+ break;
+ case 'c':
+ monitor_printc(mon, v);
+ break;
+ }
+ i += wsize;
+ }
+ monitor_printf(mon, "\n");
+ addr += l;
+ len -= l;
+ }
+}
+
+void hmp_memory_dump(Monitor *mon, const QDict *qdict)
+{
+ int count = qdict_get_int(qdict, "count");
+ int format = qdict_get_int(qdict, "format");
+ int size = qdict_get_int(qdict, "size");
+ target_long addr = qdict_get_int(qdict, "addr");
+
+ memory_dump(mon, count, format, size, addr, 0);
+}
+
+void hmp_physical_memory_dump(Monitor *mon, const QDict *qdict)
+{
+ int count = qdict_get_int(qdict, "count");
+ int format = qdict_get_int(qdict, "format");
+ int size = qdict_get_int(qdict, "size");
+ hwaddr addr = qdict_get_int(qdict, "addr");
+
+ memory_dump(mon, count, format, size, addr, 1);
+}
+
+void *gpa2hva(MemoryRegion **p_mr, hwaddr addr, uint64_t size, Error **errp)
+{
+ Int128 gpa_region_size;
+ MemoryRegionSection mrs = memory_region_find(get_system_memory(),
+ addr, size);
+
+ if (!mrs.mr) {
+ error_setg(errp, "No memory is mapped at address 0x%" HWADDR_PRIx, addr);
+ return NULL;
+ }
+
+ if (!memory_region_is_ram(mrs.mr) && !memory_region_is_romd(mrs.mr)) {
+ error_setg(errp, "Memory at address 0x%" HWADDR_PRIx "is not RAM", addr);
+ memory_region_unref(mrs.mr);
+ return NULL;
+ }
+
+ gpa_region_size = int128_make64(size);
+ if (int128_lt(mrs.size, gpa_region_size)) {
+ error_setg(errp, "Size of memory region at 0x%" HWADDR_PRIx
+ " exceeded.", addr);
+ memory_region_unref(mrs.mr);
+ return NULL;
+ }
+
+ *p_mr = mrs.mr;
+ return qemu_map_ram_ptr(mrs.mr->ram_block, mrs.offset_within_region);
+}
+
+void hmp_gpa2hva(Monitor *mon, const QDict *qdict)
+{
+ hwaddr addr = qdict_get_int(qdict, "addr");
+ Error *local_err = NULL;
+ MemoryRegion *mr = NULL;
+ void *ptr;
+
+ ptr = gpa2hva(&mr, addr, 1, &local_err);
+ if (local_err) {
+ error_report_err(local_err);
+ return;
+ }
+
+ monitor_printf(mon, "Host virtual address for 0x%" HWADDR_PRIx
+ " (%s) is %p\n",
+ addr, mr->name, ptr);
+
+ memory_region_unref(mr);
+}
+
+void hmp_gva2gpa(Monitor *mon, const QDict *qdict)
+{
+ target_ulong addr = qdict_get_int(qdict, "addr");
+ MemTxAttrs attrs;
+ CPUState *cs = mon_get_cpu(mon);
+ hwaddr gpa;
+
+ if (!cs) {
+ monitor_printf(mon, "No cpu\n");
+ return;
+ }
+
+ gpa = cpu_get_phys_page_attrs_debug(cs, addr & TARGET_PAGE_MASK, &attrs);
+ if (gpa == -1) {
+ monitor_printf(mon, "Unmapped\n");
+ } else {
+ monitor_printf(mon, "gpa: %#" HWADDR_PRIx "\n",
+ gpa + (addr & ~TARGET_PAGE_MASK));
+ }
+}
+
+#ifdef CONFIG_LINUX
+static uint64_t vtop(void *ptr, Error **errp)
+{
+ uint64_t pinfo;
+ uint64_t ret = -1;
+ uintptr_t addr = (uintptr_t) ptr;
+ uintptr_t pagesize = qemu_real_host_page_size();
+ off_t offset = addr / pagesize * sizeof(pinfo);
+ int fd;
+
+ fd = open("/proc/self/pagemap", O_RDONLY);
+ if (fd == -1) {
+ error_setg_errno(errp, errno, "Cannot open /proc/self/pagemap");
+ return -1;
+ }
+
+ /* Force copy-on-write if necessary. */
+ qatomic_add((uint8_t *)ptr, 0);
+
+ if (pread(fd, &pinfo, sizeof(pinfo), offset) != sizeof(pinfo)) {
+ error_setg_errno(errp, errno, "Cannot read pagemap");
+ goto out;
+ }
+ if ((pinfo & (1ull << 63)) == 0) {
+ error_setg(errp, "Page not present");
+ goto out;
+ }
+ ret = ((pinfo & 0x007fffffffffffffull) * pagesize) | (addr & (pagesize - 1));
+
+out:
+ close(fd);
+ return ret;
+}
+
+void hmp_gpa2hpa(Monitor *mon, const QDict *qdict)
+{
+ hwaddr addr = qdict_get_int(qdict, "addr");
+ Error *local_err = NULL;
+ MemoryRegion *mr = NULL;
+ void *ptr;
+ uint64_t physaddr;
+
+ ptr = gpa2hva(&mr, addr, 1, &local_err);
+ if (local_err) {
+ error_report_err(local_err);
+ return;
+ }
+
+ physaddr = vtop(ptr, &local_err);
+ if (local_err) {
+ error_report_err(local_err);
+ } else {
+ monitor_printf(mon, "Host physical address for 0x%" HWADDR_PRIx
+ " (%s) is 0x%" PRIx64 "\n",
+ addr, mr->name, (uint64_t) physaddr);
+ }
+
+ memory_region_unref(mr);
+}
+#endif
diff --git a/monitor/misc.c b/monitor/misc.c
index 7a0ba35923..6764d4f49f 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -27,9 +27,7 @@
#include "monitor/qdev.h"
#include "exec/gdbstub.h"
#include "net/slirp.h"
-#include "disas/disas.h"
#include "qemu/log.h"
-#include "sysemu/hw_accel.h"
#include "sysemu/sysemu.h"
#include "sysemu/device_tree.h"
#include "qapi/qmp/qdict.h"
@@ -137,94 +135,6 @@ static void monitor_init_qmp_commands(void)
QCO_ALLOW_PRECONFIG, 0);
}
-/* Set the current CPU defined by the user. Callers must hold BQL. */
-int monitor_set_cpu(Monitor *mon, int cpu_index)
-{
- CPUState *cpu;
-
- cpu = qemu_get_cpu(cpu_index);
- if (cpu == NULL) {
- return -1;
- }
- g_free(mon->mon_cpu_path);
- mon->mon_cpu_path = object_get_canonical_path(OBJECT(cpu));
- return 0;
-}
-
-/* Callers must hold BQL. */
-static CPUState *mon_get_cpu_sync(Monitor *mon, bool synchronize)
-{
- CPUState *cpu = NULL;
-
- if (mon->mon_cpu_path) {
- cpu = (CPUState *) object_resolve_path_type(mon->mon_cpu_path,
- TYPE_CPU, NULL);
- if (!cpu) {
- g_free(mon->mon_cpu_path);
- mon->mon_cpu_path = NULL;
- }
- }
- if (!mon->mon_cpu_path) {
- if (!first_cpu) {
- return NULL;
- }
- monitor_set_cpu(mon, first_cpu->cpu_index);
- cpu = first_cpu;
- }
- assert(cpu != NULL);
- if (synchronize) {
- cpu_synchronize_state(cpu);
- }
- return cpu;
-}
-
-CPUState *mon_get_cpu(Monitor *mon)
-{
- return mon_get_cpu_sync(mon, true);
-}
-
-CPUArchState *mon_get_cpu_env(Monitor *mon)
-{
- CPUState *cs = mon_get_cpu(mon);
-
- return cs ? cs->env_ptr : NULL;
-}
-
-int monitor_get_cpu_index(Monitor *mon)
-{
- CPUState *cs = mon_get_cpu_sync(mon, false);
-
- return cs ? cs->cpu_index : UNASSIGNED_CPU_INDEX;
-}
-
-static void hmp_info_registers(Monitor *mon, const QDict *qdict)
-{
- bool all_cpus = qdict_get_try_bool(qdict, "cpustate_all", false);
- int vcpu = qdict_get_try_int(qdict, "vcpu", -1);
- CPUState *cs;
-
- if (all_cpus) {
- CPU_FOREACH(cs) {
- monitor_printf(mon, "\nCPU#%d\n", cs->cpu_index);
- cpu_dump_state(cs, NULL, CPU_DUMP_FPU);
- }
- } else {
- cs = vcpu >= 0 ? qemu_get_cpu(vcpu) : mon_get_cpu(mon);
-
- if (!cs) {
- if (vcpu >= 0) {
- monitor_printf(mon, "CPU#%d not available\n", vcpu);
- } else {
- monitor_printf(mon, "No CPU available\n");
- }
- return;
- }
-
- monitor_printf(mon, "\nCPU#%d\n", cs->cpu_index);
- cpu_dump_state(cs, NULL, CPU_DUMP_FPU);
- }
-}
-
static void hmp_info_sync_profile(Monitor *mon, const QDict *qdict)
{
int64_t max = qdict_get_try_int(qdict, "max", 10);
@@ -304,266 +214,6 @@ static void hmp_gdbserver(Monitor *mon, const QDict *qdict)
}
}
-static void memory_dump(Monitor *mon, int count, int format, int wsize,
- hwaddr addr, int is_physical)
-{
- int l, line_size, i, max_digits, len;
- uint8_t buf[16];
- uint64_t v;
- CPUState *cs = mon_get_cpu(mon);
-
- if (!cs && (format == 'i' || !is_physical)) {
- monitor_printf(mon, "Can not dump without CPU\n");
- return;
- }
-
- if (format == 'i') {
- monitor_disas(mon, cs, addr, count, is_physical);
- return;
- }
-
- len = wsize * count;
- if (wsize == 1) {
- line_size = 8;
- } else {
- line_size = 16;
- }
- max_digits = 0;
-
- switch(format) {
- case 'o':
- max_digits = DIV_ROUND_UP(wsize * 8, 3);
- break;
- default:
- case 'x':
- max_digits = (wsize * 8) / 4;
- break;
- case 'u':
- case 'd':
- max_digits = DIV_ROUND_UP(wsize * 8 * 10, 33);
- break;
- case 'c':
- wsize = 1;
- break;
- }
-
- while (len > 0) {
- if (is_physical) {
- monitor_printf(mon, HWADDR_FMT_plx ":", addr);
- } else {
- monitor_printf(mon, TARGET_FMT_lx ":", (target_ulong)addr);
- }
- l = len;
- if (l > line_size)
- l = line_size;
- if (is_physical) {
- AddressSpace *as = cs ? cs->as : &address_space_memory;
- MemTxResult r = address_space_read(as, addr,
- MEMTXATTRS_UNSPECIFIED, buf, l);
- if (r != MEMTX_OK) {
- monitor_printf(mon, " Cannot access memory\n");
- break;
- }
- } else {
- if (cpu_memory_rw_debug(cs, addr, buf, l, 0) < 0) {
- monitor_printf(mon, " Cannot access memory\n");
- break;
- }
- }
- i = 0;
- while (i < l) {
- switch(wsize) {
- default:
- case 1:
- v = ldub_p(buf + i);
- break;
- case 2:
- v = lduw_p(buf + i);
- break;
- case 4:
- v = (uint32_t)ldl_p(buf + i);
- break;
- case 8:
- v = ldq_p(buf + i);
- break;
- }
- monitor_printf(mon, " ");
- switch(format) {
- case 'o':
- monitor_printf(mon, "%#*" PRIo64, max_digits, v);
- break;
- case 'x':
- monitor_printf(mon, "0x%0*" PRIx64, max_digits, v);
- break;
- case 'u':
- monitor_printf(mon, "%*" PRIu64, max_digits, v);
- break;
- case 'd':
- monitor_printf(mon, "%*" PRId64, max_digits, v);
- break;
- case 'c':
- monitor_printc(mon, v);
- break;
- }
- i += wsize;
- }
- monitor_printf(mon, "\n");
- addr += l;
- len -= l;
- }
-}
-
-static void hmp_memory_dump(Monitor *mon, const QDict *qdict)
-{
- int count = qdict_get_int(qdict, "count");
- int format = qdict_get_int(qdict, "format");
- int size = qdict_get_int(qdict, "size");
- target_long addr = qdict_get_int(qdict, "addr");
-
- memory_dump(mon, count, format, size, addr, 0);
-}
-
-static void hmp_physical_memory_dump(Monitor *mon, const QDict *qdict)
-{
- int count = qdict_get_int(qdict, "count");
- int format = qdict_get_int(qdict, "format");
- int size = qdict_get_int(qdict, "size");
- hwaddr addr = qdict_get_int(qdict, "addr");
-
- memory_dump(mon, count, format, size, addr, 1);
-}
-
-void *gpa2hva(MemoryRegion **p_mr, hwaddr addr, uint64_t size, Error **errp)
-{
- Int128 gpa_region_size;
- MemoryRegionSection mrs = memory_region_find(get_system_memory(),
- addr, size);
-
- if (!mrs.mr) {
- error_setg(errp, "No memory is mapped at address 0x%" HWADDR_PRIx, addr);
- return NULL;
- }
-
- if (!memory_region_is_ram(mrs.mr) && !memory_region_is_romd(mrs.mr)) {
- error_setg(errp, "Memory at address 0x%" HWADDR_PRIx "is not RAM", addr);
- memory_region_unref(mrs.mr);
- return NULL;
- }
-
- gpa_region_size = int128_make64(size);
- if (int128_lt(mrs.size, gpa_region_size)) {
- error_setg(errp, "Size of memory region at 0x%" HWADDR_PRIx
- " exceeded.", addr);
- memory_region_unref(mrs.mr);
- return NULL;
- }
-
- *p_mr = mrs.mr;
- return qemu_map_ram_ptr(mrs.mr->ram_block, mrs.offset_within_region);
-}
-
-static void hmp_gpa2hva(Monitor *mon, const QDict *qdict)
-{
- hwaddr addr = qdict_get_int(qdict, "addr");
- Error *local_err = NULL;
- MemoryRegion *mr = NULL;
- void *ptr;
-
- ptr = gpa2hva(&mr, addr, 1, &local_err);
- if (local_err) {
- error_report_err(local_err);
- return;
- }
-
- monitor_printf(mon, "Host virtual address for 0x%" HWADDR_PRIx
- " (%s) is %p\n",
- addr, mr->name, ptr);
-
- memory_region_unref(mr);
-}
-
-static void hmp_gva2gpa(Monitor *mon, const QDict *qdict)
-{
- target_ulong addr = qdict_get_int(qdict, "addr");
- MemTxAttrs attrs;
- CPUState *cs = mon_get_cpu(mon);
- hwaddr gpa;
-
- if (!cs) {
- monitor_printf(mon, "No cpu\n");
- return;
- }
-
- gpa = cpu_get_phys_page_attrs_debug(cs, addr & TARGET_PAGE_MASK, &attrs);
- if (gpa == -1) {
- monitor_printf(mon, "Unmapped\n");
- } else {
- monitor_printf(mon, "gpa: %#" HWADDR_PRIx "\n",
- gpa + (addr & ~TARGET_PAGE_MASK));
- }
-}
-
-#ifdef CONFIG_LINUX
-static uint64_t vtop(void *ptr, Error **errp)
-{
- uint64_t pinfo;
- uint64_t ret = -1;
- uintptr_t addr = (uintptr_t) ptr;
- uintptr_t pagesize = qemu_real_host_page_size();
- off_t offset = addr / pagesize * sizeof(pinfo);
- int fd;
-
- fd = open("/proc/self/pagemap", O_RDONLY);
- if (fd == -1) {
- error_setg_errno(errp, errno, "Cannot open /proc/self/pagemap");
- return -1;
- }
-
- /* Force copy-on-write if necessary. */
- qatomic_add((uint8_t *)ptr, 0);
-
- if (pread(fd, &pinfo, sizeof(pinfo), offset) != sizeof(pinfo)) {
- error_setg_errno(errp, errno, "Cannot read pagemap");
- goto out;
- }
- if ((pinfo & (1ull << 63)) == 0) {
- error_setg(errp, "Page not present");
- goto out;
- }
- ret = ((pinfo & 0x007fffffffffffffull) * pagesize) | (addr & (pagesize - 1));
-
-out:
- close(fd);
- return ret;
-}
-
-static void hmp_gpa2hpa(Monitor *mon, const QDict *qdict)
-{
- hwaddr addr = qdict_get_int(qdict, "addr");
- Error *local_err = NULL;
- MemoryRegion *mr = NULL;
- void *ptr;
- uint64_t physaddr;
-
- ptr = gpa2hva(&mr, addr, 1, &local_err);
- if (local_err) {
- error_report_err(local_err);
- return;
- }
-
- physaddr = vtop(ptr, &local_err);
- if (local_err) {
- error_report_err(local_err);
- } else {
- monitor_printf(mon, "Host physical address for 0x%" HWADDR_PRIx
- " (%s) is 0x%" PRIx64 "\n",
- addr, mr->name, (uint64_t) physaddr);
- }
-
- memory_region_unref(mr);
-}
-#endif
-
static void do_print(Monitor *mon, const QDict *qdict)
{
int format = qdict_get_int(qdict, "format");
diff --git a/monitor/meson.build b/monitor/meson.build
index 435d8abd06..795a271545 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -7,4 +7,5 @@ softmmu_ss.add(files(
))
softmmu_ss.add([spice_headers, files('qmp-cmds.c')])
-specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('misc.c'), spice])
+specific_ss.add(when: 'CONFIG_SOFTMMU',
+ if_true: [files( 'hmp-cmds-target.c', 'misc.c'), spice])
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 29/32] monitor: Move remaining HMP commands from misc.c to hmp-cmds.c
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (27 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 28/32] monitor: Move target-dependent HMP commands to hmp-cmds-target.c Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 30/32] monitor: Move remaining QMP stuff from misc.c to qmp-cmds.c Markus Armbruster
` (2 subsequent siblings)
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
This requires giving them external linkage. Rename do_help_cmd() to
hmp_help(), and do_print() to hmp_print().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/monitor/hmp.h | 13 +++
monitor/hmp-cmds.c | 219 +++++++++++++++++++++++++++++++++++++++++-
monitor/misc.c | 218 -----------------------------------------
hmp-commands.hx | 4 +-
4 files changed, 233 insertions(+), 221 deletions(-)
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index 941da9fde6..2220f14fc9 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -165,5 +165,18 @@ void hmp_wavcapture(Monitor *mon, const QDict *qdict);
void hmp_trace_event(Monitor *mon, const QDict *qdict);
void hmp_trace_file(Monitor *mon, const QDict *qdict);
void hmp_info_trace_events(Monitor *mon, const QDict *qdict);
+void hmp_help(Monitor *mon, const QDict *qdict);
+void hmp_info_help(Monitor *mon, const QDict *qdict);
+void hmp_info_sync_profile(Monitor *mon, const QDict *qdict);
+void hmp_info_history(Monitor *mon, const QDict *qdict);
+void hmp_logfile(Monitor *mon, const QDict *qdict);
+void hmp_log(Monitor *mon, const QDict *qdict);
+void hmp_gdbserver(Monitor *mon, const QDict *qdict);
+void hmp_print(Monitor *mon, const QDict *qdict);
+void hmp_sum(Monitor *mon, const QDict *qdict);
+void hmp_ioport_read(Monitor *mon, const QDict *qdict);
+void hmp_ioport_write(Monitor *mon, const QDict *qdict);
+void hmp_boot_set(Monitor *mon, const QDict *qdict);
+void hmp_info_mtree(Monitor *mon, const QDict *qdict);
#endif
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 8a3d56bcde..34bd8c67d7 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -14,9 +14,12 @@
*/
#include "qemu/osdep.h"
+#include "exec/address-spaces.h"
+#include "exec/gdbstub.h"
+#include "exec/ioport.h"
#include "monitor/hmp.h"
#include "qemu/help_option.h"
-#include "monitor/monitor.h"
+#include "monitor/monitor-internal.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
@@ -24,6 +27,8 @@
#include "qapi/qmp/qerror.h"
#include "qemu/cutils.h"
#include "hw/intc/intc.h"
+#include "qemu/log.h"
+#include "sysemu/sysemu.h"
bool hmp_handle_error(Monitor *mon, Error *err)
{
@@ -224,3 +229,215 @@ void hmp_info_iothreads(Monitor *mon, const QDict *qdict)
qapi_free_IOThreadInfoList(info_list);
}
+
+void hmp_help(Monitor *mon, const QDict *qdict)
+{
+ hmp_help_cmd(mon, qdict_get_try_str(qdict, "name"));
+}
+
+void hmp_info_help(Monitor *mon, const QDict *qdict)
+{
+ hmp_help_cmd(mon, "info");
+}
+
+void hmp_info_sync_profile(Monitor *mon, const QDict *qdict)
+{
+ int64_t max = qdict_get_try_int(qdict, "max", 10);
+ bool mean = qdict_get_try_bool(qdict, "mean", false);
+ bool coalesce = !qdict_get_try_bool(qdict, "no_coalesce", false);
+ enum QSPSortBy sort_by;
+
+ sort_by = mean ? QSP_SORT_BY_AVG_WAIT_TIME : QSP_SORT_BY_TOTAL_WAIT_TIME;
+ qsp_report(max, sort_by, coalesce);
+}
+
+void hmp_info_history(Monitor *mon, const QDict *qdict)
+{
+ MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
+ int i;
+ const char *str;
+
+ if (!hmp_mon->rs) {
+ return;
+ }
+ i = 0;
+ for(;;) {
+ str = readline_get_history(hmp_mon->rs, i);
+ if (!str) {
+ break;
+ }
+ monitor_printf(mon, "%d: '%s'\n", i, str);
+ i++;
+ }
+}
+
+void hmp_logfile(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+
+ if (!qemu_set_log_filename(qdict_get_str(qdict, "filename"), &err)) {
+ error_report_err(err);
+ }
+}
+
+void hmp_log(Monitor *mon, const QDict *qdict)
+{
+ int mask;
+ const char *items = qdict_get_str(qdict, "items");
+ Error *err = NULL;
+
+ if (!strcmp(items, "none")) {
+ mask = 0;
+ } else {
+ mask = qemu_str_to_log_mask(items);
+ if (!mask) {
+ hmp_help_cmd(mon, "log");
+ return;
+ }
+ }
+
+ if (!qemu_set_log(mask, &err)) {
+ error_report_err(err);
+ }
+}
+
+void hmp_gdbserver(Monitor *mon, const QDict *qdict)
+{
+ const char *device = qdict_get_try_str(qdict, "device");
+ if (!device) {
+ device = "tcp::" DEFAULT_GDBSTUB_PORT;
+ }
+
+ if (gdbserver_start(device) < 0) {
+ monitor_printf(mon, "Could not open gdbserver on device '%s'\n",
+ device);
+ } else if (strcmp(device, "none") == 0) {
+ monitor_printf(mon, "Disabled gdbserver\n");
+ } else {
+ monitor_printf(mon, "Waiting for gdb connection on device '%s'\n",
+ device);
+ }
+}
+
+void hmp_print(Monitor *mon, const QDict *qdict)
+{
+ int format = qdict_get_int(qdict, "format");
+ hwaddr val = qdict_get_int(qdict, "val");
+
+ switch(format) {
+ case 'o':
+ monitor_printf(mon, "%#" HWADDR_PRIo, val);
+ break;
+ case 'x':
+ monitor_printf(mon, "%#" HWADDR_PRIx, val);
+ break;
+ case 'u':
+ monitor_printf(mon, "%" HWADDR_PRIu, val);
+ break;
+ default:
+ case 'd':
+ monitor_printf(mon, "%" HWADDR_PRId, val);
+ break;
+ case 'c':
+ monitor_printc(mon, val);
+ break;
+ }
+ monitor_printf(mon, "\n");
+}
+
+void hmp_sum(Monitor *mon, const QDict *qdict)
+{
+ uint32_t addr;
+ uint16_t sum;
+ uint32_t start = qdict_get_int(qdict, "start");
+ uint32_t size = qdict_get_int(qdict, "size");
+
+ sum = 0;
+ for(addr = start; addr < (start + size); addr++) {
+ uint8_t val = address_space_ldub(&address_space_memory, addr,
+ MEMTXATTRS_UNSPECIFIED, NULL);
+ /* BSD sum algorithm ('sum' Unix command) */
+ sum = (sum >> 1) | (sum << 15);
+ sum += val;
+ }
+ monitor_printf(mon, "%05d\n", sum);
+}
+
+void hmp_ioport_read(Monitor *mon, const QDict *qdict)
+{
+ int size = qdict_get_int(qdict, "size");
+ int addr = qdict_get_int(qdict, "addr");
+ int has_index = qdict_haskey(qdict, "index");
+ uint32_t val;
+ int suffix;
+
+ if (has_index) {
+ int index = qdict_get_int(qdict, "index");
+ cpu_outb(addr & IOPORTS_MASK, index & 0xff);
+ addr++;
+ }
+ addr &= 0xffff;
+
+ switch(size) {
+ default:
+ case 1:
+ val = cpu_inb(addr);
+ suffix = 'b';
+ break;
+ case 2:
+ val = cpu_inw(addr);
+ suffix = 'w';
+ break;
+ case 4:
+ val = cpu_inl(addr);
+ suffix = 'l';
+ break;
+ }
+ monitor_printf(mon, "port%c[0x%04x] = 0x%0*x\n",
+ suffix, addr, size * 2, val);
+}
+
+void hmp_ioport_write(Monitor *mon, const QDict *qdict)
+{
+ int size = qdict_get_int(qdict, "size");
+ int addr = qdict_get_int(qdict, "addr");
+ int val = qdict_get_int(qdict, "val");
+
+ addr &= IOPORTS_MASK;
+
+ switch (size) {
+ default:
+ case 1:
+ cpu_outb(addr, val);
+ break;
+ case 2:
+ cpu_outw(addr, val);
+ break;
+ case 4:
+ cpu_outl(addr, val);
+ break;
+ }
+}
+
+void hmp_boot_set(Monitor *mon, const QDict *qdict)
+{
+ Error *local_err = NULL;
+ const char *bootdevice = qdict_get_str(qdict, "bootdevice");
+
+ qemu_boot_set(bootdevice, &local_err);
+ if (local_err) {
+ error_report_err(local_err);
+ } else {
+ monitor_printf(mon, "boot device list now set to %s\n", bootdevice);
+ }
+}
+
+void hmp_info_mtree(Monitor *mon, const QDict *qdict)
+{
+ bool flatview = qdict_get_try_bool(qdict, "flatview", false);
+ bool dispatch_tree = qdict_get_try_bool(qdict, "dispatch_tree", false);
+ bool owner = qdict_get_try_bool(qdict, "owner", false);
+ bool disabled = qdict_get_try_bool(qdict, "disabled", false);
+
+ mtree_info(flatview, dispatch_tree, owner, disabled);
+}
diff --git a/monitor/misc.c b/monitor/misc.c
index 6764d4f49f..52a7d7686e 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -25,17 +25,11 @@
#include "qemu/osdep.h"
#include "monitor-internal.h"
#include "monitor/qdev.h"
-#include "exec/gdbstub.h"
#include "net/slirp.h"
-#include "qemu/log.h"
-#include "sysemu/sysemu.h"
#include "sysemu/device_tree.h"
-#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
#include "monitor/hmp-target.h"
#include "monitor/hmp.h"
-#include "exec/address-spaces.h"
-#include "exec/ioport.h"
#include "block/block-hmp-cmds.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
@@ -105,16 +99,6 @@ int hmp_compare_cmd(const char *name, const char *list)
return 0;
}
-static void do_help_cmd(Monitor *mon, const QDict *qdict)
-{
- hmp_help_cmd(mon, qdict_get_try_str(qdict, "name"));
-}
-
-static void hmp_info_help(Monitor *mon, const QDict *qdict)
-{
- hmp_help_cmd(mon, "info");
-}
-
static void monitor_init_qmp_commands(void)
{
/*
@@ -135,208 +119,6 @@ static void monitor_init_qmp_commands(void)
QCO_ALLOW_PRECONFIG, 0);
}
-static void hmp_info_sync_profile(Monitor *mon, const QDict *qdict)
-{
- int64_t max = qdict_get_try_int(qdict, "max", 10);
- bool mean = qdict_get_try_bool(qdict, "mean", false);
- bool coalesce = !qdict_get_try_bool(qdict, "no_coalesce", false);
- enum QSPSortBy sort_by;
-
- sort_by = mean ? QSP_SORT_BY_AVG_WAIT_TIME : QSP_SORT_BY_TOTAL_WAIT_TIME;
- qsp_report(max, sort_by, coalesce);
-}
-
-static void hmp_info_history(Monitor *mon, const QDict *qdict)
-{
- MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
- int i;
- const char *str;
-
- if (!hmp_mon->rs) {
- return;
- }
- i = 0;
- for(;;) {
- str = readline_get_history(hmp_mon->rs, i);
- if (!str) {
- break;
- }
- monitor_printf(mon, "%d: '%s'\n", i, str);
- i++;
- }
-}
-
-static void hmp_logfile(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
-
- if (!qemu_set_log_filename(qdict_get_str(qdict, "filename"), &err)) {
- error_report_err(err);
- }
-}
-
-static void hmp_log(Monitor *mon, const QDict *qdict)
-{
- int mask;
- const char *items = qdict_get_str(qdict, "items");
- Error *err = NULL;
-
- if (!strcmp(items, "none")) {
- mask = 0;
- } else {
- mask = qemu_str_to_log_mask(items);
- if (!mask) {
- hmp_help_cmd(mon, "log");
- return;
- }
- }
-
- if (!qemu_set_log(mask, &err)) {
- error_report_err(err);
- }
-}
-
-static void hmp_gdbserver(Monitor *mon, const QDict *qdict)
-{
- const char *device = qdict_get_try_str(qdict, "device");
- if (!device) {
- device = "tcp::" DEFAULT_GDBSTUB_PORT;
- }
-
- if (gdbserver_start(device) < 0) {
- monitor_printf(mon, "Could not open gdbserver on device '%s'\n",
- device);
- } else if (strcmp(device, "none") == 0) {
- monitor_printf(mon, "Disabled gdbserver\n");
- } else {
- monitor_printf(mon, "Waiting for gdb connection on device '%s'\n",
- device);
- }
-}
-
-static void do_print(Monitor *mon, const QDict *qdict)
-{
- int format = qdict_get_int(qdict, "format");
- hwaddr val = qdict_get_int(qdict, "val");
-
- switch(format) {
- case 'o':
- monitor_printf(mon, "%#" HWADDR_PRIo, val);
- break;
- case 'x':
- monitor_printf(mon, "%#" HWADDR_PRIx, val);
- break;
- case 'u':
- monitor_printf(mon, "%" HWADDR_PRIu, val);
- break;
- default:
- case 'd':
- monitor_printf(mon, "%" HWADDR_PRId, val);
- break;
- case 'c':
- monitor_printc(mon, val);
- break;
- }
- monitor_printf(mon, "\n");
-}
-
-static void hmp_sum(Monitor *mon, const QDict *qdict)
-{
- uint32_t addr;
- uint16_t sum;
- uint32_t start = qdict_get_int(qdict, "start");
- uint32_t size = qdict_get_int(qdict, "size");
-
- sum = 0;
- for(addr = start; addr < (start + size); addr++) {
- uint8_t val = address_space_ldub(&address_space_memory, addr,
- MEMTXATTRS_UNSPECIFIED, NULL);
- /* BSD sum algorithm ('sum' Unix command) */
- sum = (sum >> 1) | (sum << 15);
- sum += val;
- }
- monitor_printf(mon, "%05d\n", sum);
-}
-
-static void hmp_ioport_read(Monitor *mon, const QDict *qdict)
-{
- int size = qdict_get_int(qdict, "size");
- int addr = qdict_get_int(qdict, "addr");
- int has_index = qdict_haskey(qdict, "index");
- uint32_t val;
- int suffix;
-
- if (has_index) {
- int index = qdict_get_int(qdict, "index");
- cpu_outb(addr & IOPORTS_MASK, index & 0xff);
- addr++;
- }
- addr &= 0xffff;
-
- switch(size) {
- default:
- case 1:
- val = cpu_inb(addr);
- suffix = 'b';
- break;
- case 2:
- val = cpu_inw(addr);
- suffix = 'w';
- break;
- case 4:
- val = cpu_inl(addr);
- suffix = 'l';
- break;
- }
- monitor_printf(mon, "port%c[0x%04x] = 0x%0*x\n",
- suffix, addr, size * 2, val);
-}
-
-static void hmp_ioport_write(Monitor *mon, const QDict *qdict)
-{
- int size = qdict_get_int(qdict, "size");
- int addr = qdict_get_int(qdict, "addr");
- int val = qdict_get_int(qdict, "val");
-
- addr &= IOPORTS_MASK;
-
- switch (size) {
- default:
- case 1:
- cpu_outb(addr, val);
- break;
- case 2:
- cpu_outw(addr, val);
- break;
- case 4:
- cpu_outl(addr, val);
- break;
- }
-}
-
-static void hmp_boot_set(Monitor *mon, const QDict *qdict)
-{
- Error *local_err = NULL;
- const char *bootdevice = qdict_get_str(qdict, "bootdevice");
-
- qemu_boot_set(bootdevice, &local_err);
- if (local_err) {
- error_report_err(local_err);
- } else {
- monitor_printf(mon, "boot device list now set to %s\n", bootdevice);
- }
-}
-
-static void hmp_info_mtree(Monitor *mon, const QDict *qdict)
-{
- bool flatview = qdict_get_try_bool(qdict, "flatview", false);
- bool dispatch_tree = qdict_get_try_bool(qdict, "dispatch_tree", false);
- bool owner = qdict_get_try_bool(qdict, "owner", false);
- bool disabled = qdict_get_try_bool(qdict, "disabled", false);
-
- mtree_info(flatview, dispatch_tree, owner, disabled);
-}
-
/* Please update hmp-commands.hx when adding or changing commands */
static HMPCommand hmp_info_cmds[] = {
#include "hmp-commands-info.h"
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 673e39a697..fbb5daf09b 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -11,7 +11,7 @@ HXCOMM HXCOMM can be used for comments, discarded from both rST and C.
.args_type = "name:S?",
.params = "[cmd]",
.help = "show the help",
- .cmd = do_help_cmd,
+ .cmd = hmp_help,
.flags = "p",
},
@@ -563,7 +563,7 @@ ERST
.args_type = "fmt:/,val:l",
.params = "/fmt expr",
.help = "print expression value (use $reg for CPU register access)",
- .cmd = do_print,
+ .cmd = hmp_print,
},
SRST
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 30/32] monitor: Move remaining QMP stuff from misc.c to qmp-cmds.c
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (28 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 29/32] monitor: Move remaining HMP commands from misc.c to hmp-cmds.c Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 31/32] monitor: Loosen coupling between misc.c and monitor.c slightly Markus Armbruster
2023-01-24 12:19 ` [PATCH 32/32] monitor: Rename misc.c to hmp-target.c Markus Armbruster
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor/misc.c | 51 --------------------------------------------
monitor/qmp-cmds.c | 53 +++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/monitor/misc.c b/monitor/misc.c
index 52a7d7686e..9ddf32da97 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -27,14 +27,12 @@
#include "monitor/qdev.h"
#include "net/slirp.h"
#include "sysemu/device_tree.h"
-#include "qapi/qmp/qerror.h"
#include "monitor/hmp-target.h"
#include "monitor/hmp.h"
#include "block/block-hmp-cmds.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-machine.h"
-#include "qapi/qapi-init-commands.h"
#include "qapi/error.h"
#include "qemu/cutils.h"
@@ -48,34 +46,6 @@
static HMPCommand hmp_info_cmds[];
-char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
- int64_t cpu_index, Error **errp)
-{
- char *output = NULL;
- MonitorHMP hmp = {};
-
- monitor_data_init(&hmp.common, false, true, false);
-
- if (has_cpu_index) {
- int ret = monitor_set_cpu(&hmp.common, cpu_index);
- if (ret < 0) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index",
- "a CPU number");
- goto out;
- }
- }
-
- handle_hmp_command(&hmp, command_line);
-
- WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) {
- output = g_strdup(hmp.common.outbuf->str);
- }
-
-out:
- monitor_data_destroy(&hmp.common);
- return output;
-}
-
/**
* Is @name in the '|' separated list of names @list?
*/
@@ -99,26 +69,6 @@ int hmp_compare_cmd(const char *name, const char *list)
return 0;
}
-static void monitor_init_qmp_commands(void)
-{
- /*
- * Two command lists:
- * - qmp_commands contains all QMP commands
- * - qmp_cap_negotiation_commands contains just
- * "qmp_capabilities", to enforce capability negotiation
- */
-
- qmp_init_marshal(&qmp_commands);
-
- qmp_register_command(&qmp_commands, "device_add",
- qmp_device_add, 0, 0);
-
- QTAILQ_INIT(&qmp_cap_negotiation_commands);
- qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities",
- qmp_marshal_qmp_capabilities,
- QCO_ALLOW_PRECONFIG, 0);
-}
-
/* Please update hmp-commands.hx when adding or changing commands */
static HMPCommand hmp_info_cmds[] = {
#include "hmp-commands-info.h"
@@ -230,6 +180,5 @@ void monitor_register_hmp_info_hrt(const char *name,
void monitor_init_globals(void)
{
monitor_init_globals_core();
- monitor_init_qmp_commands();
sortcmdlist();
}
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index cc22f3fcc7..859012aef4 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -14,7 +14,8 @@
*/
#include "qemu/osdep.h"
-#include "monitor/monitor.h"
+#include "monitor-internal.h"
+#include "monitor/qdev.h"
#include "monitor/qmp-helpers.h"
#include "sysemu/sysemu.h"
#include "sysemu/kvm.h"
@@ -22,8 +23,10 @@
#include "sysemu/runstate-action.h"
#include "sysemu/block-backend.h"
#include "qapi/error.h"
+#include "qapi/qapi-init-commands.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
+#include "qapi/qmp/qerror.h"
#include "qapi/type-helpers.h"
#include "hw/mem/memory-device.h"
#include "hw/intc/intc.h"
@@ -151,3 +154,51 @@ void qmp_add_client(const char *protocol, const char *fdname,
close(fd);
}
}
+
+char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
+ int64_t cpu_index, Error **errp)
+{
+ char *output = NULL;
+ MonitorHMP hmp = {};
+
+ monitor_data_init(&hmp.common, false, true, false);
+
+ if (has_cpu_index) {
+ int ret = monitor_set_cpu(&hmp.common, cpu_index);
+ if (ret < 0) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index",
+ "a CPU number");
+ goto out;
+ }
+ }
+
+ handle_hmp_command(&hmp, command_line);
+
+ WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) {
+ output = g_strdup(hmp.common.outbuf->str);
+ }
+
+out:
+ monitor_data_destroy(&hmp.common);
+ return output;
+}
+
+static void __attribute__((__constructor__)) monitor_init_qmp_commands(void)
+{
+ /*
+ * Two command lists:
+ * - qmp_commands contains all QMP commands
+ * - qmp_cap_negotiation_commands contains just
+ * "qmp_capabilities", to enforce capability negotiation
+ */
+
+ qmp_init_marshal(&qmp_commands);
+
+ qmp_register_command(&qmp_commands, "device_add",
+ qmp_device_add, 0, 0);
+
+ QTAILQ_INIT(&qmp_cap_negotiation_commands);
+ qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities",
+ qmp_marshal_qmp_capabilities,
+ QCO_ALLOW_PRECONFIG, 0);
+}
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 31/32] monitor: Loosen coupling between misc.c and monitor.c slightly
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (29 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 30/32] monitor: Move remaining QMP stuff from misc.c to qmp-cmds.c Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
2023-01-24 12:19 ` [PATCH 32/32] monitor: Rename misc.c to hmp-target.c Markus Armbruster
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor/misc.c | 8 +-------
monitor/monitor.c | 2 +-
storage-daemon/qemu-storage-daemon.c | 4 ++--
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/monitor/misc.c b/monitor/misc.c
index 9ddf32da97..99317a8ff4 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -135,7 +135,7 @@ compare_mon_cmd(const void *a, const void *b)
((const HMPCommand *)b)->name);
}
-static void sortcmdlist(void)
+static void __attribute__((__constructor__)) sortcmdlist(void)
{
qsort(hmp_cmds, ARRAY_SIZE(hmp_cmds) - 1,
sizeof(*hmp_cmds),
@@ -176,9 +176,3 @@ void monitor_register_hmp_info_hrt(const char *name,
}
g_assert_not_reached();
}
-
-void monitor_init_globals(void)
-{
- monitor_init_globals_core();
- sortcmdlist();
-}
diff --git a/monitor/monitor.c b/monitor/monitor.c
index 0a990633d8..ca233ab80f 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -719,7 +719,7 @@ static void monitor_qapi_event_init(void)
qapi_event_throttle_equal);
}
-void monitor_init_globals_core(void)
+void monitor_init_globals(void)
{
monitor_qapi_event_init();
qemu_mutex_init(&monitor_lock);
diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c
index da19498c66..0e9354faa6 100644
--- a/storage-daemon/qemu-storage-daemon.c
+++ b/storage-daemon/qemu-storage-daemon.c
@@ -299,7 +299,7 @@ static void process_options(int argc, char *argv[], bool pre_init_pass)
case OPTION_DAEMONIZE:
if (os_set_daemonize(true) < 0) {
/*
- * --daemonize is parsed before monitor_init_globals_core(), so
+ * --daemonize is parsed before monitor_init_globals(), so
* error_report() does not work yet
*/
fprintf(stderr, "--daemonize not supported in this build\n");
@@ -411,7 +411,7 @@ int main(int argc, char *argv[])
qemu_add_opts(&qemu_trace_opts);
qcrypto_init(&error_fatal);
bdrv_init();
- monitor_init_globals_core();
+ monitor_init_globals();
init_qmp_commands();
if (!trace_init_backends()) {
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread* [PATCH 32/32] monitor: Rename misc.c to hmp-target.c
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
` (30 preceding siblings ...)
2023-01-24 12:19 ` [PATCH 31/32] monitor: Loosen coupling between misc.c and monitor.c slightly Markus Armbruster
@ 2023-01-24 12:19 ` Markus Armbruster
31 siblings, 0 replies; 44+ messages in thread
From: Markus Armbruster @ 2023-01-24 12:19 UTC (permalink / raw)
To: qemu-devel
Cc: pbonzini, kraxel, kwolf, hreitz, marcandre.lureau, dgilbert, mst,
imammedo, ani, eduardo, marcel.apfelbaum, philmd, wangyanan55,
jasowang, jiri, berrange, thuth, quintela, stefanb, stefanha,
kvm, qemu-block
What's left in misc.c is exactly the target-dependent part of the HMP
core. Rename accordingly.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
monitor/{misc.c => hmp-target.c} | 2 +-
monitor/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename monitor/{misc.c => hmp-target.c} (99%)
diff --git a/monitor/misc.c b/monitor/hmp-target.c
similarity index 99%
rename from monitor/misc.c
rename to monitor/hmp-target.c
index 99317a8ff4..1eb72ac1bf 100644
--- a/monitor/misc.c
+++ b/monitor/hmp-target.c
@@ -1,5 +1,5 @@
/*
- * QEMU monitor
+ * QEMU monitor, target-dependent part
*
* Copyright (c) 2003-2004 Fabrice Bellard
*
diff --git a/monitor/meson.build b/monitor/meson.build
index 795a271545..ccb4d1a8e6 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -8,4 +8,4 @@ softmmu_ss.add(files(
softmmu_ss.add([spice_headers, files('qmp-cmds.c')])
specific_ss.add(when: 'CONFIG_SOFTMMU',
- if_true: [files( 'hmp-cmds-target.c', 'misc.c'), spice])
+ if_true: [files( 'hmp-cmds-target.c', 'hmp-target.c'), spice])
--
2.39.0
^ permalink raw reply related [flat|nested] 44+ messages in thread