[PATCH 0/4] Orphan and disable blktap2

xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 0/4] Orphan and disable blktap2
@ 2017-09-04 13:44 Wei Liu
  2017-09-04 13:44 ` [PATCH 1/4] MAINTAINERS: orphan blktap2 Wei Liu
                   ` (4 more replies)
  0 siblings, 5 replies; 8+ messages in thread
From: Wei Liu @ 2017-09-04 13:44 UTC (permalink / raw)
  To: Xen-devel
  Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper,
	Ian Jackson, Tim Deegan, Jan Beulich

Make clear that blktap2 is orphaned to set expectation straight.

Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Tim Deegan <tim@xen.org>
Cc: Wei Liu <wei.liu2@citrix.com>

Wei Liu (4):
  MAINTAINERS: orphan blktap2
  build: run autogen.sh on Stretch
  tools: disable blktap2 by default
  tools: eliminate LIBXL_BLKTAP2

 MAINTAINERS          |  6 ++++--
 configure            | 14 +++++++++++++-
 docs/configure       | 14 +++++++++++++-
 stubdom/configure    | 28 +++++++++++++++++++++++++++-
 tools/Rules.mk       |  4 +---
 tools/configure      | 23 +++++++++++++++--------
 tools/configure.ac   |  8 ++------
 tools/libxl/Makefile |  2 +-
 8 files changed, 76 insertions(+), 23 deletions(-)

-- 
2.11.0


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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/4] MAINTAINERS: orphan blktap2
  2017-09-04 13:44 [PATCH 0/4] Orphan and disable blktap2 Wei Liu
@ 2017-09-04 13:44 ` Wei Liu
  2017-09-07 11:04   ` George Dunlap
  2017-09-04 13:44 ` [PATCH 2/4] build: run autogen.sh on Stretch Wei Liu
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 8+ messages in thread
From: Wei Liu @ 2017-09-04 13:44 UTC (permalink / raw)
  To: Xen-devel
  Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper,
	Ian Jackson, Tim Deegan, Jan Beulich

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Tim Deegan <tim@xen.org>
Cc: Wei Liu <wei.liu2@citrix.com>
---
 MAINTAINERS | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 5b9e1233a8..ca8cbf276e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -175,6 +175,10 @@ F:	xen/drivers/char/pl011.c
 F:	xen/drivers/char/scif-uart.c
 F:	xen/drivers/passthrough/arm/
 
+BLOCKTAP
+S:	Orphaned
+F:	tools/blktap2/
+
 CPU POOLS
 M:	Juergen Gross <jgross@suse.com>
 M:	Dario Faggioli <dario.faggioli@citrix.com>
@@ -322,8 +326,6 @@ M:	Shriram Rajagopalan <rshriram@cs.ubc.ca>
 M:	Yang Hongyang <imhy.yang@gmail.com>
 S:	Maintained
 F:	docs/README.remus
-F:	tools/blktap2/drivers/block-remus.c
-F:	tools/blktap2/drivers/hashtable*
 F:	tools/libxl/libxl_remus_*
 F:	tools/libxl/libxl_netbuffer.c
 F:	tools/libxl/libxl_nonetbuffer.c
-- 
2.11.0


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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/4] MAINTAINERS: orphan blktap2
  2017-09-04 13:44 ` [PATCH 1/4] MAINTAINERS: orphan blktap2 Wei Liu
@ 2017-09-07 11:04   ` George Dunlap
  2017-09-07 15:26     ` Wei Liu
  0 siblings, 1 reply; 8+ messages in thread
From: George Dunlap @ 2017-09-07 11:04 UTC (permalink / raw)
  To: Wei Liu, Xen-devel
  Cc: Stefano Stabellini, George Dunlap, Andrew Cooper, Ian Jackson,
	Tim Deegan, Jan Beulich

On 09/04/2017 02:44 PM, Wei Liu wrote:
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> Cc: George Dunlap <George.Dunlap@eu.citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Jan Beulich <jbeulich@suse.com>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Cc: Stefano Stabellini <sstabellini@kernel.org>
> Cc: Tim Deegan <tim@xen.org>
> Cc: Wei Liu <wei.liu2@citrix.com>
> ---
>  MAINTAINERS | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 5b9e1233a8..ca8cbf276e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -175,6 +175,10 @@ F:	xen/drivers/char/pl011.c
>  F:	xen/drivers/char/scif-uart.c
>  F:	xen/drivers/passthrough/arm/
>  
> +BLOCKTAP

