From patchwork Thu Jul 9 14:13:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 235153 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1454916ilg; Thu, 9 Jul 2020 07:16:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxovrOA8z5lIUT+CHLrEhAZ0/dbLGrKDwJ8sJROteZpIR7EFi4PA0ph/yzseoVVB3HIDWrx X-Received: by 2002:ab0:4e98:: with SMTP id l24mr14774307uah.15.1594304212566; Thu, 09 Jul 2020 07:16:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594304212; cv=none; d=google.com; s=arc-20160816; b=kGcYZRAru7n8zWYEjdaufVbKxWLxQr48+2M6sNQtdwhjgPIZrpmOgrySj9q6HOjuli Aqmc/vX/j+a8xwk3Gy1I5J4MKA7ISkYbgppBvmm2HGYlEC734FAXMEMI75HqMDpIj+KE 0xBxPGRNbgNy4VE8K4bGqMu/8+KPp7kOg3s9CNzVUTOX9nFWtdRF6F5sxXr7svZ86XHM 3kaJELbx3ixOBq39Mux8sSI1IHXBW8J79/HBZTnnslWxuQGE0+Z2kurkxMYaxyUwjGxS HiYzip/htSg6C3cGygaD0ImJ5drF9txmyg10DmjDiHMJB4wMqzN2GL/GTgxiVjP6S8Bn eKfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=OBrRMeGy/wov/DYQ76yj5VunpgQV0jWyBVFTMMvKctw=; b=X124X6FgmgLLUI7q7U+thaeG2OdsYI/uTqOxnuqbothSfdVlVu+OpORxoLY9EXq1dQ l5wOBRcAG91t7T3YChZVeQis1wfDZRoDJL0BWkN0MCXvr9ITWESqeZbPrb81dhLGEtLc jW7/Dn6kRGj6dxyak5NtXV3GA8eQRFIecpbMOc3YcZBtZoaXAZov2zYEGnZyAMVXgTIX czPmcglaIV4WvdO2uzmdw3eWTKoyJ8Z8FzJvv5JPc4uVNlDJW9wJWddDuZkgz1jQm6o5 kjzgMJEN+goLOMkzW8sQwORCplMQu8wg+E04f5+ZwEQVFSiZpK06Uh6pMKKSM4NwRWh6 XRQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nwHuQ3DK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h25si398397uan.111.2020.07.09.07.16.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Jul 2020 07:16:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nwHuQ3DK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtXM3-0005Dc-St for patch@linaro.org; Thu, 09 Jul 2020 10:16:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtXIx-0000JN-Bm for qemu-devel@nongnu.org; Thu, 09 Jul 2020 10:13:39 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:41715) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jtXIv-0001Ku-Ir for qemu-devel@nongnu.org; Thu, 09 Jul 2020 10:13:39 -0400 Received: by mail-wr1-x443.google.com with SMTP id z15so2541468wrl.8 for ; Thu, 09 Jul 2020 07:13:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OBrRMeGy/wov/DYQ76yj5VunpgQV0jWyBVFTMMvKctw=; b=nwHuQ3DKzTp8JC9JTVslsyRvuphhDm8WFMC07jcbllaLsRTF+N5f4Es8GK7ZkhcekK F0eNi72RkpFTnDVbgFxsM/gunzQOWcSWW8s9Kcvg4RQZ9R1HRS6BqzR8UH0mbc8ZUUv6 Fv442IgY863tCbKKtAb7GzCL/hvmVY60rLafTdlpPiC47/23o/Kr5cn5TZgPvcW36mxn 1Pvq+wEjoz5rqSnW9/wVVvGDdkmOfzunI+AVLOkc6zqyzLu6ogzEptrBJeHHQgRjZTro ESmTNu40HllAZDTpILxTLAao7eFhcRSDM4dGfxD/ZfpRUUL0ly/iqO4uIKgJGJcQs0XB MtcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OBrRMeGy/wov/DYQ76yj5VunpgQV0jWyBVFTMMvKctw=; b=kjaRf2OnVKRBP0FdJqzv4gddNxa7/IQXoQ9be0WoieoHOjWoRl3NusqEWQpA7haU67 wjvbR8fHtqB/3A+P4y9t+1rT+YKCmcMWWK0VaOyd6bd6ZKIdzROdq09a4SrlAN2D8QGJ 1pEUelcxAJ9VR2xrW5h7IHDBc2v8/qt+YVgtLw/uNKRot7pEE5fLIgZ5jEppjsNwNrVC uGn2Wac26+LHEGFnV9j2Dz1XZ3KZUaHZlGD4IX93LygwWM0FncldpKiL809W8DDAO9mR CrjMAw1obTnxuJVnZn6v7/Z9ZSdET4kJuM7EZrncI37bbV8uNec1vG4lO8Z+53FPzRRL 9LBg== X-Gm-Message-State: AOAM531QIJmP+ASLbOWv6KvT0y/9HEPTfMjcs6m7ztibuN4QFzUlMzSs sWEu4wY9eT0jbTTxO912BvGJhQ== X-Received: by 2002:a5d:68cc:: with SMTP id p12mr62816127wrw.111.1594304016340; Thu, 09 Jul 2020 07:13:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f186sm4945611wmf.29.2020.07.09.07.13.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 07:13:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D2DAD1FF91; Thu, 9 Jul 2020 15:13:27 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 05/13] hw/virtio/pci: include vdev name in registered PCI sections Date: Thu, 9 Jul 2020 15:13:19 +0100 Message-Id: <20200709141327.14631-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200709141327.14631-1-alex.bennee@linaro.org> References: <20200709141327.14631-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: fam@euphon.net, berrange@redhat.com, robert.foley@linaro.org, "Michael S . Tsirkin" , =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, robhenry@microsoft.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aaron@os.amperecomputing.com, cota@braap.org, kuhn.chenqun@huawei.com, peter.puhov@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When viewing/debugging memory regions it is sometimes hard to figure out which PCI device something belongs to. Make the names unique by including the vdev name in the name string. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Michael S. Tsirkin --- v2 - swap ()'s for an extra - --- hw/virtio/virtio-pci.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 8554cf2a038e..215e680c71f4 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1406,7 +1406,8 @@ static void virtio_pci_device_write(void *opaque, hwaddr addr, } } -static void virtio_pci_modern_regions_init(VirtIOPCIProxy *proxy) +static void virtio_pci_modern_regions_init(VirtIOPCIProxy *proxy, + const char *vdev_name) { static const MemoryRegionOps common_ops = { .read = virtio_pci_common_read, @@ -1453,36 +1454,41 @@ static void virtio_pci_modern_regions_init(VirtIOPCIProxy *proxy) }, .endianness = DEVICE_LITTLE_ENDIAN, }; + g_autoptr(GString) name = g_string_new(NULL); - + g_string_printf(name, "virtio-pci-common-%s", vdev_name); memory_region_init_io(&proxy->common.mr, OBJECT(proxy), &common_ops, proxy, - "virtio-pci-common", + name->str, proxy->common.size); + g_string_printf(name, "virtio-pci-isr-%s", vdev_name); memory_region_init_io(&proxy->isr.mr, OBJECT(proxy), &isr_ops, proxy, - "virtio-pci-isr", + name->str, proxy->isr.size); + g_string_printf(name, "virtio-pci-device-%s", vdev_name); memory_region_init_io(&proxy->device.mr, OBJECT(proxy), &device_ops, virtio_bus_get_device(&proxy->bus), - "virtio-pci-device", + name->str, proxy->device.size); + g_string_printf(name, "virtio-pci-notify-%s", vdev_name); memory_region_init_io(&proxy->notify.mr, OBJECT(proxy), ¬ify_ops, virtio_bus_get_device(&proxy->bus), - "virtio-pci-notify", + name->str, proxy->notify.size); + g_string_printf(name, "virtio-pci-notify-pio-%s", vdev_name); memory_region_init_io(&proxy->notify_pio.mr, OBJECT(proxy), ¬ify_pio_ops, virtio_bus_get_device(&proxy->bus), - "virtio-pci-notify-pio", + name->str, proxy->notify_pio.size); } @@ -1623,7 +1629,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp) struct virtio_pci_cfg_cap *cfg_mask; - virtio_pci_modern_regions_init(proxy); + virtio_pci_modern_regions_init(proxy, vdev->name); virtio_pci_modern_mem_region_map(proxy, &proxy->common, &cap); virtio_pci_modern_mem_region_map(proxy, &proxy->isr, &cap);