Re: [PATCH 4/6] libxl: Use the block-tap script for LIBXL_DISK_BACKEND_TAP

[Andrew Cooper <andrew.cooper3@citrix.com>]

On 06/07/15 11:51, George Dunlap wrote:
> The block-tap script can now do everything needed for libxl; no need
> to link against the blktap library.
>
> To do this:
>
> * Set disk->script to "block-tap" and dev to "format:pdev_path" in
>   device_disk_add for LIBXL_DISK_BACKEND_TAP
>
> * Remove libxl_blktap2.o and libxl_noblktap2.o and all code depending
>   on them
>
> Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
> ---
> CC: Ian Campbell <ian.campbell@citrix.com>
> CC: Ian Jackson <ian.jackson@citrix.com>
> CC: Wei Liu <wei.liu2@citrix.com>
> CC: Dave Scott <Dave.Scott@eu.citrix.com>
> CC: Jonathan Ludlam <Jonathan.Ludlam@eu.citrix.com>
> CC: Wen Congyang <wency@cn.fujitsu.com>
> CC: Yang Hongyang <yanghy@cn.fujitsu.com>
> CC: Felipe Franciosi <felipe.franciosi@citrix.com>
>
> Note: This is broken for HVM domains at the moment because all block
> scripts are broken for HVM domains.  That is a bug which should be a
> blocker for the 4.6 release.  As such, I think there is justification
> for checking in this "feature" (enabling use of a 'system' blktap)
> with the assumption that the FIXME will go away before the release.
>
> That will technically break bisectability; but only for users of
> blktap (which does not include osstest).
> ---
>  tools/libxl/Makefile          |  5 ---
>  tools/libxl/libxl.c           | 28 ++++---------
>  tools/libxl/libxl_blktap2.c   | 93 -------------------------------------------
>  tools/libxl/libxl_device.c    | 14 -------
>  tools/libxl/libxl_dm.c        |  5 ++-
>  tools/libxl/libxl_internal.h  | 26 ------------
>  tools/libxl/libxl_noblktap2.c | 42 -------------------
>  7 files changed, 11 insertions(+), 202 deletions(-)
>
> diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
> index cc9c152..43ab243 100644
> --- a/tools/libxl/Makefile
> +++ b/tools/libxl/Makefile
> @@ -44,11 +44,6 @@ LIBXL_LIBS += $(LIBXL_LIBS-y)
>  LIBXLU_LIBS = libxenlight.so
>  
>  LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o flexarray.o
> -ifeq ($(LIBXL_BLKTAP),y)

You will also want to remove reference to LIBXL_BLKTAP from Rules.mk

~Andrew