I think this should just be BLKTAP2.

> +S:	Orphaned
> +F:	tools/blktap2/

Acked-by: George Dunlap <george.dunlap@citrix.com>

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/4] MAINTAINERS: orphan blktap2
  2017-09-07 11:04   ` George Dunlap
@ 2017-09-07 15:26     ` Wei Liu
  0 siblings, 0 replies; 8+ messages in thread
From: Wei Liu @ 2017-09-07 15:26 UTC (permalink / raw)
  To: George Dunlap
  Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper,
	Ian Jackson, Tim Deegan, Jan Beulich, Xen-devel

On Thu, Sep 07, 2017 at 12:04:21PM +0100, George Dunlap wrote:
> On 09/04/2017 02:44 PM, Wei Liu wrote:
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > ---
> > Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> > Cc: George Dunlap <George.Dunlap@eu.citrix.com>
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Jan Beulich <jbeulich@suse.com>
> > Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > Cc: Stefano Stabellini <sstabellini@kernel.org>
> > Cc: Tim Deegan <tim@xen.org>
> > Cc: Wei Liu <wei.liu2@citrix.com>
> > ---
> >  MAINTAINERS | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 5b9e1233a8..ca8cbf276e 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -175,6 +175,10 @@ F:	xen/drivers/char/pl011.c
> >  F:	xen/drivers/char/scif-uart.c
> >  F:	xen/drivers/passthrough/arm/
> >  
> > +BLOCKTAP
> 
> I think this should just be BLKTAP2.

OK.

> 
> > +S:	Orphaned
> > +F:	tools/blktap2/
> 
> Acked-by: George Dunlap <george.dunlap@citrix.com>

Thanks.

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 2/4] build: run autogen.sh on Stretch
  2017-09-04 13:44 [PATCH 0/4] Orphan and disable blktap2 Wei Liu
  2017-09-04 13:44 ` [PATCH 1/4] MAINTAINERS: orphan blktap2 Wei Liu
@ 2017-09-04 13:44 ` Wei Liu
  2017-09-04 13:44 ` [PATCH 3/4] tools: disable blktap2 by default Wei Liu
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Wei Liu @ 2017-09-04 13:44 UTC (permalink / raw)
  To: Xen-devel; +Cc: Ian Jackson, Wei Liu

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 configure         | 14 +++++++++++++-
 docs/configure    | 14 +++++++++++++-
 stubdom/configure | 28 +++++++++++++++++++++++++++-
 tools/configure   | 14 +++++++++++++-
 4 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 5b4e828b81..5270388e5c 100755
--- a/configure
+++ b/configure
@@ -643,6 +643,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -720,6 +721,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -972,6 +974,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1109,7 +1120,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1262,6 +1273,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
diff --git a/docs/configure b/docs/configure
index a5780d9942..fb346dd787 100755
--- a/docs/configure
+++ b/docs/configure
@@ -634,6 +634,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -710,6 +711,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -962,6 +964,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1099,7 +1110,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1252,6 +1263,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
diff --git a/stubdom/configure b/stubdom/configure
index 8e6e0542be..c4130dc1fd 100755
--- a/stubdom/configure
+++ b/stubdom/configure
@@ -587,6 +587,7 @@ PACKAGE_URL='http://www.xen.org/'
 ac_unique_file="xenstore-minios.cfg"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+STUBDOM_UNINSTALL
 STUBDOM_INSTALL
 STUBDOM_BUILD
 STUBDOM_TARGETS
@@ -659,6 +660,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -748,6 +750,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1000,6 +1003,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1137,7 +1149,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1290,6 +1302,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1984,6 +1997,7 @@ ioemu=y
 STUBDOM_TARGETS="$STUBDOM_TARGETS ioemu"
 STUBDOM_BUILD="$STUBDOM_BUILD ioemu-stubdom"
 STUBDOM_INSTALL="$STUBDOM_INSTALL install-ioemu"
+STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-ioemu"
 
 
 else
@@ -2014,6 +2028,7 @@ c=y
 STUBDOM_TARGETS="$STUBDOM_TARGETS c"
 STUBDOM_BUILD="$STUBDOM_BUILD c-stubdom"
 STUBDOM_INSTALL="$STUBDOM_INSTALL install-c"
+STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-c"
 
 
 else
@@ -2051,6 +2066,7 @@ caml=y
 STUBDOM_TARGETS="$STUBDOM_TARGETS caml"
 STUBDOM_BUILD="$STUBDOM_BUILD caml-stubdom"
 STUBDOM_INSTALL="$STUBDOM_INSTALL install-caml"
+STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-caml"
 
 
 else
@@ -2088,6 +2104,7 @@ grub=y
 STUBDOM_TARGETS="$STUBDOM_TARGETS grub"
 STUBDOM_BUILD="$STUBDOM_BUILD pv-grub"
 STUBDOM_INSTALL="$STUBDOM_INSTALL install-grub"
+STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-grub"
 
 
 else
@@ -2110,6 +2127,7 @@ grub=y
 STUBDOM_TARGETS="$STUBDOM_TARGETS grub"
 STUBDOM_BUILD="$STUBDOM_BUILD pv-grub"
 STUBDOM_INSTALL="$STUBDOM_INSTALL install-grub"
+STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-grub"
 
 
 fi
@@ -2128,6 +2146,7 @@ xenstore=y
 STUBDOM_TARGETS="$STUBDOM_TARGETS xenstore"
 STUBDOM_BUILD="$STUBDOM_BUILD xenstore-stubdom"
 STUBDOM_INSTALL="$STUBDOM_INSTALL install-xenstore"
+STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-xenstore"
 
 
 else
@@ -2150,6 +2169,7 @@ xenstore=y
 STUBDOM_TARGETS="$STUBDOM_TARGETS xenstore"
 STUBDOM_BUILD="$STUBDOM_BUILD xenstore-stubdom"
 STUBDOM_INSTALL="$STUBDOM_INSTALL install-xenstore"
+STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-xenstore"
 
 
 fi
@@ -2168,6 +2188,7 @@ vtpm=y
 STUBDOM_TARGETS="$STUBDOM_TARGETS vtpm"
 STUBDOM_BUILD="$STUBDOM_BUILD vtpm-stubdom"
 STUBDOM_INSTALL="$STUBDOM_INSTALL install-vtpm"
+STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-vtpm"
 
 
 else
@@ -2198,6 +2219,7 @@ vtpmmgr=y
 STUBDOM_TARGETS="$STUBDOM_TARGETS vtpmmgr"
 STUBDOM_BUILD="$STUBDOM_BUILD vtpmmgr-stubdom"
 STUBDOM_INSTALL="$STUBDOM_INSTALL install-vtpmmgr"
+STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-vtpmmgr"
 
 
 else
@@ -3577,6 +3599,7 @@ vtpm=y
 STUBDOM_TARGETS="$STUBDOM_TARGETS vtpm"
 STUBDOM_BUILD="$STUBDOM_BUILD vtpm-stubdom"
 STUBDOM_INSTALL="$STUBDOM_INSTALL install-vtpm"
+STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-vtpm"
 
 
 else
@@ -3596,6 +3619,7 @@ vtpmmgr=y
 STUBDOM_TARGETS="$STUBDOM_TARGETS vtpmmgr"
 STUBDOM_BUILD="$STUBDOM_BUILD vtpmmgr-stubdom"
 STUBDOM_INSTALL="$STUBDOM_INSTALL install-vtpmmgr"
+STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-vtpmmgr"
 
 
 else
@@ -3615,6 +3639,7 @@ ioemu=y
 STUBDOM_TARGETS="$STUBDOM_TARGETS ioemu"
 STUBDOM_BUILD="$STUBDOM_BUILD ioemu-stubdom"
 STUBDOM_INSTALL="$STUBDOM_INSTALL install-ioemu"
+STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-ioemu"
 
 
 else
@@ -3631,6 +3656,7 @@ fi
 
 
 
+
 echo "Will build the following stub domains:"
 for x in $STUBDOM_BUILD; do
 	echo "  $x"
diff --git a/tools/configure b/tools/configure
index c8da3fe62a..29393a3ad2 100755
--- a/tools/configure
+++ b/tools/configure
@@ -769,6 +769,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -892,6 +893,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1144,6 +1146,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1281,7 +1292,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1434,6 +1445,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-- 
2.11.0


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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 3/4] tools: disable blktap2 by default
  2017-09-04 13:44 [PATCH 0/4] Orphan and disable blktap2 Wei Liu
  2017-09-04 13:44 ` [PATCH 1/4] MAINTAINERS: orphan blktap2 Wei Liu
  2017-09-04 13:44 ` [PATCH 2/4] build: run autogen.sh on Stretch Wei Liu
@ 2017-09-04 13:44 ` Wei Liu
  2017-09-04 13:44 ` [PATCH 4/4] tools: eliminate LIBXL_BLKTAP2 Wei Liu
  2017-09-05  9:18 ` [PATCH 0/4] Orphan and disable blktap2 Wei Liu
  4 siblings, 0 replies; 8+ messages in thread
