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 0004904ee95bf2d774210baa77c62af7d1c5f4d4..c09adbb7f4d7adf3f7d6d3ad7f93a444a37b5f2c 100644 (file)
--- 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 f50c3aa56d98f13f19e559d9981ad1f634a78bb3..818f25d89b274b0ecae617301029e65a381f8fb6 100644 (file)
--- 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 253915d8d4888bbab153a86729862b2cec52bedd..b55f45b14f8686cc648f80a07c5b01ac6a209f26 100644 (file)
--- 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