From patchwork Mon Jul 17 08:11:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ladi Prosek X-Patchwork-Id: 9844213 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B528460212 for ; Mon, 17 Jul 2017 08:17:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A71F128161 for ; Mon, 17 Jul 2017 08:17:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9BF6C2823E; Mon, 17 Jul 2017 08:17:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2A52628161 for ; Mon, 17 Jul 2017 08:17:46 +0000 (UTC) Received: from localhost ([::1]:48684 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX1Du-0000sO-4h for patchwork-qemu-devel@patchwork.kernel.org; Mon, 17 Jul 2017 04:17:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX18N-0005KJ-1h for qemu-devel@nongnu.org; Mon, 17 Jul 2017 04:12:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX18L-0001IZ-Oz for qemu-devel@nongnu.org; Mon, 17 Jul 2017 04:12:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48622) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dX18L-0001IB-Ft for qemu-devel@nongnu.org; Mon, 17 Jul 2017 04:12:01 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 802314E4D6; Mon, 17 Jul 2017 08:12:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 802314E4D6 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=lprosek@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 802314E4D6 Received: from dhcp-1-107.brq.redhat.com (unknown [10.43.2.170]) by smtp.corp.redhat.com (Postfix) with ESMTP id 72AF76F444; Mon, 17 Jul 2017 08:11:58 +0000 (UTC) From: Ladi Prosek To: qemu-devel@nongnu.org Date: Mon, 17 Jul 2017 10:11:44 +0200 Message-Id: <20170717081152.17153-2-lprosek@redhat.com> In-Reply-To: <20170717081152.17153-1-lprosek@redhat.com> References: <20170717081152.17153-1-lprosek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 17 Jul 2017 08:12:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 1/9] virtio: enhance virtio_error messages X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: casasfernando@hotmail.com, mst@redhat.com, jasowang@redhat.com, cohuck@redhat.com, armbru@redhat.com, groug@kaod.org, arei.gonglei@huawei.com, aneesh.kumar@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Output like "Virtqueue size exceeded" is not much useful in identifying the culprit. This commit adds virtio device name (e.g. "virtio-input") and id if set (e.g. "mouse0") to all virtio error messages to improve debuggability. Some virtio devices (virtio-scsi, virtio-serial) insert a bus between the proxy object and the virtio backends, so a helper function is added to walk the object hierarchy and find the right proxy object to extract the id from. Suggested-by: Stefan Hajnoczi Signed-off-by: Ladi Prosek Reviewed-by: Cornelia Huck --- hw/virtio/virtio.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 464947f..d7fae54 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -31,6 +31,11 @@ */ #define VIRTIO_PCI_VRING_ALIGN 4096 +/* + * Name of the property linking proxy objects to virtio backend objects. + */ +#define VIRTIO_PROP_BACKEND "virtio-backend" + typedef struct VRingDesc { uint64_t addr; @@ -2223,7 +2228,8 @@ void virtio_instance_init_common(Object *proxy_obj, void *data, DeviceState *vdev = data; object_initialize(vdev, vdev_size, vdev_name); - object_property_add_child(proxy_obj, "virtio-backend", OBJECT(vdev), NULL); + object_property_add_child(proxy_obj, VIRTIO_PROP_BACKEND, OBJECT(vdev), + NULL); object_unref(OBJECT(vdev)); qdev_alias_all_properties(vdev, proxy_obj); } @@ -2443,14 +2449,34 @@ void virtio_device_set_child_bus_name(VirtIODevice *vdev, char *bus_name) vdev->bus_name = g_strdup(bus_name); } +static const char *virtio_get_device_id(VirtIODevice *vdev) +{ + DeviceState *qdev = DEVICE(vdev); + while (qdev) { + /* Find the proxy object corresponding to the vdev backend */ + Object *prop = object_property_get_link(OBJECT(qdev), + VIRTIO_PROP_BACKEND, NULL); + if (prop == OBJECT(vdev)) { + return qdev->id ? qdev->id : ""; + } + qdev = qdev->parent_bus->parent; + } + g_assert_not_reached(); + return ""; +} + void GCC_FMT_ATTR(2, 3) virtio_error(VirtIODevice *vdev, const char *fmt, ...) { va_list ap; + char *msg; va_start(ap, fmt); - error_vreport(fmt, ap); + msg = g_strdup_vprintf(fmt, ap); va_end(ap); + error_report("%s (id=%s): %s", vdev->name, virtio_get_device_id(vdev), msg); + g_free(msg); + if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { virtio_set_status(vdev, vdev->status | VIRTIO_CONFIG_S_NEEDS_RESET); virtio_notify_config(vdev);