From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F6DFCA90AF for ; Wed, 13 May 2020 10:52:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 05714206B8 for ; Wed, 13 May 2020 10:52:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Hy9RVKNJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 05714206B8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYozp-0007r6-6e for qemu-devel@archiver.kernel.org; Wed, 13 May 2020 06:52:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYozE-0007BX-9S for qemu-devel@nongnu.org; Wed, 13 May 2020 06:51:40 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57475 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jYozC-0000DS-4C for qemu-devel@nongnu.org; Wed, 13 May 2020 06:51:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589367097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=s2lrfECGvPydtUeCU8gWxJNWBoG+c20FbJqyzvzry6U=; b=Hy9RVKNJkBt2niRH8UeCzXD1W/VvxLOftVYwOZ0vZUKPecih+Lgqo3jESZrw4h3/2jPLmx XZeDT1jaxssElOzauZa7aZ8XS5HvrdJTGLF11Kca5Smska2Jyj7CbbZT3p+1PUFITNX1dm 8I7+mQxDsZ16t3ncfMikrpl4jJXIWHY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-326-joMULhEPNeGPot-lErNfag-1; Wed, 13 May 2020 06:51:31 -0400 X-MC-Unique: joMULhEPNeGPot-lErNfag-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9D526107ACF4; Wed, 13 May 2020 10:51:30 +0000 (UTC) Received: from work-vm (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD5F162B1E; Wed, 13 May 2020 10:51:07 +0000 (UTC) Date: Wed, 13 May 2020 11:51:05 +0100 From: "Dr. David Alan Gilbert" To: Laurent Vivier Subject: Re: [RFC v4 6/6] hmp: add x-debug-virtio commands Message-ID: <20200513105105.GE3225@work-vm> References: <20200507134800.10837-1-lvivier@redhat.com> <20200507134800.10837-7-lvivier@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200507134800.10837-7-lvivier@redhat.com> User-Agent: Mutt/1.13.4 (2020-02-15) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.120; envelope-from=dgilbert@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/13 01:56:38 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, T_HK_NAME_DR=0.01 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , Thomas Huth , Michael Roth , qemu-block@nongnu.org, Amit Shah , Jason Wang , "Michael S. Tsirkin" , David Hildenbrand , qemu-devel@nongnu.org, Markus Armbruster , Eric Auger , Gerd Hoffmann , Stefan Hajnoczi , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Paolo Bonzini , Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Laurent Vivier (lvivier@redhat.com) wrote: > This patch implements HMP version of the virtio QMP commands > > Signed-off-by: Laurent Vivier Reviewed-by: Dr. David Alan Gilbert With a thought below.... > --- > Makefile | 2 +- > Makefile.target | 7 +- > docs/system/monitor.rst | 2 + > hmp-commands-virtio.hx | 160 +++++++++++++++++++++++++++++++++ > hmp-commands.hx | 10 +++ > hw/virtio/virtio.c | 193 +++++++++++++++++++++++++++++++++++++++- > include/monitor/hmp.h | 4 + > monitor/misc.c | 17 ++++ > 8 files changed, 391 insertions(+), 4 deletions(-) > create mode 100644 hmp-commands-virtio.hx > > diff --git a/Makefile b/Makefile > index 34275f57c9cb..feb300ebb2d4 100644 > --- a/Makefile > +++ b/Makefile > @@ -1099,7 +1099,7 @@ $(MANUAL_BUILDDIR)/interop/index.html: $(call manual-deps,interop) > $(MANUAL_BUILDDIR)/specs/index.html: $(call manual-deps,specs) > $(call build-manual,specs,html) > > -$(MANUAL_BUILDDIR)/system/index.html: $(call manual-deps,system) $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/qemu-options.hx > +$(MANUAL_BUILDDIR)/system/index.html: $(call manual-deps,system) $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/hmp-commands-virtio.hx > $(call build-manual,system,html) > > $(MANUAL_BUILDDIR)/tools/index.html: $(call manual-deps,tools) $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/docs/qemu-option-trace.rst.inc > diff --git a/Makefile.target b/Makefile.target > index 8ed1eba95b9c..66d3ff9bc350 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -171,7 +171,7 @@ else > obj-y += hw/$(TARGET_BASE_ARCH)/ > endif > > -generated-files-y += hmp-commands.h hmp-commands-info.h > +generated-files-y += hmp-commands.h hmp-commands-info.h hmp-commands-virtio.h > generated-files-y += config-devices.h > > endif # CONFIG_SOFTMMU > @@ -220,10 +220,13 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool > hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool > $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") > > +hmp-commands-virtio.h: $(SRC_PATH)/hmp-commands-virtio.hx $(SRC_PATH)/scripts/hxtool > + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$(TARGET_DIR)$@") > + > clean: clean-target > rm -f *.a *~ $(PROGS) > rm -f $(shell find . -name '*.[od]') > - rm -f hmp-commands.h gdbstub-xml.c > + rm -f hmp-commands.h hmp-commands-virtio.h gdbstub-xml.c > rm -f trace/generated-helpers.c trace/generated-helpers.c-timestamp > ifdef CONFIG_TRACE_SYSTEMTAP > rm -f *.stp > diff --git a/docs/system/monitor.rst b/docs/system/monitor.rst > index 0bcd5da21644..985c3f51ffe7 100644 > --- a/docs/system/monitor.rst > +++ b/docs/system/monitor.rst > @@ -21,6 +21,8 @@ The following commands are available: > > .. hxtool-doc:: hmp-commands.hx > > +.. hxtool-doc:: hmp-commands-virtio.hx > + > .. hxtool-doc:: hmp-commands-info.hx > > Integer expressions > diff --git a/hmp-commands-virtio.hx b/hmp-commands-virtio.hx > new file mode 100644 > index 000000000000..14cb14bfcc70 > --- /dev/null > +++ b/hmp-commands-virtio.hx > @@ -0,0 +1,160 @@ > +HXCOMM Use DEFHEADING() to define headings in both help text and rST. > +HXCOMM Text between SRST and ERST is copied to the rST version and > +HXCOMM discarded from C version. > +HXCOMM DEF(command, args, callback, arg_string, help) is used to construct > +HXCOMM monitor info commands > +HXCOMM HXCOMM can be used for comments, discarded from both rST and C. > +HXCOMM > +HXCOMM In this file, generally SRST fragments should have two extra > +HXCOMM spaces of indent, so that the documentation list item for "x-debug-virtio cmd" > +HXCOMM appears inside the documentation list item for the top level > +HXCOMM "x-debug-virtio" documentation entry. The exception is the first SRST > +HXCOMM fragment that defines that top level entry. > + > +SRST > +``x-debug-virtio`` *subcommand* > + Show various information about virtio. > + > + Example: > + > + List all sub-commands:: > + > + (qemu) x-debug-virtio > + x-debug-virtio query -- List all available virtio devices > + x-debug-virtio status path -- Display status of a given virtio device > + x-debug-virtio queue-status path queue -- Display status of a given virtio queue > + x-debug-virtio queue-element path queue [index] -- Display element of a given virtio queue > + > +ERST > + > + { > + .name = "query", > + .args_type = "", > + .params = "", > + .help = "List all available virtio devices", > + .cmd = hmp_x_debug_virtio_query, > + .flags = "p", > + }, > + > +SRST > + ``x-debug-virtio query`` > + List all available virtio devices > + > + Example: > + > + List all available virtio devices in the machine:: > + > + (qemu) x-debug-virtio query > + /machine/peripheral-anon/device[3]/virtio-backend [virtio-net] > + /machine/peripheral-anon/device[1]/virtio-backend [virtio-serial] > + /machine/peripheral-anon/device[0]/virtio-backend [virtio-blk] > + > +ERST > + > + { > + .name = "status", > + .args_type = "path:s", > + .params = "path", > + .help = "Display status of a given virtio device", > + .cmd = hmp_x_debug_virtio_status, > + .flags = "p", > + }, > + > +SRST > + ``x-debug-virtio status`` *path* > + Display status of a given virtio device > + > + Example: > + > + Dump the status of the first virtio device:: > + > + (qemu) x-debug-virtio status /machine/peripheral-anon/device[3]/virtio-backend > + /machine/peripheral-anon/device[3]/virtio-backend: > + Device Id: 1 > + Guest features: event-idx, indirect-desc, version-1 > + ctrl-mac-addr, guest-announce, ctrl-vlan, ctrl-rx, ctrl-vq, status, mrg-rxbuf, host-ufo, host-ecn, host-tso6, host-tso4, guest-ufo, guest-ecn, guest-tso6, guest-tso4, mac, ctrl-guest-offloads, guest-csum, csum > + Host features: event-idx, indirect-desc, bad-feature, version-1, any-layout, notify-on-empty > + gso, ctrl-mac-addr, guest-announce, ctrl-rx-extra, ctrl-vlan, ctrl-rx, ctrl-vq, status, mrg-rxbuf, host-ufo, host-ecn, host-tso6, host-tso4, guest-ufo, guest-ecn, guest-tso6, guest-tso4, mac, ctrl-guest-offloads, guest-csum, csum > + Backend features: > + Endianness: little > + VirtQueues: 3 > + > +ERST > + > + { > + .name = "queue-status", > + .args_type = "path:s,queue:i", > + .params = "path queue", > + .help = "Display status of a given virtio queue", > + .cmd = hmp_x_debug_virtio_queue_status, > + .flags = "p", > + }, > + > +SRST > + ``x-debug-virtio queue-status`` *path* *queue* > + Display status of a given virtio queue > + > + Example: > + > + Dump the status of the first queue of the first virtio device:: > + > + (qemu) x-debug-virtio queue-status /machine/peripheral-anon/device[3]/virtio-backend 0 > + /machine/peripheral-anon/device[3]/virtio-backend: > + index: 0 > + inuse: 0 > + last_avail_idx: 61 > + shadow_avail_idx: 292 > + signalled_used: 61 > + signalled_used_valid: 1 > + VRing: > + num: 256 > + num_default: 256 > + align: 4096 > + desc: 0x000000006c352000 > + avail: 0x000000006c353000 > + used: 0x000000006c353240 > + > +ERST > + > + { > + .name = "queue-element", > + .args_type = "path:s,queue:i,index:i?", > + .params = "path queue [index]", > + .help = "Display element of a given virtio queue", > + .cmd = hmp_x_debug_virtio_queue_element, > + .flags = "p", > + }, > + > +SRST > + ``x-debug-virtio queue-element`` *path* *queue* [*index*] > + Display element of a given virtio queue > + > + Example: > + > + Dump the information of the head element of the first queue of > + the first virtio device:: > + > + (qemu) x-debug-virtio queue-element/machine/peripheral-anon/device[3]/virtio-backend 0 > + index: 67 > + ndescs: 1 > + descs: addr 0x6fe69800 len 1536 (write) > + > + (qemu) xp/128bx 0x6fe69800 > + 000000006fe69800: 0x02 0x00 0x00 0x00 0x00 0x00 0x00 0x00 > + 000000006fe69808: 0x00 0x00 0x01 0x00 0x52 0x54 0x00 0x12 > + 000000006fe69810: 0x34 0x56 0x52 0x54 0x00 0x09 0x51 0xde > + 000000006fe69818: 0x08 0x00 0x45 0x00 0x00 0x4c 0x8f 0x32 > + > + device[3] is a virtio-net device and we can see in the element buffer the > + MAC address of the card:: > + > + [root@localhost ~]# ip link show ens4 > + 2: ens4: mtu 1500 qdisc fq_codel state UP m0 > + link/ether 52:54:00:12:34:56 brd ff:ff:ff:ff:ff:ff > + > + and the MAC address of the gateway:: > + > + [root@localhost ~]# arp -a > + _gateway (192.168.122.1) at 52:54:00:09:51:de [ether] on ens4 > + > +ERST > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 7f0f3974ad90..777761dc48d7 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1804,6 +1804,16 @@ SRST > Set QOM property *property* of object at location *path* to value *value* > ERST > > + { > + .name = "x-debug-virtio", > + .args_type = "name:S?", > + .params = "[cmd]", > + .help = "show various information about virtio", > + .cmd = hmp_x_debug_virtio_help, > + .sub_table = hmp_x_debug_virtio_cmds, > + .flags = "p", > + }, > + > { > .name = "info", > .args_type = "item:s?", > diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > index 66dc2cef1b39..c3d6b783417e 100644 > --- a/hw/virtio/virtio.c > +++ b/hw/virtio/virtio.c > @@ -30,6 +30,9 @@ > #include "sysemu/dma.h" > #include "sysemu/runstate.h" > #include "config-devices.h" > +#include "monitor/hmp.h" > +#include "monitor/monitor.h" > +#include "qapi/qmp/qdict.h" > > static QTAILQ_HEAD(, VirtIODevice) virtio_list; > > @@ -3861,6 +3864,32 @@ VirtioInfoList *qmp_x_debug_query_virtio(Error **errp) > return list; > } > > +void hmp_x_debug_virtio_query(Monitor *mon, const QDict *qdict) > +{ > + Error *err = NULL; > + VirtioInfoList *list = qmp_x_debug_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, > + VirtioType_str(node->value->type)); > + node = node->next; > + } > + > + qapi_free_VirtioInfoList(list); > +} > + > static VirtIODevice *virtio_device_find(const char *path) > { > VirtIODevice *vdev; > @@ -3912,8 +3941,38 @@ VirtQueueStatus *qmp_x_debug_virtio_queue_status(const char *path, > return status; > } > > +void hmp_x_debug_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_debug_virtio_queue_status(path, queue, &err); > + > + if (err != NULL) { > + hmp_handle_error(mon, err); > + return; > + } > + monitor_printf(mon, "%s:\n", path); > + monitor_printf(mon, " index: %d\n", s->queue_index); > + monitor_printf(mon, " inuse: %d\n", s->inuse); > + monitor_printf(mon, " last_avail_idx: %d\n", s->last_avail_idx); > + monitor_printf(mon, " shadow_avail_idx: %d\n", s->shadow_avail_idx); > + monitor_printf(mon, " signalled_used: %d\n", s->signalled_used); > + monitor_printf(mon, " signalled_used_valid: %d\n", > + s->signalled_used_valid); > + monitor_printf(mon, " VRing:\n"); > + monitor_printf(mon, " num: %"PRId64"\n", s->vring_num); > + monitor_printf(mon, " num_default: %"PRId64"\n", s->vring_num_default); > + monitor_printf(mon, " align: %"PRId64"\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); > +} > + > #define CONVERT_FEATURES(type, map) \ > - ({ \ > + ({ \ > type *list = NULL; \ > type *node; \ > for (i = 0; map[i].virtio_bit != -1; i++) {\ > @@ -4033,6 +4092,92 @@ VirtioStatus *qmp_x_debug_virtio_status(const char* path, Error **errp) > return status; > } > > +#define DUMP_FEATURES(type, field) \ > + do { \ > + type##FeatureList *list = features->device->u.field.data; \ > + if (list) { \ > + monitor_printf(mon, " "); \ > + while (list) { \ > + monitor_printf(mon, "%s", type##Feature_str(list->value)); \ > + list = list->next; \ > + if (list != NULL) { \ > + monitor_printf(mon, ", "); \ > + } \ > + } \ > + monitor_printf(mon, "\n"); \ > + } \ > + } while (0) It feels like you should be able to have an array of Feature_str's indexed by VIRTIO_DEVICE_FEATURE_KIND_ enum, so that when a new VIRTIO_DEVICE_FEATURE_KIND is added you don't need to fix this up. Dave > + > +static void hmp_virtio_dump_features(Monitor *mon, > + VirtioStatusFeatures *features) > +{ > + VirtioTransportFeatureList *transport_list = features->transport; > + while (transport_list) { > + monitor_printf(mon, "%s", > + VirtioTransportFeature_str(transport_list->value)); > + transport_list = transport_list->next; > + if (transport_list != NULL) { > + monitor_printf(mon, ", "); > + } > + } > + monitor_printf(mon, "\n"); > + switch (features->device->type) { > + case VIRTIO_DEVICE_FEATURES_KIND_VIRTIO_SERIAL: > + DUMP_FEATURES(VirtioSerial, virtio_serial); > + break; > + case VIRTIO_DEVICE_FEATURES_KIND_VIRTIO_BLK: > + DUMP_FEATURES(VirtioBlk, virtio_blk); > + break; > + case VIRTIO_DEVICE_FEATURES_KIND_VIRTIO_GPU: > + DUMP_FEATURES(VirtioGpu, virtio_gpu); > + break; > + case VIRTIO_DEVICE_FEATURES_KIND_VIRTIO_NET: > + DUMP_FEATURES(VirtioNet, virtio_net); > + break; > + case VIRTIO_DEVICE_FEATURES_KIND_VIRTIO_SCSI: > + DUMP_FEATURES(VirtioScsi, virtio_scsi); > + break; > + case VIRTIO_DEVICE_FEATURES_KIND_VIRTIO_BALLOON: > + DUMP_FEATURES(VirtioBalloon, virtio_balloon); > + break; > + case VIRTIO_DEVICE_FEATURES_KIND_VIRTIO_IOMMU: > + DUMP_FEATURES(VirtioIommu, virtio_iommu); > + break; > + default: > + g_assert_not_reached(); > + } > + if (features->unknown) { > + monitor_printf(mon, " unknown(0x%016"PRIx64")\n", \ > + features->unknown); > + } > +} > + > +void hmp_x_debug_virtio_status(Monitor *mon, const QDict *qdict) > +{ > + Error *err = NULL; > + const char *path = qdict_get_try_str(qdict, "path"); > + VirtioStatus *s = qmp_x_debug_virtio_status(path, &err); > + > + if (err != NULL) { > + hmp_handle_error(mon, err); > + return; > + } > + > + monitor_printf(mon, "%s:\n", path); > + monitor_printf(mon, " Device Id: %"PRId64"\n", s->device_id); > + monitor_printf(mon, " Guest features: "); > + hmp_virtio_dump_features(mon, s->guest_features); > + monitor_printf(mon, " Host features: "); > + hmp_virtio_dump_features(mon, s->host_features); > + monitor_printf(mon, " Backend features: "); > + hmp_virtio_dump_features(mon, s->backend_features); > + monitor_printf(mon, " Endianness: %s\n", > + VirtioStatusEndianness_str(s->device_endian)); > + monitor_printf(mon, " VirtQueues: %d\n", s->num_vqs); > + > + qapi_free_VirtioStatus(s); > +} > + > static VirtioRingDescFlagsList *qmp_decode_vring_desc_flags(uint16_t flags) > { > VirtioRingDescFlagsList *list = NULL; > @@ -4163,6 +4308,52 @@ done: > return element; > } > > +void hmp_x_debug_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 *element; > + VirtioRingDescList *list; > + > + element = qmp_x_debug_virtio_queue_element(path, queue, index != -1, > + index, &err); > + if (err != NULL) { > + hmp_handle_error(mon, err); > + return; > + } > + > + monitor_printf(mon, "index: %d\n", element->index); > + monitor_printf(mon, "ndescs: %d\n", element->ndescs); > + monitor_printf(mon, "descs: "); > + > + list = element->descs; > + while (list) { > + monitor_printf(mon, "addr 0x%"PRIx64" len %d", list->value->addr, > + list->value->len); > + if (list->value->flags) { > + VirtioRingDescFlagsList *flag = list->value->flags; > + monitor_printf(mon, " ("); > + while (flag) { > + monitor_printf(mon, "%s", VirtioRingDescFlags_str(flag->value)); > + flag = flag->next; > + if (flag) { > + monitor_printf(mon, ", "); > + } > + } > + monitor_printf(mon, ")"); > + } > + list = list->next; > + if (list) { > + monitor_printf(mon, ", "); > + } > + } > + monitor_printf(mon, "\n"); > + > + qapi_free_VirtioQueueElement(element); > +} > + > static const TypeInfo virtio_device_info = { > .name = TYPE_VIRTIO_DEVICE, > .parent = TYPE_DEVICE, > diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h > index e33ca5a911a5..f07509985254 100644 > --- a/include/monitor/hmp.h > +++ b/include/monitor/hmp.h > @@ -98,6 +98,10 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict); > void hmp_qom_list(Monitor *mon, const QDict *qdict); > void hmp_qom_set(Monitor *mon, const QDict *qdict); > void hmp_info_qom_tree(Monitor *mon, const QDict *dict); > +void hmp_x_debug_virtio_query(Monitor *mon, const QDict *qdict); > +void hmp_x_debug_virtio_status(Monitor *mon, const QDict *qdict); > +void hmp_x_debug_virtio_queue_status(Monitor *mon, const QDict *qdict); > +void hmp_x_debug_virtio_queue_element(Monitor *mon, const QDict *qdict); > void object_add_completion(ReadLineState *rs, int nb_args, const char *str); > void object_del_completion(ReadLineState *rs, int nb_args, const char *str); > void device_add_completion(ReadLineState *rs, int nb_args, const char *str); > diff --git a/monitor/misc.c b/monitor/misc.c > index 9723b466cda1..1a179829250d 100644 > --- a/monitor/misc.c > +++ b/monitor/misc.c > @@ -23,6 +23,7 @@ > */ > > #include "qemu/osdep.h" > +#include "config-devices.h" > #include "monitor-internal.h" > #include "cpu.h" > #include "monitor/qdev.h" > @@ -232,6 +233,15 @@ static void hmp_info_help(Monitor *mon, const QDict *qdict) > help_cmd(mon, "info"); > } > > +static void hmp_x_debug_virtio_help(Monitor *mon, const QDict *qdict) > +{ > +#if defined(CONFIG_VIRTIO) > + help_cmd(mon, "x-debug-virtio"); > +#else > + monitor_printf(mon, "Virtio is disabled\n"); > +#endif > +} > + > static void monitor_init_qmp_commands(void) > { > /* > @@ -1681,6 +1691,13 @@ static HMPCommand hmp_info_cmds[] = { > { NULL, NULL, }, > }; > > +static HMPCommand hmp_x_debug_virtio_cmds[] = { > +#if defined(CONFIG_VIRTIO) > +#include "hmp-commands-virtio.h" > +#endif > + { NULL, NULL, }, > +}; > + > /* hmp_cmds and hmp_info_cmds would be sorted at runtime */ > HMPCommand hmp_cmds[] = { > #include "hmp-commands.h" > -- > 2.26.2 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK