From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:49546)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony.perard@citrix.com>) id 1SfVa6-0002Eq-EQ
	for qemu-devel@nongnu.org; Fri, 15 Jun 2012 08:24:51 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony.perard@citrix.com>) id 1SfVa4-0004oW-GY
	for qemu-devel@nongnu.org; Fri, 15 Jun 2012 08:24:50 -0400
Received: from smtp02.citrix.com ([66.165.176.63]:60532)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony.perard@citrix.com>) id 1SfVa4-0004oH-C0
	for qemu-devel@nongnu.org; Fri, 15 Jun 2012 08:24:48 -0400
Message-ID: <4FDB298D.1050702@citrix.com>
Date: Fri, 15 Jun 2012 13:24:45 +0100
From: Anthony PERARD <anthony.perard@citrix.com>
MIME-Version: 1.0
References: <1339759030-32653-1-git-send-email-anthony.perard@citrix.com>
	<1339759030-32653-3-git-send-email-anthony.perard@citrix.com>
	<87bokkeqpx.fsf@elfo.mitica>
In-Reply-To: <87bokkeqpx.fsf@elfo.mitica>
Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 2/2] xenstore: Use <xenstore.h>
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "quintela@redhat.com" <quintela@redhat.com>
Cc: Xen Devel <xen-devel@lists.xen.org>, QEMU-devel <qemu-devel@nongnu.org>, Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>

On 15/06/12 12:53, Juan Quintela wrote:
> Anthony PERARD<anthony.perard@citrix.com>  wrote:
>> In the next release of Xen (4.2), xs.h became deprecated.
>>
>> Signed-off-by: Anthony PERARD<anthony.perard@citrix.com>
>> ---
>>   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<<EOF
>>   #include<xenctrl.h>
>> -#include<xs.h>
>> +#include<xenstore.h>
>>   #include<stdint.h>
>>   #include<xen/hvm/hvm_info_table.h>
>>   #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<inttypes.h>
>>
>>   #include<xenctrl.h>
>> -#include<xs.h>
>> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION<  420
>> +#  include<xs.h>
>> +#else
>> +#  include<xenstore.h>
>> +#endif
>>   #include<xen/io/xenbus.h>
>>
>>   #include "hw.h"
>
> Shouldn't we need the ifdef also in configure?  On my system xenstore.h
> still don't exist.

No, configure does not need it. In the configure, I just change the 
header in the test for the next version of Xen. Also the define is 
defined by configure.

Regards,

-- 
Anthony PERARD