From patchwork Thu Mar 10 07:34:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 12775992 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 17A93C4332F for ; Thu, 10 Mar 2022 07:34:40 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.288154.488650 (Exim 4.92) (envelope-from ) id 1nSDJe-0001VR-Oq; Thu, 10 Mar 2022 07:34:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 288154.488650; Thu, 10 Mar 2022 07:34:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nSDJe-0001TT-ER; Thu, 10 Mar 2022 07:34:30 +0000 Received: by outflank-mailman (input) for mailman id 288154; Thu, 10 Mar 2022 07:34:28 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nSDJc-0000ZP-0K for xen-devel@lists.xenproject.org; Thu, 10 Mar 2022 07:34:28 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8127106d-a044-11ec-8539-5f4723681683; Thu, 10 Mar 2022 08:34:22 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 43FA81F449; Thu, 10 Mar 2022 07:34:26 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 06A5713FA3; Thu, 10 Mar 2022 07:34:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id IBpcAAKqKWIkIAAAMHmgww (envelope-from ); Thu, 10 Mar 2022 07:34:26 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8127106d-a044-11ec-8539-5f4723681683 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1646897666; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IfItSZSW0o2H4xQgtklqjsDZtwba90rKZ+jpu4SrJ+k=; b=bwX/wwPLDXizevHSvyvYUqd3Q6vxqhy4TKLY7SIiCmojlNVRup3Vx7kZsA445mROLAAOot due1yHXGaln/jlbRCChInS8KOt9h98MiODFgi1oc/Euc/Q3GLt9MisnnJx/Let3SifEMrh rcyRPrm84Y1DKyNf9mKlj3CAAQwG7lo= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu , George Dunlap , Julien Grall , Stefano Stabellini Subject: [PATCH v4 06/11] xen: include compat/platform.h from hypercall.h Date: Thu, 10 Mar 2022 08:34:15 +0100 Message-Id: <20220310073420.15622-7-jgross@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220310073420.15622-1-jgross@suse.com> References: <20220310073420.15622-1-jgross@suse.com> MIME-Version: 1.0 The definition of compat_platform_op_t is in compat/platform.h already, so include that file from hypercall.h instead of repeating the typedef. This allows to remove the related include statement from arch/x86/x86_64/platform_hypercall.c. Signed-off-by: Juergen Gross Acked-by: Jan Beulich --- V3: - new patch --- xen/arch/x86/x86_64/platform_hypercall.c | 1 - xen/include/xen/hypercall.h | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_64/platform_hypercall.c b/xen/arch/x86/x86_64/platform_hypercall.c index f84252bac6..7631058cce 100644 --- a/xen/arch/x86/x86_64/platform_hypercall.c +++ b/xen/arch/x86/x86_64/platform_hypercall.c @@ -6,7 +6,6 @@ EMIT_FILE; #include #include -#include #define xen_platform_op compat_platform_op #define xen_platform_op_t compat_platform_op_t diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index a032ba2b4a..ca8ee22717 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -15,6 +15,9 @@ #include #include #include +#ifdef CONFIG_COMPAT +#include +#endif #include #include @@ -206,7 +209,6 @@ extern int cf_check compat_multicall( int compat_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg); -typedef struct compat_platform_op compat_platform_op_t; DEFINE_XEN_GUEST_HANDLE(compat_platform_op_t); int compat_platform_op(XEN_GUEST_HANDLE_PARAM(compat_platform_op_t) u_xenpf_op);