From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 22/35] virtio: Move HMP commands from monitor/ to hw/virtio/
Date: Fri, 3 Feb 2023 09:45:36 +0100 [thread overview]
Message-ID: <20230203084549.2622302-23-armbru@redhat.com> (raw)
In-Reply-To: <20230203084549.2622302-1-armbru@redhat.com>
This moves these commands from MAINTAINERS section "Human
Monitor (HMP)" to "virtio".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230124121946.1139465-20-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
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
next prev parent reply other threads:[~2023-02-03 8:51 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-03 8:45 [PULL 00/35] Monitor patches for 2023-02-03 Markus Armbruster
2023-02-03 8:45 ` [PULL 01/35] MAINTAINERS: Cover userfaultfd Markus Armbruster
2023-02-03 8:45 ` [PULL 02/35] MAINTAINERS: Cover include/sysemu/accel-blocker.h Markus Armbruster
2023-02-03 8:45 ` [PULL 03/35] MAINTAINERS: Cover tpm.c again Markus Armbruster
2023-02-03 8:45 ` [PULL 04/35] monitor: Drop unnecessary includes Markus Armbruster
2023-02-03 8:45 ` [PULL 05/35] audio: Move HMP commands from monitor/ to audio/ Markus Armbruster
2023-02-03 8:45 ` [PULL 06/35] char: Move HMP commands from monitor/ to chardev/ Markus Armbruster
2023-02-03 8:45 ` [PULL 07/35] char: Factor out qmp_add_client() parts and move " Markus Armbruster
2023-02-03 8:45 ` [PULL 08/35] hmp: Drop redundant argument check from add_completion_option() Markus Armbruster
2023-02-03 8:45 ` [PULL 09/35] readline: Extract readline_add_completion_of() from monitor Markus Armbruster
2023-02-08 8:44 ` Philippe Mathieu-Daudé
2023-02-08 10:53 ` Markus Armbruster
2023-02-08 11:06 ` Philippe Mathieu-Daudé
2023-02-03 8:45 ` [PULL 10/35] hmp: Rename help_cmd() to hmp_help_cmd(), move declaration to hmp.h Markus Armbruster
2023-02-03 8:45 ` [PULL 11/35] trace: Move HMP commands from monitor/ to trace/ Markus Armbruster
2023-02-03 8:45 ` [PULL 12/35] machine: Move QMP commands from monitor/ to hw/core/ Markus Armbruster
2023-02-03 8:45 ` [PULL 13/35] machine: Move HMP " Markus Armbruster
2023-02-03 8:45 ` [PULL 14/35] qom: Move HMP commands from monitor/ to qom/ Markus Armbruster
2023-02-03 8:45 ` [PULL 15/35] block: Factor out hmp_change_medium(), and move to block/monitor/ Markus Armbruster
2023-02-03 8:45 ` [PULL 16/35] rocker: Move HMP commands from monitor to hw/net/rocker/ Markus Armbruster
2023-02-03 8:45 ` [PULL 17/35] hmp: Rewrite strlist_from_comma_list() as hmp_split_at_comma() Markus Armbruster
2023-02-03 8:45 ` [PULL 18/35] net: Move HMP commands from monitor to net/ Markus Armbruster
2023-02-03 8:45 ` [PULL 19/35] net: Move hmp_info_network() to net-hmp-cmds.c Markus Armbruster
2023-02-03 8:45 ` [PULL 20/35] migration: Move HMP commands from monitor/ to migration/ Markus Armbruster
2023-02-03 8:45 ` [PULL 21/35] migration: Move the QMP command " Markus Armbruster
2023-02-03 8:45 ` Markus Armbruster [this message]
2023-02-03 8:45 ` [PULL 23/35] tpm: Move HMP commands from monitor/ to softmmu/ Markus Armbruster
2023-02-03 8:45 ` [PULL 24/35] runstate: " Markus Armbruster
2023-02-03 8:45 ` [PULL 25/35] stats: Move QMP commands from monitor/ to stats/ Markus Armbruster
2023-02-03 8:45 ` [PULL 26/35] stats: Move HMP " Markus Armbruster
2023-02-03 8:45 ` [PULL 27/35] acpi: Move the QMP command from monitor/ to hw/acpi/ Markus Armbruster
2023-02-03 8:45 ` [PULL 28/35] qdev: Move HMP command completion from monitor to softmmu/ Markus Armbruster
2023-02-03 8:45 ` [PULL 29/35] monitor: Split file descriptor passing stuff off misc.c Markus Armbruster
2023-02-03 8:45 ` [PULL 30/35] monitor: Move monitor_putc() next to monitor_puts & external linkage Markus Armbruster
2023-02-03 8:45 ` [PULL 31/35] monitor: Move target-dependent HMP commands to hmp-cmds-target.c Markus Armbruster
2023-02-03 8:45 ` [PULL 32/35] monitor: Move remaining HMP commands from misc.c to hmp-cmds.c Markus Armbruster
2023-02-03 8:45 ` [PULL 33/35] monitor: Move remaining QMP stuff from misc.c to qmp-cmds.c Markus Armbruster
2023-02-03 8:45 ` [PULL 34/35] monitor: Loosen coupling between misc.c and monitor.c slightly Markus Armbruster
2023-02-03 8:45 ` [PULL 35/35] monitor: Rename misc.c to hmp-target.c Markus Armbruster
2023-02-03 15:32 ` [PULL 00/35] Monitor patches for 2023-02-03 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230203084549.2622302-23-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).