From patchwork Wed May 29 11:34:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 247251 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 960E72C0340 for ; Wed, 29 May 2013 21:39:52 +1000 (EST) Received: from localhost ([::1]:52422 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uhegm-0005WH-B7 for incoming@patchwork.ozlabs.org; Wed, 29 May 2013 07:37:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uheej-0002nF-KU for qemu-devel@nongnu.org; Wed, 29 May 2013 07:35:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uheei-0001f7-3C for qemu-devel@nongnu.org; Wed, 29 May 2013 07:35:01 -0400 Received: from smtp.citrix.com ([66.165.176.89]:12423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uheed-0001cR-05; Wed, 29 May 2013 07:34:55 -0400 X-IronPort-AV: E=Sophos;i="4.87,763,1363132800"; d="scan'208";a="27948337" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/AES128-SHA; 29 May 2013 11:34:54 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.3; Wed, 29 May 2013 07:34:53 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1UheeW-0005rX-LI; Wed, 29 May 2013 12:34:48 +0100 From: Stefano Stabellini To: Date: Wed, 29 May 2013 12:34:29 +0100 Message-ID: <1369827271-20921-1-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 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 Subject: [Qemu-devel] [PATCH v2 1/3] xen: simplify xen_enabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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);