From patchwork Fri Sep 4 13:40:04 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: 249111 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp1417854ilg; Fri, 4 Sep 2020 06:43:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwE9pjUn6W6NqxZc9JnWq/RtgJPiSd1PaWHEakjkTEQYe2uvQ8YY6w3Xd4PXgnGtlr62A1S X-Received: by 2002:a25:ab2f:: with SMTP id u44mr10019402ybi.318.1599227020173; Fri, 04 Sep 2020 06:43:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599227020; cv=none; d=google.com; s=arc-20160816; b=DfPpvIEu7Q4briI35vUQfNH8gVeinYffAuAfYTJ2CoJjE2VrUDSntBu0dX5EwJDa6c nJOZtNu0W3vJW76mLr7OeBc9tSIUrfcTFsdYaksZnwiy/fWwcq0YWgY/2DBXxEyFRDbG SGoalF8D4dmYUHwrbFGisBzICUQw+U3MYCLBKpgEzcpiulwCz36gAuc8asCUien8nM55 Bcra4Xs4kVWciTtosL6CzS/o+ezVsSJDeLAb3Y3KgpaSjDgRbygO4csDMfQwPLzkmUEi C9xX4AonzVwfvLKBiJJKVLJKiH58BQW9ePYuRE9XKlgoB9YkGdwLo0exYQ0hfAoSPCUS th+Q== 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=6ITqVnKRG6efTEDBxxDrqufzGTL9CoWQ38GxyiPoSjU=; b=r3MfAHxhuxZaaTAjN3uU18OnzKGJHgqGRyh7H0p6gTR3HcTANF32kUQD7/YbVicC3w AwJFV17NdhmFkW4vImbn+4lpjHFPRkSUNCO6T8txKywgNY1Hf/8HlqMTGgUeRs2Wic2P IuRzRd8i3Vi30lqJjap2j39C0Bya7ixDw0FWbUBWQMQPxuzCmZkZqZdnoK/7HO7tSgoB 8qJ/VC2WKhM+H4OvV1/411obLbZEjwob97nY3yj50XMvjNzMP0uktjLCGgI4GJbXWjBP QQAZLJB7OWLeRdswQ51uExlPKwAzt6daaTebZGbT5VYm8ONxICy1oLlOUgs2iyGB6Fyy SHUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aBnWQ0E4; 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 m123si2064038ybm.439.2020.09.04.06.43.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Sep 2020 06:43:40 -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=aBnWQ0E4; 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]:54400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kEC0B-0000gp-DY for patch@linaro.org; Fri, 04 Sep 2020 09:43:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEBws-0004tS-3p for qemu-devel@nongnu.org; Fri, 04 Sep 2020 09:40:14 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:53411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kEBwq-0005f2-2N for qemu-devel@nongnu.org; Fri, 04 Sep 2020 09:40:13 -0400 Received: by mail-wm1-x341.google.com with SMTP id u18so6114535wmc.3 for ; Fri, 04 Sep 2020 06:40:11 -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=6ITqVnKRG6efTEDBxxDrqufzGTL9CoWQ38GxyiPoSjU=; b=aBnWQ0E4SPdPlq/yVhKDRj/x5MLVIDmQ00yeCIFlqavSSKyKpH2BcutINTzpaYb5is EKOpmKAoTWtng6YQFvqdJqDUpOV9UJ6AFPZlSqHxioIrTuyVCxhAIkQe4ibrXdok20Sb EvFb9MUzd18JFZKzLj+jelyV3OxqR3usbBkqIELOBRcTN/BxD3uSdRMYDI0N3HWAT5cz x3ELI9b8PDwCtCL6xzSU1xBNniJXqlE3Mv6AK94gmyOBORNiUq+xpoOYxrGyekU91Bd0 awIxezBtVGO0Sf1wFldaGlu/jOsYHYuwwpgQjrn2Z3t03rfrDSi/ekSx98KV69tA9j3i sv2Q== 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=6ITqVnKRG6efTEDBxxDrqufzGTL9CoWQ38GxyiPoSjU=; b=SRVa9PqvznNB3LCjTuswzCCpPdq+gCPpFMZAb6Kf6/tVY0702Jp8x20b/rtBJWIymq MHJjga1EmUk0bWWqLWXXJkEGjGcZ+C+j82YlrRnjupqCQjxQiowA7awYjen1ASHGPVDo Ufi3QWfG24uhj5hkyziM0Z3aTsLDUW/PNyAC2RGJpTynFavrOKQoH8u+pMsJP8hLc40E pWUapEt5QykPdW9QAFtEuAZh10XIB9WOas57SkGFUgL4dCD98iKZglRwYetVQJedJTbx pa69DpkveglQDikFWXrPABcnlXheES9+oe4G8PebOJbx1SFwlAbptrF5bWSmaCxXTZw8 +CDg== X-Gm-Message-State: AOAM5315GRTF9mQE88VSWMTH10Do9+iQdOC8HzLytBbR8nbGDBDd+Pk9 eT9Is/BRKCwn5H5PBk2Vgw6GlQ== X-Received: by 2002:a1c:2dcc:: with SMTP id t195mr7251321wmt.166.1599226810362; Fri, 04 Sep 2020 06:40:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l19sm11325775wmi.8.2020.09.04.06.40.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 06:40:08 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D8A151FF87; Fri, 4 Sep 2020 14:40:07 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/4] hw/virtio/pci: include vdev name in registered PCI sections Date: Fri, 4 Sep 2020 14:40:04 +0100 Message-Id: <20200904134007.4175-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200904134007.4175-1-alex.bennee@linaro.org> References: <20200904134007.4175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x341.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: robert.foley@linaro.org, "Michael S . Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , robhenry@microsoft.com, aaron@os.amperecomputing.com, cota@braap.org, kuhn.chenqun@huawei.com, peter.puhov@linaro.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= 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 Message-Id: <20200713200415.26214-10-alex.bennee@linaro.org> --- 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 5bc769f685c..169d07ba20e 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1421,7 +1421,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, @@ -1468,36 +1469,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, proxy, - "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, proxy, - "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, proxy, - "virtio-pci-notify-pio", + name->str, proxy->notify_pio.size); } @@ -1642,7 +1648,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);