From patchwork Thu Feb 18 09:46:45 2021 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: 384368 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp3531312jao; Thu, 18 Feb 2021 01:54:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJxFmwozKexFzBgKZg6RfpO166vOUh/WmiR9BuvdaZRRnve4uJVxsqOtPW4XtV8OhRidq2VL X-Received: by 2002:a25:560a:: with SMTP id k10mr5749381ybb.165.1613642067725; Thu, 18 Feb 2021 01:54:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613642067; cv=none; d=google.com; s=arc-20160816; b=Qcx7N2LNdrhauF4rNasDB1u72g+sREFr13BwO29Va2i7M6PnK0skHOFFq8gQ/LLQHD HbuCMcJx8GcX622eAfsMWITQTcLR6fMJoV9zck5cS7PYscVhIkvsflU8dr1whUehLuY9 tVO0OefupeeTJ/QF3bstbC5PkdxP+SAEzBeAQs4KBhfTxBpaG6AjIHNHZXg0poACRyiu iRobXx1iUpoKpOm2ZChjKlpdrWlSA9QKDJCi6V6ATCBz+hVfLVUbAfOW+1CgAwlQU4UV t2OhAecJSPjOHGl1t91txeo50WDZYBtrxsQmtFOkjeXavkKBfZ3PggQOw/QkpNFO9bCG DXZw== 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=pcSt1P/BVEiZ2RhZX9D0H6PtOh3Enb5UUvgBwhX22fo=; b=xkCuQ+vdkVvvZKXjAKH6bB2uCidj1vRRTog4EjaMQR+ZkP1etwdxY/8IWSC0GQGIAF KksUW3OfdlMjroK+W4n0bikdxI7QzyFBWjyleWbbsOxy96tNSq13Ek9X4MjKhzC3k5Nr 1jG2iqv2BMv/qTJPobCO7R7JQ/4uoxz4eGji4ObtHUxCun4kFR5ngyfDXyi3yD/+TBP8 z/CdqSgNQzSiScx/Ub7dw9/3YsxIHQnTnqwwWuVWs0XrAYFABVoGcKqSSujiok6GSi/3 9vQ85vyFtGtCWBhhCXUkDoWleknzimPJEEVxxORYMLJNhlj3+6f/TIquMBNzdXPJNxuA HsDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=a48abLEl; 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 z95si6886864ybh.58.2021.02.18.01.54.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Feb 2021 01:54:27 -0800 (PST) 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=a48abLEl; 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]:46786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCg0x-0005PL-86 for patch@linaro.org; Thu, 18 Feb 2021 04:54:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCfu6-0006hq-CE for qemu-devel@nongnu.org; Thu, 18 Feb 2021 04:47:22 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:40047) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCfu2-0007Ck-2Z for qemu-devel@nongnu.org; Thu, 18 Feb 2021 04:47:22 -0500 Received: by mail-wr1-x42e.google.com with SMTP id v14so2182369wro.7 for ; Thu, 18 Feb 2021 01:47:14 -0800 (PST) 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=pcSt1P/BVEiZ2RhZX9D0H6PtOh3Enb5UUvgBwhX22fo=; b=a48abLElBHl5CcnqcFCdCWSeaeNVp4LBQFGFIpc3zLyY3+kr++MuaWEacw3sauI+yy RnNn2kKRPcfLImn6Ov1/9jazMZ3itSKcBnk978mup79wl1fwXM8dy6gmQE8Xtm168V83 L++iXZlcNXvuEbgs1j5lkcFcvYqp9mlQNu/Spxofa9PskSfuuCH8uJMLebgfSY3uZ9D7 vMKYYZ9Rroig6NDoRFNfTJ0omHTGNoYtREOCYCcjPji7leN3oHNQvf97HTLHgoNkdCe8 0InPWGxuWJIapKyEMQ78z2mn8wmFZrk/r9j3DbxHj2Ok9yhd3LTB095w6HKebH1JTK57 DXxw== 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=pcSt1P/BVEiZ2RhZX9D0H6PtOh3Enb5UUvgBwhX22fo=; b=op3iRvQ02DQu+bxiKs6WYg0Iz1r4Piutx9QMHt8ofj6EjomwT41JQPEofruHm8KYCp y9E94NJsPwuM0KkS+upnrkJNiutbqAIxz4KMCIAFULgHLarQvz6pN6Kt9RalQK0htZx7 yziy+CZNB7GRF2gm3Uwx8yQgxALsc7qoHOd0dkrGO9W2E6FJGJ7UzHZ+dSo4i5ErViG8 hm1mqIWvMhdA8jnHfqLkG+YDq7kkTU1PFtoAKSVQ+rK4Q7UjBu6uMWn8u6Qeh5iLa90/ 8w3a6KhtwFnHUZUl9cARTtCw2X8rdO1H5IWB3DlVzcIsJJx/7YHYXg/NJF0GJiRDPi3a Sj0g== X-Gm-Message-State: AOAM531K9mL8woByh+ZwDiaC9rskz1mRgO8Vb5b+EKQDtjCybxursmW9 qHrtEZt70+BwvH9eCxhGHy+0z4s8GdFgug== X-Received: by 2002:adf:fe0d:: with SMTP id n13mr3464492wrr.258.1613641633097; Thu, 18 Feb 2021 01:47:13 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p9sm6160445wma.14.2021.02.18.01.47.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 01:47:07 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1B1051FF8C; Thu, 18 Feb 2021 09:47:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 02/23] plugins: add API to return a name for a IO device Date: Thu, 18 Feb 2021 09:46:45 +0000 Message-Id: <20210218094706.23038-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210218094706.23038-1-alex.bennee@linaro.org> References: <20210218094706.23038-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com 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: Richard Henderson , Clement Deschamps , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, "Emilio G . Cota" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This may well end up being anonymous but it should always be unique. Signed-off-by: Alex Bennée Reviewed-by: Clement Deschamps Reviewed-by: Emilio G. Cota Reviewed-by: Richard Henderson Message-Id: <20210213130325.14781-3-alex.bennee@linaro.org> -- 2.20.1 diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h index 5775e82c4e..c66507fe8f 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/qemu/qemu-plugin.h @@ -330,6 +330,12 @@ struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr); uint64_t qemu_plugin_hwaddr_device_offset(const struct qemu_plugin_hwaddr *haddr); +/* + * Returns a string representing the device. The string is valid for + * the lifetime of the plugin. + */ +const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h); + typedef void (*qemu_plugin_vcpu_mem_cb_t)(unsigned int vcpu_index, qemu_plugin_meminfo_t info, uint64_t vaddr, diff --git a/plugins/api.c b/plugins/api.c index bbdc5a4eb4..5dc8e6f934 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -303,6 +303,26 @@ uint64_t qemu_plugin_hwaddr_device_offset(const struct qemu_plugin_hwaddr *haddr return 0; } +const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) +{ +#ifdef CONFIG_SOFTMMU + if (h && h->is_io) { + MemoryRegionSection *mrs = h->v.io.section; + if (!mrs->mr->name) { + unsigned long maddr = 0xffffffff & (uintptr_t) mrs->mr; + g_autofree char *temp = g_strdup_printf("anon%08lx", maddr); + return g_intern_string(temp); + } else { + return g_intern_string(mrs->mr->name); + } + } else { + return g_intern_static_string("RAM"); + } +#else + return g_intern_static_string("Invalid"); +#endif +} + /* * Queries to the number and potential maximum number of vCPUs there * will be. This helps the plugin dimension per-vcpu arrays.