From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 18 Mar 2008 13:13:31 +0000 (+0000)
Subject: stubdom: disable xen_blktap
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14247^2~40
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a5678887ccb39790944a526500ed1f84e304698b;p=xen.git

stubdom: disable xen_blktap

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
---

diff --git a/tools/ioemu/Makefile.target b/tools/ioemu/Makefile.target
index a9ffb1de53..8f9a335316 100644
--- a/tools/ioemu/Makefile.target
+++ b/tools/ioemu/Makefile.target
@@ -430,7 +430,9 @@ VL_OBJS+= cirrus_vga.o parallel.o acpi.o
 VL_OBJS+= usb-uhci.o smbus_eeprom.o
 VL_OBJS+= piix4acpi.o
 VL_OBJS+= xenstore.o
+ifndef CONFIG_STUBDOM
 VL_OBJS+= xen_blktap.o
+endif
 VL_OBJS+= xen_platform.o
 VL_OBJS+= xen_machine_fv.o
 VL_OBJS+= xen_machine_pv.o
diff --git a/tools/ioemu/hw/xen_machine_pv.c b/tools/ioemu/hw/xen_machine_pv.c
index 8ebb97e88c..5cf5a695d4 100644
--- a/tools/ioemu/hw/xen_machine_pv.c
+++ b/tools/ioemu/hw/xen_machine_pv.c
@@ -45,8 +45,10 @@ static void xen_init_pv(uint64_t ram_size, int vga_ram_size, char *boot_device,
     extern int domid;
 
 
+#ifndef CONFIG_STUBDOM
     /* Initialize tapdisk client */
     init_blktap();
+#endif
 
     /* Connect to text console */
     if (serial_hds[0]) {