From patchwork Wed Jun 5 12:07:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 249004 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A5AC62C00AA for ; Wed, 5 Jun 2013 22:08:19 +1000 (EST) Received: from localhost ([::1]:41660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkCVk-0007Yh-UV for incoming@patchwork.ozlabs.org; Wed, 05 Jun 2013 08:08:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkCVH-0007Uo-CU for qemu-devel@nongnu.org; Wed, 05 Jun 2013 08:07:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkCVF-00087R-8f for qemu-devel@nongnu.org; Wed, 05 Jun 2013 08:07:47 -0400 Received: from smtp.citrix.com ([66.165.176.89]:44720) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkCVF-00087E-41 for qemu-devel@nongnu.org; Wed, 05 Jun 2013 08:07:45 -0400 X-IronPort-AV: E=Sophos;i="4.87,806,1363132800"; d="scan'208";a="29363028" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/AES128-SHA; 05 Jun 2013 12:07:44 +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, 5 Jun 2013 08:07:44 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1UkCV8-0006UI-TO; Wed, 05 Jun 2013 13:07:38 +0100 From: Stefano Stabellini To: Date: Wed, 5 Jun 2013 13:07:31 +0100 Message-ID: <1370434053-22272-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: george.dunlap@eu.citrix.com, qemu-devel@nongnu.org, Stefano Stabellini Subject: [Qemu-devel] [BACKPORT qemu-xen 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. upstream-commit-id: 49fa9881b2358e390e9e9466ddde74e995927efa Signed-off-by: Stefano Stabellini --- hw/xen.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/hw/xen.h b/hw/xen.h index e3cca7f..dd46db9 100644 --- a/hw/xen.h +++ b/hw/xen.h @@ -25,11 +25,7 @@ extern int xen_allowed; static inline int xen_enabled(void) { -#if defined(CONFIG_XEN_BACKEND) && !defined(CONFIG_NO_XEN) return xen_allowed; -#else - return 0; -#endif } int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num);