Re: [Xen-devel] [PATCH] Rename public xenstore headers

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Mon, 2012-05-14 at 17:21 +0100, Ian Jackson wrote:
> Ian Campbell writes ("Re: [Xen-devel] [PATCH] Rename public xenstore 
> headers"):
> > xenstore: rename public xenstore headers
> > 
> > 
> > The xenstore header xs.h is producing conflicts with other software[1].
> > 
> > xs is a too short identifier and does not matche the library. Renaming
> > the headers to xenstore.h and xenstore_lib.h is the easiest way to make
> > them easy recognizable and prevent furthe problems.
> > 
> > [1]: http://bugs.debian.org/668550
> > 
> > Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>
> > Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> 
> I have applied the xen-unstable.hg part of this.  For the
> qemu-xen-traditional part, I felt the number of warnings that result
> was really rather excessive for one of our own trees.
> 
> I have therefore updated qemu-xen-traditional.git (with the patch
> below) to immediately use the new name, and included a corresponding
> update to QEMU_TAG in xen-unstable.hg.

Looks fine, thanks. I would Ack but assume it's too late.

> 
> People who are working with xen-unstable will find that they have to
> update their qemu.
> 
> Ian.
> 
> commit 7bde54662d45b0bbc2ee78c7a8bf2c97c6655445
> Author: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> Date:   Mon May 14 17:05:48 2012 +0100
> 
>     xenstore: Use <xenstore.h>
>     
>     <xs.h> is going away.
>     
>     This change needs to be made in lockstep with xen-unstable.hg, which
>     will be done by a change to the QEMU_TAG in the xen-unstable.hg
>     changeset.
>     
>     Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
> 
> diff --git a/hw/xen_backend.c b/hw/xen_backend.c
> index 64dc93a..92b3506 100644
> --- a/hw/xen_backend.c
> +++ b/hw/xen_backend.c
> @@ -32,7 +32,7 @@
>  #include <sys/mman.h>
>  #include <sys/signal.h>
>  
> -#include <xs.h>
> +#include <xenstore.h>
>  #include <xenctrl.h>
>  #include <xen/grant_table.h>
>  
> diff --git a/hw/xen_common.h b/hw/xen_common.h
> index 7562567..a615052 100644
> --- a/hw/xen_common.h
> +++ b/hw/xen_common.h
> @@ -5,7 +5,7 @@
>  #include <inttypes.h>
>  
>  #include <xenctrl.h>
> -#include <xs.h>
> +#include <xenstore.h>
>  #include <xen/io/xenbus.h>
>  
>  #include "hw.h"
> diff --git a/hw/xen_console.c b/hw/xen_console.c
> index 8d14131..80beb31 100644
> --- a/hw/xen_console.c
> +++ b/hw/xen_console.c
> @@ -29,7 +29,7 @@
>  #include <termios.h>
>  #include <stdarg.h>
>  #include <sys/mman.h>
> -#include <xs.h>
> +#include <xenstore.h>
>  #include <xen/io/console.h>
>  #include <xenctrl.h>
>  
> diff --git a/hw/xen_disk.c b/hw/xen_disk.c
> index 5db58ac..04a62e2 100644
> --- a/hw/xen_disk.c
> +++ b/hw/xen_disk.c
> @@ -33,7 +33,7 @@
>  #include <sys/mman.h>
>  #include <sys/uio.h>
>  
> -#include <xs.h>
> +#include <xenstore.h>
>  #include <xenctrl.h>
>  #include <xen/io/xenbus.h>
>  
> diff --git a/hw/xenfb.c b/hw/xenfb.c
> index 96c2a6f..75b2bc2 100644
> --- a/hw/xenfb.c
> +++ b/hw/xenfb.c
> @@ -37,7 +37,7 @@
>  #include <string.h>
>  #include <time.h>
>  
> -#include <xs.h>
> +#include <xenstore.h>
>  #include <xenctrl.h>
>  #include <xen/event_channel.h>
>  #include <xen/io/xenbus.h>
> diff --git a/xen-config-host.h b/xen-config-host.h
> index 818f25d..647f6be 100644
> --- a/xen-config-host.h
> +++ b/xen-config-host.h
> @@ -17,7 +17,7 @@ extern int domid, domid_backend;
>  #include <stdbool.h>
>  
>  #include "xenctrl.h"
> -#include "xs.h"
> +#include "xenstore.h"
>  #if !defined(CONFIG_STUBDOM) && !defined(__NetBSD__)
>  #include "blktaplib.h"
>  #endif



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel