From patchwork Wed Jun 12 21:41:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 250902 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 2B6CD2C0079 for ; Thu, 13 Jun 2013 08:08:16 +1000 (EST) Received: from localhost ([::1]:44863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Umsug-0001Av-Em for incoming@patchwork.ozlabs.org; Wed, 12 Jun 2013 17:49:06 -0400 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 Received: from mail-ie0-x236.google.com ([2607:f8b0:4001:c03::236]:49716) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Umsr2-0000zq-8J; Wed, 12 Jun 2013 17:45:20 -0400 Received: by mail-ie0-f182.google.com with SMTP id s9so10041632iec.27 for ; Wed, 12 Jun 2013 14:45:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=UpLHZxWk1fQyp3b/mrIm+y5gXGE8O2H1kBQjDuylqcc=; b=asdmAag1iCcs2w3glclnGyrYE05FBVp8tcVMrapuTWGEHmkYEj8WT/BVUgiDvBh3kE X31mfSOXgGMveUgzq2e7olMql8D+liuv07eaNSp6n5NbPUBzh3jRy0kLOxxFMyV2oSav UH+qToTdVsMNFcoBTWOnDeYKeamBtf/rPJn8zeEMvLEyI+PpM/5x1pQVZCEzb+iVgmCo 7Prja5YImSCjFeYHY63F+ekUXM0K2lmeuIi7khPHof9MiINcDvjlu/N1rGaeOy938pKR JDrzahdZQ9SCUSkp85xp3ugjkxSIXcuTVdoZeDi3NEETnsUJZi4LWWMJuATYXCKyByiF w87Q== X-Received: by 10.50.3.102 with SMTP id b6mr4282378igb.80.1371073519632; Wed, 12 Jun 2013 14:45:19 -0700 (PDT) Received: from localhost ([32.97.110.51]) by mx.google.com with ESMTPSA id qn10sm4241038igc.6.2013.06.12.14.45.18 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 12 Jun 2013 14:45:18 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 12 Jun 2013 16:41:17 -0500 Message-Id: <1371073298-14519-6-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 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> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c03::236 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 05/26] 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 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);