[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 2/2] virtio: add `info virtio' HMP command
From: |
Jan Dakinevich |
Subject: |
[Qemu-devel] [PATCH v4 2/2] virtio: add `info virtio' HMP command |
Date: |
Tue, 3 Oct 2017 15:47:41 +0300 |
The command prints data from `query-virtio' QMP in human-readable
format.
Cc: Denis V. Lunev <address@hidden>
Signed-off-by: Jan Dakinevich <address@hidden>
---
hmp-commands-info.hx | 14 ++++++++++
hmp.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++
hmp.h | 1 +
3 files changed, 94 insertions(+)
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index 4f1ece9..2550027 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -868,6 +868,20 @@ ETEXI
},
STEXI
address@hidden info virtio
address@hidden virtio
+Display guest and host fetures for all virtio devices.
+ETEXI
+
+ {
+ .name = "virtio",
+ .args_type = "",
+ .params = "",
+ .help = "show virtio info",
+ .cmd = hmp_info_virtio,
+ },
+
+STEXI
@end table
ETEXI
diff --git a/hmp.c b/hmp.c
index ace729d..c4dd280 100644
--- a/hmp.c
+++ b/hmp.c
@@ -43,6 +43,7 @@
#include "hw/intc/intc.h"
#include "migration/snapshot.h"
#include "migration/misc.h"
+#include "hw/virtio/virtio.h"
#ifdef CONFIG_SPICE
#include <spice/enums.h>
@@ -2894,3 +2895,81 @@ void hmp_info_memory_size_summary(Monitor *mon, const
QDict *qdict)
}
hmp_handle_error(mon, &err);
}
+
+#define HMP_INFO_VIRTIO_INDENT 2
+#define HMP_INFO_VIRTIO_FIELD 32
+
+static void hmp_info_virtio_print_status(Monitor *mon, VirtioInfo *info,
+ VirtioInfoDevice *device)
+{
+ VirtioInfoBitList *lbit;
+ const char *comma = "";
+
+ for (lbit = info->status_names; lbit; lbit = lbit->next) {
+ if (!(device->status & (1ull << lbit->value->bit))) {
+ continue;
+ }
+ monitor_printf(mon, "%s%s", comma, lbit->value->name);
+ comma = ",";
+ }
+ monitor_printf(mon, "\n");
+}
+
+static void hmp_info_virtio_print_features(Monitor *mon,
+ VirtioInfoBitList *list,
+ VirtioInfoDevice *device)
+{
+ VirtioInfoBitList *lbit;
+
+ for (lbit = list; lbit; lbit = lbit->next) {
+ const char *ack = virtio_has_feature(device->guest_features,
+ lbit->value->bit) ? "acked" : "";
+ if (!virtio_has_feature(device->host_features, lbit->value->bit)) {
+ continue;
+ }
+ monitor_printf(mon, "%*s%*s%*s\n", HMP_INFO_VIRTIO_INDENT, "",
+ HMP_INFO_VIRTIO_FIELD, lbit->value->name,
+ HMP_INFO_VIRTIO_FIELD, ack);
+ }
+}
+
+static void hmp_info_virtio_print(Monitor *mon, VirtioInfo *info,
+ VirtioInfoDevice *device)
+{
+ Object *obj = object_resolve_path(device->qom_path, NULL);
+ char *path = qdev_get_dev_path(DEVICE(obj));
+
+ monitor_printf(mon, "%s at %s\n", object_get_typename(obj), path);
+ g_free(path);
+
+ monitor_printf(mon, "%*sstatus: 0x%02"PRIx64" ",
+ HMP_INFO_VIRTIO_INDENT, "", device->status);
+ hmp_info_virtio_print_status(mon, info, device);
+
+ monitor_printf(mon, "%*shost features: 0x%016"PRIx64"\n",
+ HMP_INFO_VIRTIO_INDENT, "", device->host_features);
+ monitor_printf(mon, "%*sguest features: 0x%016"PRIx64"\n",
+ HMP_INFO_VIRTIO_INDENT, "", device->guest_features);
+
+ monitor_printf(mon, "%*scommon features:\n", HMP_INFO_VIRTIO_INDENT, "");
+ hmp_info_virtio_print_features(mon, info->feature_names, device);
+
+ monitor_printf(mon, "%*sspecific features:\n", HMP_INFO_VIRTIO_INDENT, "");
+ hmp_info_virtio_print_features(mon, device->feature_names, device);
+}
+
+void hmp_info_virtio(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ VirtioInfo *info;
+ VirtioInfoDeviceList *ldevice;
+
+ info = qmp_query_virtio(&err);
+ if (err) {
+ return;
+ }
+
+ for (ldevice = info->devices; ldevice; ldevice = ldevice->next) {
+ hmp_info_virtio_print(mon, info, ldevice->value);
+ }
+}
diff --git a/hmp.h b/hmp.h
index 3605003..3e8f30a 100644
--- a/hmp.h
+++ b/hmp.h
@@ -146,5 +146,6 @@ void hmp_info_ramblock(Monitor *mon, const QDict *qdict);
void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict);
void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict);
void hmp_info_memory_size_summary(Monitor *mon, const QDict *qdict);
+void hmp_info_virtio(Monitor *mon, const QDict *qdict);
#endif
--
2.1.4
- [Qemu-devel] [PATCH v4 0/2] virtio: introduce `info virtio' hmp command, Jan Dakinevich, 2017/10/03
- [Qemu-devel] [PATCH v4 2/2] virtio: add `info virtio' HMP command,
Jan Dakinevich <=
- [Qemu-devel] [PATCH v4 1/2] virtio: introduce `query-virtio' QMP command, Jan Dakinevich, 2017/10/03
- Re: [Qemu-devel] [PATCH v4 1/2] virtio: introduce `query-virtio' QMP command, Eric Blake, 2017/10/03
- Re: [Qemu-devel] [PATCH v4 1/2] virtio: introduce `query-virtio' QMP command, Jan Dakinevich, 2017/10/03
- Re: [Qemu-devel] [PATCH v4 1/2] virtio: introduce `query-virtio' QMP command, Dr. David Alan Gilbert, 2017/10/03
- Re: [Qemu-devel] [PATCH v4 1/2] virtio: introduce `query-virtio' QMP command, Jan Dakinevich, 2017/10/04
- Re: [Qemu-devel] [PATCH v4 1/2] virtio: introduce `query-virtio' QMP command, Eric Blake, 2017/10/04
- Re: [Qemu-devel] [PATCH v4 1/2] virtio: introduce `query-virtio' QMP command, Jan Dakinevich, 2017/10/05
- Re: [Qemu-devel] [PATCH v4 1/2] virtio: introduce `query-virtio' QMP command, Markus Armbruster, 2017/10/06
- Re: [Qemu-devel] [PATCH v4 1/2] virtio: introduce `query-virtio' QMP command, Dr. David Alan Gilbert, 2017/10/06