From mboxrd@z Thu Jan  1 00:00:00 1970
From: Samuel Thibault <samuel.thibault@eu.citrix.com>
Subject: [PATCH] stubdom: disable xen_blktap
Date: Tue, 18 Mar 2008 11:47:25 +0000
Message-ID: <20080318114725.GA7250@implementation.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

stubdom: disable xen_blktap

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

diff -r ddb74b9590c6 tools/ioemu/Makefile.target
--- a/tools/ioemu/Makefile.target	Tue Mar 18 11:39:21 2008 +0000
+++ b/tools/ioemu/Makefile.target	Tue Mar 18 11:46:00 2008 +0000
@@ -430,7 +430,9 @@ VL_OBJS+= usb-uhci.o smbus_eeprom.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 -r ddb74b9590c6 tools/ioemu/hw/xen_machine_pv.c
--- a/tools/ioemu/hw/xen_machine_pv.c	Tue Mar 18 11:39:21 2008 +0000
+++ b/tools/ioemu/hw/xen_machine_pv.c	Tue Mar 18 11:46:00 2008 +0000
@@ -45,8 +45,10 @@ static void xen_init_pv(uint64_t ram_siz
     extern int domid;
 
 
+#ifndef CONFIG_STUBDOM
     /* Initialize tapdisk client */
     init_blktap();
+#endif
 
     /* Connect to text console */
     if (serial_hds[0]) {