From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Umsr3-0005sC-H9 for qemu-devel@nongnu.org; Wed, 12 Jun 2013 17:45:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Umsr2-000100-DT for qemu-devel@nongnu.org; Wed, 12 Jun 2013 17:45:21 -0400 Sender: fluxion From: Michael Roth Date: Wed, 12 Jun 2013 16:41:17 -0500 Message-Id: <1371073298-14519-6-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1371073298-14519-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1371073298-14519-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 05/26] xen: simplify xen_enabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Stefano Stabellini No need for preprocessor conditionals in xen_enabled: xen_allowed is always defined. Signed-off-by: Stefano Stabellini CC: qemu-stable@nongnu.org (cherry picked from commit 49fa9881b2358e390e9e9466ddde74e995927efa) Signed-off-by: Michael Roth --- include/hw/xen/xen.h | 4 ---- 1 file changed, 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.9.5