From patchwork Thu Sep 21 11:35:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9963769 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 551A36020C for ; Thu, 21 Sep 2017 11:37:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F91229434 for ; Thu, 21 Sep 2017 11:37:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 344EB29438; Thu, 21 Sep 2017 11:37:54 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 836B529434 for ; Thu, 21 Sep 2017 11:37:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1duzlQ-000392-TL; Thu, 21 Sep 2017 11:35:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1duzlO-00038w-VN for xen-devel@lists.xen.org; Thu, 21 Sep 2017 11:35:27 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 9E/77-01911-EF3A3C95; Thu, 21 Sep 2017 11:35:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrDLMWRWlGSWpSXmKPExsVysyfVTffv4sO RBq0ztCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1ownX78xF3zirNi1ahJzA+MKji5GLg4hgU2M ErN3PGGEcE4zSsw9sB3I4eRgE9CUuPP5ExOILSIgLXHt82WwImaB54wSk1pmsIIkhAUiJd53f 2EDsVkEVCU+nG5jB7F5BSwkli/9xAJiSwjIS+xqu8g6gZFzASPDKkaN4tSistQiXUMDvaSizP SMktzEzBwgz1gvN7W4ODE9NScxqVgvOT93EyPQZ/UMDIw7GLd1OR9ilORgUhLldZ13OFKILyk /pTIjsTgjvqg0J7X4EKMMB4eSBG/XIqCcYFFqempFWmYOMHhg0hIcPEoivO0gad7igsTc4sx0 iNQpRl2Ojpt3/zAJseTl56VKifPGgBQJgBRllObBjYAF8iVGWSlhXkYGBgYhnoLUotzMElT5V 4ziHIxKwrzLQKbwZOaVwG16BXQEE9AR2RsOgBxRkoiQkmpgjLw+SW/SB8O14oYnVYuY6oVku5 j+VR02D2Vbxurhxtiu55TA96KWW35ezpo9YoXrNs89PGn1wh1/JWqq5X99nmsbf+6iXtujndM eK8jEvHH6XhK4ajM/e2WV3vYtT83cZ2gnhymlH+G7eijTSNty/sXHHwS1g4WsZx7RvzZR85L/ jaOdN8OklViKMxINtZiLihMBtqPXKl8CAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1505993725!111301256!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6387 invoked from network); 21 Sep 2017 11:35:25 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-13.tower-31.messagelabs.com with SMTP; 21 Sep 2017 11:35:25 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5BBA680D; Thu, 21 Sep 2017 04:35:24 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8DE153F58C; Thu, 21 Sep 2017 04:35:22 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Thu, 21 Sep 2017 12:35:17 +0100 Message-Id: <20170921113517.8879-1-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 Cc: sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, Julien Grall , jbeulich@suse.com Subject: [Xen-devel] [PATCH] xen/perfc: Fix build after commit fc32575968 when CONFIG_PERF_COUNTERS=y X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The commit fc32575968 "public/sysctl: drop unnecessary typedefs and handles" went a bit too far by replacing all xen_systcl_*_t type to struct xen_sysctl_*. However, xen_sysctl_perfc_val_t was a typedef on uint32_t and therefore is not associated to a structure. Use xen_sysctl_perfc_val_t to fix the build when CONFIG_PERF_COUNTERS=y Signed-off-by: Julien Grall Reviewed-by: Wei Liu Acked-by: Jan Beulich --- xen/common/perfc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/perfc.c b/xen/common/perfc.c index 76051739a5..067567766a 100644 --- a/xen/common/perfc.c +++ b/xen/common/perfc.c @@ -153,7 +153,7 @@ void perfc_reset(unsigned char key) } static struct xen_sysctl_perfc_desc perfc_d[NR_PERFCTRS]; -static struct xen_sysctl_perfc_val *perfc_vals; +static xen_sysctl_perfc_val_t *perfc_vals; static unsigned int perfc_nbr_vals; static cpumask_t perfc_cpumap; @@ -190,7 +190,7 @@ static int perfc_copy_info(XEN_GUEST_HANDLE_64(xen_sysctl_perfc_desc_t) desc, } xfree(perfc_vals); - perfc_vals = xmalloc_array(struct xen_sysctl_perfc_val, perfc_nbr_vals); + perfc_vals = xmalloc_array(xen_sysctl_perfc_val_t, perfc_nbr_vals); } if ( guest_handle_is_null(desc) )