From: Wei Liu @ 2017-09-04 13:44 UTC (permalink / raw)
  To: Xen-devel; +Cc: Ian Jackson, Wei Liu

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/configure    | 9 ++-------
 tools/configure.ac | 8 ++------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/tools/configure b/tools/configure
index 29393a3ad2..f3bb412f51 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1490,8 +1490,7 @@ Optional Features:
   --disable-xsmpolicy     Disable XSM policy compilation (default is ENABLED)
   --enable-ovmf           Enable OVMF (default is DISABLED)
   --disable-seabios       Disable SeaBIOS (default is ENABLED)
-  --enable-blktap2        Enable blktap2, (DEFAULT is on for Linux, otherwise
-                          off)
+  --enable-blktap2        Enable blktap2, (DEFAULT is off)
   --enable-qemu-traditional
                           Enable qemu traditional device model, (DEFAULT is on
                           for Linux or NetBSD x86, otherwise off)
@@ -4214,11 +4213,7 @@ if test "${enable_blktap2+set}" = set; then :
   enableval=$enable_blktap2;
 else
 
-    case "$host_os" in
-        linux*)
-           enable_blktap2="yes";;
-        *) enable_blktap2="no";;
-    esac
+        enable_blktap2="no"
 
 fi
 
diff --git a/tools/configure.ac b/tools/configure.ac
index a47d0fdbe6..d1a3a78d87 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -119,12 +119,8 @@ AC_SUBST(LINUX_BACKEND_MODULES)
 dnl Enable blktap2 on Linux only.
 AC_ARG_ENABLE([blktap2],
     AS_HELP_STRING([--enable-blktap2],
-                   [Enable blktap2, (DEFAULT is on for Linux, otherwise off)]),,[
-    case "$host_os" in
-        linux*)
-           enable_blktap2="yes";;
-        *) enable_blktap2="no";;
-    esac
+                   [Enable blktap2, (DEFAULT is off)]),,[
+        enable_blktap2="no"
 ])
 AS_IF([test "x$enable_blktap2" = "xyes"], [
 AC_DEFINE([HAVE_BLKTAP2], [1], [Blktap2 enabled])
-- 
2.11.0


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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 4/4] tools: eliminate LIBXL_BLKTAP2
  2017-09-04 13:44 [PATCH 0/4] Orphan and disable blktap2 Wei Liu
                   ` (2 preceding siblings ...)
  2017-09-04 13:44 ` [PATCH 3/4] tools: disable blktap2 by default Wei Liu
@ 2017-09-04 13:44 ` Wei Liu
  2017-09-05  9:18 ` [PATCH 0/4] Orphan and disable blktap2 Wei Liu
  4 siblings, 0 replies; 8+ messages in thread
From: Wei Liu @ 2017-09-04 13:44 UTC (permalink / raw)
  To: Xen-devel; +Cc: Ian Jackson, Wei Liu

Use CONFIG_BLKTAP2 directly. There is no reason why one would want to
set LIBXL_BLKTAP2 separately as things stand.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/Rules.mk       | 4 +---
 tools/libxl/Makefile | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 4592601db1..dbc7635112 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -163,9 +163,7 @@ else
 CFLAGS += -O2 -fomit-frame-pointer
 endif
 
-LIBXL_BLKTAP ?= $(CONFIG_BLKTAP2)
-
-ifeq ($(LIBXL_BLKTAP),y)
+ifeq ($(CONFIG_BLKTAP2),y)
 CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude)
 SHDEPS_libblktapctl =
 LDLIBS_libblktapctl = $(SHDEPS_libblktapctl) $(XEN_BLKTAP2)/control/libblktapctl$(libextension)
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 082af8f716..bbfc0c0708 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -46,7 +46,7 @@ LIBXL_LIBS += $(LIBXL_LIBS-y)
 LIBXLU_LIBS = $(LDLIBS_libxenlight)
 
 LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o flexarray.o
