From: Roger Pau Monne <roger.pau@entel.upc.edu>
Date: Thu, 6 Oct 2011 17:38:08 +0000 (+0100)
Subject: remove blktap when building for NetBSD
X-Git-Tag: xen-4.2.0-rc1~37
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=25378e0a76b282127e9ab8933a4defbc91db3862;p=qemu-xen-unstable.git

remove blktap when building for NetBSD

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@entel.upc.edu>
---

diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 0004904ee9..c09adbb7f4 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 f50c3aa56d..818f25d89b 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 253915d8d4..b55f45b14f 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