[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/12] configure: fix TPM logic
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 05/12] configure: fix TPM logic |
Date: |
Thu, 11 Apr 2013 18:10:26 +0200 |
A non-native i386 or x86_64 emulator should not have TPM passthrough
support, since the TPM is only present for those hosts.
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 24 ++++++++++++++++++------
default-configs/i386-softmmu.mak | 3 +--
default-configs/x86_64-softmmu.mak | 3 +--
tpm/Makefile.objs | 4 +---
4 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index ee07f07..7fedb5a 100755
--- a/configure
+++ b/configure
@@ -2337,6 +2337,15 @@ EOF
fi
##########################################
+# TPM passthrough is only on x86 Linux
+
+if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then
+ tpm_passthrough=$tpm
+else
+ tpm_passthrough=no
+fi
+
+##########################################
# adjust virtio-blk-data-plane based on linux-aio
if test "$virtio_blk_data_plane" = "yes" -a \
@@ -3436,6 +3445,7 @@ echo "virtio-blk-data-plane $virtio_blk_data_plane"
echo "gcov $gcov_tool"
echo "gcov enabled $gcov"
echo "TPM support $tpm"
+echo "TPM passthrough $tpm_passthrough"
if test "$sdl_too_old" = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -3814,6 +3824,14 @@ bsd)
;;
esac
+# TPM passthrough support?
+if test "$tpm" = "yes"; then
+ echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak
+ if test "$tpm_passthrough" = "yes"; then
+ echo "CONFIG_TPM_PASSTHROUGH=y" >> $config_host_mak
+ fi
+fi
+
# use default implementation for tracing backend-specific routines
trace_default=yes
echo "TRACE_BACKEND=$trace_backend" >> $config_host_mak
@@ -4341,12 +4359,6 @@ if test "$gprof" = "yes" ; then
fi
fi
-if test "$tpm" = "yes"; then
- if test "$target_softmmu" = "yes" ; then
- echo "CONFIG_TPM=y" >> $config_host_mak
- fi
-fi
-
if test "$ARCH" = "tci"; then
linker_script=""
else
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 6d9d364..368a776 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -27,8 +27,7 @@ CONFIG_HPET=y
CONFIG_APPLESMC=y
CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y
-CONFIG_TPM_TIS=y
-CONFIG_TPM_PASSTHROUGH=y
+CONFIG_TPM_TIS=$(CONFIG_TPM)
CONFIG_PCI_HOTPLUG=y
CONFIG_MC146818RTC=y
CONFIG_PAM=y
diff --git a/default-configs/x86_64-softmmu.mak
b/default-configs/x86_64-softmmu.mak
index 3b06310..2711b83 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -27,8 +27,7 @@ CONFIG_HPET=y
CONFIG_APPLESMC=y
CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y
-CONFIG_TPM_TIS=y
-CONFIG_TPM_PASSTHROUGH=y
+CONFIG_TPM_TIS=$(CONFIG_TPM)
CONFIG_PCI_HOTPLUG=y
CONFIG_MC146818RTC=y
CONFIG_PAM=y
diff --git a/tpm/Makefile.objs b/tpm/Makefile.objs
index 8676824..366e4a7 100644
--- a/tpm/Makefile.objs
+++ b/tpm/Makefile.objs
@@ -1,6 +1,4 @@
common-obj-y = tpm.o
-ifeq ($(CONFIG_TPM),y)
-common-obj-y += tpm_backend.o
+common-obj-$(CONFIG_TPM) += tpm_backend.o
common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o
common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
-endif
--
1.8.1.4
- [Qemu-devel] [PATCH 00/12] directory reorganization, final part, Paolo Bonzini, 2013/04/11
- [Qemu-devel] [PATCH 02/12] virtio-9p: Fix virtio-9p no longer building after hw-dirs branch merge, Paolo Bonzini, 2013/04/11
- [Qemu-devel] [PATCH 03/12] Add linux-headers to QEMU_INCLUDES, Paolo Bonzini, 2013/04/11
- [Qemu-devel] [PATCH 04/12] Fix failure to create q35 machine, Paolo Bonzini, 2013/04/11
- [Qemu-devel] [PATCH 01/12] arm: fix location of some include files, Paolo Bonzini, 2013/04/11
- [Qemu-devel] [PATCH 05/12] configure: fix TPM logic,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 08/12] include: avoid useless includes of exec/ headers, Paolo Bonzini, 2013/04/11
- [Qemu-devel] [PATCH 06/12] tpm: reorganize headers and split hardware part, Paolo Bonzini, 2013/04/11
- [Qemu-devel] [PATCH 10/12] exec: remove useless declarations from memory-internal.h, Paolo Bonzini, 2013/04/11
- [Qemu-devel] [PATCH 09/12] memory: move core typedefs to qemu/typedefs.h, Paolo Bonzini, 2013/04/11
- [Qemu-devel] [PATCH 07/12] sysemu: avoid proliferation of include/ subdirectories, Paolo Bonzini, 2013/04/11
- [Qemu-devel] [PATCH 12/12] hw: move memory API to hw/core, Paolo Bonzini, 2013/04/11