Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C86FC433E0 for ; Thu, 23 Jul 2020 15:49:32 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DA965206D8 for ; Thu, 23 Jul 2020 15:49:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA965206D8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jydTB-0006CL-S0; Thu, 23 Jul 2020 15:49:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jydTA-0006CA-RG for xen-devel@lists.xenproject.org; Thu, 23 Jul 2020 15:49:16 +0000 X-Inumbo-ID: 0efb4d0d-ccfc-11ea-a2c7-12813bfff9fa Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0efb4d0d-ccfc-11ea-a2c7-12813bfff9fa; Thu, 23 Jul 2020 15:49:16 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 502EBAC83; Thu, 23 Jul 2020 15:49:23 +0000 (UTC) Subject: [PATCH v3 3/8] x86/mce: bring hypercall subop compat checking in sync again From: Jan Beulich To: "xen-devel@lists.xenproject.org" References: Message-ID: Date: Thu, 23 Jul 2020 17:49:16 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: George Dunlap , Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Use a typedef in struct xen_mc also for the two subops "manually" translated in the handler, just for consistency. No functional change. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1307,16 +1307,16 @@ CHECK_mcinfo_common; CHECK_FIELD_(struct, mc_fetch, flags); CHECK_FIELD_(struct, mc_fetch, fetch_id); -# define CHECK_compat_mc_fetch struct mc_fetch +# define CHECK_mc_fetch struct mc_fetch CHECK_FIELD_(struct, mc_physcpuinfo, ncpus); -# define CHECK_compat_mc_physcpuinfo struct mc_physcpuinfo +# define CHECK_mc_physcpuinfo struct mc_physcpuinfo # define xen_ctl_bitmap xenctl_bitmap CHECK_mc; -# undef CHECK_compat_mc_fetch -# undef CHECK_compat_mc_physcpuinfo +# undef CHECK_mc_fetch +# undef CHECK_mc_physcpuinfo # undef xen_ctl_bitmap # define xen_mc_info mc_info --- a/xen/include/public/arch-x86/xen-mca.h +++ b/xen/include/public/arch-x86/xen-mca.h @@ -391,6 +391,7 @@ struct xen_mc_physcpuinfo { /* OUT */ XEN_GUEST_HANDLE(xen_mc_logical_cpu_t) info; }; +typedef struct xen_mc_physcpuinfo xen_mc_physcpuinfo_t; #define XEN_MC_msrinject 4 #define MC_MSRINJ_MAXMSRS 8 @@ -436,9 +437,9 @@ struct xen_mc { uint32_t cmd; uint32_t interface_version; /* XEN_MCA_INTERFACE_VERSION */ union { - struct xen_mc_fetch mc_fetch; + xen_mc_fetch_t mc_fetch; xen_mc_notifydomain_t mc_notifydomain; - struct xen_mc_physcpuinfo mc_physcpuinfo; + xen_mc_physcpuinfo_t mc_physcpuinfo; xen_mc_msrinject_t mc_msrinject; xen_mc_mceinject_t mc_mceinject; #if defined(__XEN__) || defined(__XEN_TOOLS__)