ia64/xen-unstable

changeset 17018:df9e3ec0490a

ioemu stubdom: make TPM optional
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Feb 11 10:01:42 2008 +0000 (2008-02-11)
parents 96b418cf047e
children 54bd38dab5ef
files tools/ioemu/Makefile.target tools/ioemu/hw/pc.c
line diff
     1.1 --- a/tools/ioemu/Makefile.target	Mon Feb 11 09:57:38 2008 +0000
     1.2 +++ b/tools/ioemu/Makefile.target	Mon Feb 11 10:01:42 2008 +0000
     1.3 @@ -420,6 +420,7 @@ VL_OBJS+= xen_machine_pv.o
     1.4  VL_OBJS+= xenfb.o
     1.5  VL_OBJS+= xen_console.o
     1.6  VL_OBJS+= tpm_tis.o
     1.7 +CPPFLAGS += -DHAS_TPM
     1.8  CPPFLAGS += -DHAS_AUDIO
     1.9  endif
    1.10  ifeq ($(TARGET_BASE_ARCH), ppc)
     2.1 --- a/tools/ioemu/hw/pc.c	Mon Feb 11 09:57:38 2008 +0000
     2.2 +++ b/tools/ioemu/hw/pc.c	Mon Feb 11 10:01:42 2008 +0000
     2.3 @@ -1013,8 +1013,10 @@ static void pc_init1(uint64_t ram_size, 
     2.4          }
     2.5      }
     2.6  
     2.7 +#ifdef HAS_TPM
     2.8      if (has_tpm_device())
     2.9          tpm_tis_init(&pic_set_irq_new, isa_pic, 11);
    2.10 +#endif
    2.11  
    2.12      kbd_init();
    2.13      DMA_init(0);