[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V5 04/12] Add tpm_tis driver to build process
From: |
Stefan Berger |
Subject: |
[Qemu-devel] [PATCH V5 04/12] Add tpm_tis driver to build process |
Date: |
Fri, 20 May 2011 11:42:44 -0400 |
User-agent: |
quilt/0.48-1 |
The TPM interface (tpm_tis) needs to be explicitly enabled via
./configure --enable-tpm. This patch also restricts the building of the
TPM support to i386 and x86_64 targets since only there it is currently
supported. With that I am trying to prevent that one will end up with
support for a frontend but no available backend.
v3:
- fixed and moved hunks in Makefile.target into right place
Signed-off-by: Stefan Berger <address@hidden>
Index:qemu/Makefile.target
===================================================================
---
Makefile.target | 1 +
configure | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+)
Index: qemu-git/Makefile.target
===================================================================
--- qemu-git.orig/Makefile.target
+++ qemu-git/Makefile.target
@@ -239,6 +239,7 @@ obj-i386-y += device-hotplug.o pci-hotpl
obj-i386-y += debugcon.o multiboot.o
obj-i386-y += pc_piix.o kvmclock.o
obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o
+obj-i386-$(CONFIG_TPM) += tpm_tis.o
# shared objects
obj-ppc-y = ppc.o
Index: qemu-git/configure
===================================================================
--- qemu-git.orig/configure
+++ qemu-git/configure
@@ -179,6 +179,7 @@ rbd=""
smartcard=""
smartcard_nss=""
opengl=""
+tpm="no"
# parse CC options first
for opt do
@@ -714,6 +715,8 @@ for opt do
;;
--kerneldir=*) kerneldir="$optarg"
;;
+ --enable-tpm) tpm="yes"
+ ;;
--with-pkgversion=*) pkgversion=" ($optarg)"
;;
--disable-docs) docs="no"
@@ -1014,6 +1017,7 @@ echo " --disable-smartcard disable
echo " --enable-smartcard enable smartcard support"
echo " --disable-smartcard-nss disable smartcard nss support"
echo " --enable-smartcard-nss enable smartcard nss support"
+echo " --enable-tpm enables an emulated TPM"
echo ""
echo "NOTE: The object files are built at the place where configure is
launched"
exit 1
@@ -2706,6 +2710,7 @@ echo "rbd support $rbd"
echo "xfsctl support $xfs"
echo "nss used $smartcard_nss"
echo "OpenGL support $opengl"
+echo "TPM support $tpm"
if test $sdl_too_old = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -3524,6 +3529,21 @@ if test "$gprof" = "yes" ; then
fi
fi
+if test "$tpm" = "yes"; then
+ has_tpm=0
+ if test "$target_softmmu" = "yes" ; then
+ case "$TARGET_BASE_ARCH" in
+ i386)
+ has_tpm=1
+ ;;
+ esac
+ fi
+
+ if test "$has_tpm" = "1"; then
+ echo "CONFIG_TPM=y" >> $config_host_mak
+ fi
+fi
+
linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/\$(ARCH).ld"
if test "$target_linux_user" = "yes" -o "$target_bsd_user" = "yes" ; then
case "$ARCH" in
- [Qemu-devel] [PATCH V5 00/12] Qemu Trusted Platform Module (TPM) integration, Stefan Berger, 2011/05/20
- [Qemu-devel] [PATCH V5 05/12] Add a debug register, Stefan Berger, 2011/05/20
- [Qemu-devel] [PATCH V5 03/12] Add persistent state handling to TPM TIS frontend driver, Stefan Berger, 2011/05/20
- [Qemu-devel] [PATCH V5 01/12] Support for TPM command line options, Stefan Berger, 2011/05/20
- [Qemu-devel] [PATCH V5 02/12] Add TPM (frontend) hardware interface (TPM TIS) to Qemu, Stefan Berger, 2011/05/20
- [Qemu-devel] [PATCH V5 08/12] Introduce file lock for the block layer, Stefan Berger, 2011/05/20
- [Qemu-devel] [PATCH V5 04/12] Add tpm_tis driver to build process,
Stefan Berger <=
- [Qemu-devel] [PATCH V5 07/12] Implementation of the libtpms-based backend, Stefan Berger, 2011/05/20
- [Qemu-devel] [PATCH V5 12/12] Experimental support for taking measurements when kernel etc. are passed to Qemu, Stefan Berger, 2011/05/20
- [Qemu-devel] [PATCH V5 11/12] Experimental support for block migrating TPMs state, Stefan Berger, 2011/05/20
- [Qemu-devel] [PATCH V5 06/12] Add a TPM backend skeleton implementation, Stefan Berger, 2011/05/20
- [Qemu-devel] [PATCH V5 10/12] Encrypt state blobs using AES CBC encryption, Stefan Berger, 2011/05/20
- [Qemu-devel] [PATCH V5 09/12] Add block storage support for libtpms based TPM backend, Stefan Berger, 2011/05/20