From patchwork Mon Jul 13 20:04:14 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: 235486 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3136570ilg; Mon, 13 Jul 2020 13:04:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3VbltG5kU5YxtembhsDdMAjuARxw9d8EQqCTVpaujVEWMmOgaHmbrsZ7D1Uv1mVxOsFJa X-Received: by 2002:a5b:7c4:: with SMTP id t4mr2808141ybq.67.1594670684502; Mon, 13 Jul 2020 13:04:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594670684; cv=none; d=google.com; s=arc-20160816; b=IgsWJqWG8y4uJQOXWtMopXI5ncnhZIKyUe3fSiqC+1EZcv7vDIEhgQLl7/wHFRTva3 U/mpHdWPpqSlfuc47wHkUR4X+r3bcAJ6HTlAdNuHhGeGS+5iBYEnsumGa0SQ1m7grkQi eH40O/d1hby7hg2IYDXmzrI7PwZ4jLO5F22SY77mmpiATIxtkA4tXcHsBh4RLg2O+e6z 5kxkJmuWGI13R7ykkXj30THtqdy8yl519u3hRmMwzqpUhgJ1Zao7y5QFCF85IgGZNgOp J/R46I+cyTDCkh43zSZNggVoEtDltJiJlEvsaolCjDyG8ZBxP8ZK2o7QJysI1TPVT4e3 MjWA== 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=WVJRm9yMA7V6UraKTz4oUpniy0kUGIO9MjLG/c6LBA4=; b=VuUYiT/8lzIeDA+UsXwNb8zrHOQ2li3OeK5M8qOZDVY8Ib0nBUKr/Z+eKOjk3GS8eq tSRcHi0vTqiFws36Nh2JMnJ9x/mvbVkbErObLBMmBrc8G6HtaJb0qNLpEgFtzc0vosEv +D95KLypp67liFd8dAJ7mj9PN4wHMmciek6+F73PeOmAtZtnNhqWld/2/MPRl6Bbib44 GFWX1C+gp4ig8fQSKfyzIHjATnCV8M86XQGbAAvOXWT0pWTxPVHLnurxx3MBxzEAiblO VNLlyEZp5naFaUbLWLMrC+w5udJCOdvGAcePDZuFSo1xSypMq8wrAkpOv1Bezqo+6gjW gmZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=brV9IPLq; 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 k13si3489419ybj.3.2020.07.13.13.04.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jul 2020 13:04:44 -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=brV9IPLq; 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]:37878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jv4gu-0008Dq-15 for patch@linaro.org; Mon, 13 Jul 2020 16:04:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jv4gh-0008Al-0Y for qemu-devel@nongnu.org; Mon, 13 Jul 2020 16:04:31 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:36789) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jv4gf-0006J4-5z for qemu-devel@nongnu.org; Mon, 13 Jul 2020 16:04:30 -0400 Received: by mail-wr1-x432.google.com with SMTP id k6so18141908wrn.3 for ; Mon, 13 Jul 2020 13:04:28 -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=WVJRm9yMA7V6UraKTz4oUpniy0kUGIO9MjLG/c6LBA4=; b=brV9IPLqyHOY39GAGvoiqQuEIULY6Qz2VDd5AMTfpE6Y2UX8M1sFYtiL7vQueonLBn XOzcaMlCmpE1l3nmzYzmBQJI7fjS4LXhPkpX+grlJAdRAUYXEzVgnsx+SQ9gRnzI8Pja yL86EcL3+h/C4sYALSzZRJtKD4QGi4YIFp2rXYUeNoHK4LCOLt+csBlOjl619Q9Q8mo4 LRHQUFX+wUDtQQSSmyBp7iGkXvC55tu8IrHhWVtp3gBvsXP4nM6lrwYtpvRjlEgpe604 X1aiueqArJdVvuxQ/cw/0SlCJ1insY33GyGv6+wuAIseRjmG9vhidUFQSzdB5YMsTVuh iyPA== 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=WVJRm9yMA7V6UraKTz4oUpniy0kUGIO9MjLG/c6LBA4=; b=cjVcWHtRT1BdCgxJTQVpCHdKJzwBQS/3vjRyKRZNCLKOkaaCXRlUhx0Au+nhbkm3+m JADjC/X95EYK/SPsXDb6X6HySgxwFy5Ia7iKM2/Y+3INll58l1/gn59QrzEs314xEf0j CseCalwRC6z7Av94on5T+r7QJUGldYvWeChltitft65xFmsukBvHBQmEnAIpUlGOccBN HAXfB0rzLFKfOSorU8nCjVDBNTUE8FWu4hO8VaU9s7I0Jg3mdH7n6B8Ff6kFxWMzNLrf 0DfGpv03nsM2EB0+256P7XNwkqfuAswlhC+Hyteti20Vh73AgfztTEmXAArOtAgdvQIK SlBw== X-Gm-Message-State: AOAM533nRlJ8JmsJIFbRnTIR4wbLYrDX6rAfKrOT2d+Uy/c8Hd1Akrj9 xXbZSde/Av7PAxZFlgmGbjcwNw== X-Received: by 2002:adf:e482:: with SMTP id i2mr1157195wrm.75.1594670667812; Mon, 13 Jul 2020 13:04:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q7sm25941773wrs.27.2020.07.13.13.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 13:04:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8869F1FF99; Mon, 13 Jul 2020 21:04:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/11] plugins: add API to return a name for a IO device Date: Mon, 13 Jul 2020 21:04:14 +0100 Message-Id: <20200713200415.26214-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713200415.26214-1-alex.bennee@linaro.org> References: <20200713200415.26214-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, cota@braap.org, kuhn.chenqun@huawei.com, peter.puhov@linaro.org, Clement Deschamps , aurelien@aurel32.net 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 [r-b provisional given change to g_intern_string] Reviewed-by: Clement Deschamps Reviewed-by: Emilio G. Cota --- v3 - return a non-freeable const g_intern_string() - checkpatch cleanups --- include/qemu/qemu-plugin.h | 6 ++++++ plugins/api.c | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h index bab8b0d4b3..c98c18d6b0 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/qemu/qemu-plugin.h @@ -335,6 +335,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..4304e63f0c 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_string("RAM"); + } +#else + return g_intern_string("Invalid"); +#endif +} + /* * Queries to the number and potential maximum number of vCPUs there * will be. This helps the plugin dimension per-vcpu arrays.