[Xen-changelog] [xen-unstable] ioemu stubdom: make TPM optional

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1202724102 0
# Node ID df9e3ec0490ad5dcdb824346432a928666402565
# Parent  96b418cf047e6d869740efd3660ab175303a3148
ioemu stubdom: make TPM optional
Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>
---
 tools/ioemu/Makefile.target |    1 +
 tools/ioemu/hw/pc.c         |    2 ++
 2 files changed, 3 insertions(+)

diff -r 96b418cf047e -r df9e3ec0490a tools/ioemu/Makefile.target
--- a/tools/ioemu/Makefile.target       Mon Feb 11 09:57:38 2008 +0000
+++ b/tools/ioemu/Makefile.target       Mon Feb 11 10:01:42 2008 +0000
@@ -420,6 +420,7 @@ VL_OBJS+= xenfb.o
 VL_OBJS+= xenfb.o
 VL_OBJS+= xen_console.o
 VL_OBJS+= tpm_tis.o
+CPPFLAGS += -DHAS_TPM
 CPPFLAGS += -DHAS_AUDIO
 endif
 ifeq ($(TARGET_BASE_ARCH), ppc)
diff -r 96b418cf047e -r df9e3ec0490a tools/ioemu/hw/pc.c
--- a/tools/ioemu/hw/pc.c       Mon Feb 11 09:57:38 2008 +0000
+++ b/tools/ioemu/hw/pc.c       Mon Feb 11 10:01:42 2008 +0000
@@ -1013,8 +1013,10 @@ static void pc_init1(uint64_t ram_size, 
         }
     }
 
+#ifdef HAS_TPM
     if (has_tpm_device())
         tpm_tis_init(&pic_set_irq_new, isa_pic, 11);
+#endif
 
     kbd_init();
     DMA_init(0);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog