From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH 2/3] xen: simplify xen_enabled Date: Mon, 27 May 2013 19:13:41 +0100 Message-ID: <1369678422-658-2-git-send-email-stefano.stabellini@eu.citrix.com> References: Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, xen-devel@lists.xensource.com, Stefano Stabellini , qemu-stable@nongnu.org, anthony.perard@citrix.com, pbonzini@redhat.com, afaerber@suse.de List-Id: xen-devel@lists.xenproject.org No need for preprocessor conditionals in xen_enabled: xen_allowed is always defined. Please backport this patch to stable branches (it is needed by the following patch to remove the dependency on a preprocessor identifier defined by config-target.h). Signed-off-by: Stefano Stabellini CC: qemu-stable@nongnu.org --- include/hw/xen/xen.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 7451c5a..b42b0fd 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -25,11 +25,7 @@ extern bool xen_allowed; static inline bool xen_enabled(void) { -#if defined(CONFIG_XEN_BACKEND) && defined(CONFIG_XEN) return xen_allowed; -#else - return 0; -#endif } int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num); -- 1.7.2.5