Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751576AbdG0Pfk (ORCPT ); Thu, 27 Jul 2017 11:35:40 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:29147 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751548AbdG0Pfj (ORCPT ); Thu, 27 Jul 2017 11:35:39 -0400 Subject: Re: [PATCH] xen: cleanup xen.h To: Juergen Gross , linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org References: <20170727151158.1739-1-jgross@suse.com> From: Boris Ostrovsky Message-ID: <95b842f3-aa02-ac05-6153-8f6a989fce15@oracle.com> Date: Thu, 27 Jul 2017 11:37:09 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170727151158.1739-1-jgross@suse.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1579 Lines: 58 On 07/27/2017 11:11 AM, Juergen Gross wrote: > The macros for testing domain types are more complicated then they > need to. Simplify them. > > Signed-off-by: Juergen Gross > --- > include/xen/xen.h | 20 +++++++++----------- > 1 file changed, 9 insertions(+), 11 deletions(-) > > diff --git a/include/xen/xen.h b/include/xen/xen.h > index 6e8b7fc79801..28c59ca529d7 100644 > --- a/include/xen/xen.h > +++ b/include/xen/xen.h > @@ -13,11 +13,16 @@ extern enum xen_domain_type xen_domain_type; > #define xen_domain_type XEN_NATIVE > #endif > > +#ifdef CONFIG_XEN_PVH > +extern bool xen_pvh; > +#else > +#define xen_pvh 0 > +#endif > + > #define xen_domain() (xen_domain_type != XEN_NATIVE) > -#define xen_pv_domain() (xen_domain() && \ > - xen_domain_type == XEN_PV_DOMAIN) > -#define xen_hvm_domain() (xen_domain() && \ > - xen_domain_type == XEN_HVM_DOMAIN) > +#define xen_pv_domain() (xen_domain_type == XEN_PV_DOMAIN) Stray tab. > +#define xen_hvm_domain() (xen_domain_type == XEN_HVM_DOMAIN) > +#define xen_pvh_domain() (xen_pvh) Not sure we need parentheses here. Either way Reviewed-by: Boris Ostrovsky > > #ifdef CONFIG_XEN_DOM0 > #include > @@ -29,11 +34,4 @@ extern enum xen_domain_type xen_domain_type; > #define xen_initial_domain() (0) > #endif /* CONFIG_XEN_DOM0 */ > > -#ifdef CONFIG_XEN_PVH > -extern bool xen_pvh; > -#define xen_pvh_domain() (xen_hvm_domain() && xen_pvh) > -#else > -#define xen_pvh_domain() (0) > -#endif > - > #endif /* _XEN_XEN_H */