Re: [Xen-devel] [PATCH] QEMU: remove blktap when building for NetBSD

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Tue, 2011-10-04 at 15:13 +0100, Roger Pau Monne wrote:
> From: Charlie Root <root@loki.(none)>

Really?

> 
> NetBSD has no blktap support, so remove the use of the blktap if the OS is 
> NetBSD.
> 
> Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>
> ---
>  hw/xen_machine_pv.c |    2 +-
>  xen-config-host.h   |    2 +-
>  xen-hooks.mak       |    2 ++
>  3 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
> index 0004904..c09adbb 100644
> --- a/hw/xen_machine_pv.c
> +++ b/hw/xen_machine_pv.c
> @@ -47,7 +47,7 @@ static void xen_init_pv(ram_addr_t ram_size, int 
> vga_ram_size,
>      CPUState *env;
>      uint32_t domid_target;
>  
> -#ifndef CONFIG_STUBDOM
> +#if !defined(CONFIG_STUBDOM) && !defined(__NetBSD__)
>      /* Initialize tapdisk client */
>      init_blktap();
>  #endif
> diff --git a/xen-config-host.h b/xen-config-host.h
> index f50c3aa..818f25d 100644
> --- a/xen-config-host.h
> +++ b/xen-config-host.h
> @@ -18,7 +18,7 @@ extern int domid, domid_backend;
>  
>  #include "xenctrl.h"
>  #include "xs.h"
> -#ifndef CONFIG_STUBDOM
> +#if !defined(CONFIG_STUBDOM) && !defined(__NetBSD__)
>  #include "blktaplib.h"
>  #endif
>  
> diff --git a/xen-hooks.mak b/xen-hooks.mak
> index 253915d..b55f45b 100644
> --- a/xen-hooks.mak
> +++ b/xen-hooks.mak
> @@ -46,11 +46,13 @@ CONFIG_SDL=
>  CONFIG_AUDIO=
>  OBJS += xenfbfront.o
>  else
> +ifndef CONFIG_NetBSD
>  CPPFLAGS+= -I$(XEN_ROOT)/tools/blktap/lib
>  LIBS += -L$(XEN_ROOT)/tools/blktap/lib -lblktap
>  OBJS += xen_blktap.o
>  OBJS += tpm_tis.o
>  endif
> +endif
>  
>  ifdef CONFIG_STUBDOM
>  CONFIG_PASSTHROUGH=1



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel