ia64/xen-unstable

changeset 17246:0f204e41cc93

stubdom: disable xen_blktap

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Mar 18 13:13:31 2008 +0000 (2008-03-18)
parents fe339d30e2e1
children 5cbfc6c24d32
files tools/ioemu/Makefile.target tools/ioemu/hw/xen_machine_pv.c
line diff
     1.1 --- a/tools/ioemu/Makefile.target	Tue Mar 18 13:11:43 2008 +0000
     1.2 +++ b/tools/ioemu/Makefile.target	Tue Mar 18 13:13:31 2008 +0000
     1.3 @@ -430,7 +430,9 @@ VL_OBJS+= cirrus_vga.o parallel.o acpi.o
     1.4  VL_OBJS+= usb-uhci.o smbus_eeprom.o
     1.5  VL_OBJS+= piix4acpi.o
     1.6  VL_OBJS+= xenstore.o
     1.7 +ifndef CONFIG_STUBDOM
     1.8  VL_OBJS+= xen_blktap.o
     1.9 +endif
    1.10  VL_OBJS+= xen_platform.o
    1.11  VL_OBJS+= xen_machine_fv.o
    1.12  VL_OBJS+= xen_machine_pv.o
     2.1 --- a/tools/ioemu/hw/xen_machine_pv.c	Tue Mar 18 13:11:43 2008 +0000
     2.2 +++ b/tools/ioemu/hw/xen_machine_pv.c	Tue Mar 18 13:13:31 2008 +0000
     2.3 @@ -45,8 +45,10 @@ static void xen_init_pv(uint64_t ram_siz
     2.4      extern int domid;
     2.5  
     2.6  
     2.7 +#ifndef CONFIG_STUBDOM
     2.8      /* Initialize tapdisk client */
     2.9      init_blktap();
    2.10 +#endif
    2.11  
    2.12      /* Connect to text console */
    2.13      if (serial_hds[0]) {