From patchwork Fri Jun 15 11:17:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 165088 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 53F831007D1 for ; Fri, 15 Jun 2012 21:17:28 +1000 (EST) Received: from localhost ([::1]:47159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfUWs-0004mG-5M for incoming@patchwork.ozlabs.org; Fri, 15 Jun 2012 07:17:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfUWk-0004ls-FJ for qemu-devel@nongnu.org; Fri, 15 Jun 2012 07:17:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SfUWi-0005MP-EY for qemu-devel@nongnu.org; Fri, 15 Jun 2012 07:17:18 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:61255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfUWi-0005Lr-AA for qemu-devel@nongnu.org; Fri, 15 Jun 2012 07:17:16 -0400 X-IronPort-AV: E=Sophos;i="4.75,776,1330923600"; d="scan'208";a="198876405" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 15 Jun 2012 07:17:12 -0400 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.213.0; Fri, 15 Jun 2012 07:17:12 -0400 Received: from [10.80.3.61] (helo=perard.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1SfUWe-00088W-6U; Fri, 15 Jun 2012 12:17:12 +0100 From: Anthony PERARD To: QEMU-devel Date: Fri, 15 Jun 2012 12:17:10 +0100 Message-ID: <1339759030-32653-3-git-send-email-anthony.perard@citrix.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1339759030-32653-1-git-send-email-anthony.perard@citrix.com> References: <1339759030-32653-1-git-send-email-anthony.perard@citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Cc: Anthony PERARD , Stefano Stabellini , Xen Devel Subject: [Qemu-devel] [PATCH 2/2] xenstore: Use 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 In the next release of Xen (4.2), xs.h became deprecated. Signed-off-by: Anthony PERARD --- configure | 2 +- hw/xen_common.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c2366ee..e7f66c9 100755 --- a/configure +++ b/configure @@ -1382,7 +1382,7 @@ EOF elif ( cat > $TMPC < -#include +#include #include #include #if !defined(HVM_MAX_VCPUS) diff --git a/hw/xen_common.h b/hw/xen_common.h index fe7f227..cc99204 100644 --- a/hw/xen_common.h +++ b/hw/xen_common.h @@ -7,7 +7,11 @@ #include #include -#include +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420 +# include +#else +# include +#endif #include #include "hw.h"