-ifeq ($(LIBXL_BLKTAP),y)
+ifeq ($(CONFIG_BLKTAP2),y)
 LIBXL_OBJS-y += libxl_blktap2.o
 else
 LIBXL_OBJS-y += libxl_noblktap2.o
-- 
2.11.0


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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 0/4] Orphan and disable blktap2
  2017-09-04 13:44 [PATCH 0/4] Orphan and disable blktap2 Wei Liu
                   ` (3 preceding siblings ...)
  2017-09-04 13:44 ` [PATCH 4/4] tools: eliminate LIBXL_BLKTAP2 Wei Liu
@ 2017-09-05  9:18 ` Wei Liu
  4 siblings, 0 replies; 8+ messages in thread
From: Wei Liu @ 2017-09-05  9:18 UTC (permalink / raw)
  To: Xen-devel
  Cc: Lars Kurth, Stefano Stabellini, Wei Liu, George Dunlap,
	Andrew Cooper, Ian Jackson, Tim Deegan, Jan Beulich

CC Lars as well.

On Mon, Sep 04, 2017 at 02:44:43PM +0100, Wei Liu wrote:
> Make clear that blktap2 is orphaned to set expectation straight.
> 
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> Cc: George Dunlap <George.Dunlap@eu.citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Jan Beulich <jbeulich@suse.com>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Cc: Stefano Stabellini <sstabellini@kernel.org>
> Cc: Tim Deegan <tim@xen.org>
> Cc: Wei Liu <wei.liu2@citrix.com>
> 
> Wei Liu (4):
>   MAINTAINERS: orphan blktap2
>   build: run autogen.sh on Stretch
>   tools: disable blktap2 by default
>   tools: eliminate LIBXL_BLKTAP2
> 
>  MAINTAINERS          |  6 ++++--
>  configure            | 14 +++++++++++++-
>  docs/configure       | 14 +++++++++++++-
>  stubdom/configure    | 28 +++++++++++++++++++++++++++-
>  tools/Rules.mk       |  4 +---
>  tools/configure      | 23 +++++++++++++++--------
>  tools/configure.ac   |  8 ++------
>  tools/libxl/Makefile |  2 +-
>  8 files changed, 76 insertions(+), 23 deletions(-)
> 
> -- 
> 2.11.0
> 

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2017-09-07 15:27 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-04 13:44 [PATCH 0/4] Orphan and disable blktap2 Wei Liu
2017-09-04 13:44 ` [PATCH 1/4] MAINTAINERS: orphan blktap2 Wei Liu
2017-09-07 11:04   ` George Dunlap
2017-09-07 15:26     ` Wei Liu
2017-09-04 13:44 ` [PATCH 2/4] build: run autogen.sh on Stretch Wei Liu
2017-09-04 13:44 ` [PATCH 3/4] tools: disable blktap2 by default Wei Liu
2017-09-04 13:44 ` [PATCH 4/4] tools: eliminate LIBXL_BLKTAP2 Wei Liu
2017-09-05  9:18 ` [PATCH 0/4] Orphan and disable blktap2 Wei Liu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).