From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8Z12-0006xL-A8 for qemu-devel@nongnu.org; Tue, 27 Sep 2011 10:52:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R8Z0z-0007VK-DD for qemu-devel@nongnu.org; Tue, 27 Sep 2011 10:52:12 -0400 Received: from e4.ny.us.ibm.com ([32.97.182.144]:53279) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8Z0z-0007VG-Ak for qemu-devel@nongnu.org; Tue, 27 Sep 2011 10:52:09 -0400 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by e4.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p8RES9Zl028490 for ; Tue, 27 Sep 2011 10:28:09 -0400 Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p8REq8Hq198942 for ; Tue, 27 Sep 2011 10:52:08 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p8REq4He015253 for ; Tue, 27 Sep 2011 11:52:07 -0300 Message-Id: <20110927145201.221211949@linux.vnet.ibm.com> Date: Tue, 27 Sep 2011 10:50:47 -0400 From: Stefan Berger References: <20110927145043.875792455@linux.vnet.ibm.com> Content-Disposition: inline; filename=buildit.diff Subject: [Qemu-devel] [PATCH V10 4/5] Build the TPM frontend code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: stefanb@linux.vnet.ibm.com, qemu-devel@nongnu.org Cc: anbang.ruan@cs.ox.ac.uk, mst@redhat.com, andreas.niederl@iaik.tugraz.at, serge@hallyn.com Build the TPM frontend code that has been added so far. Signed-off-by: Stefan Berger --- Makefile.target | 1 + configure | 11 +++++++++++ 2 files changed, 12 insertions(+) Index: qemu-git.pt/Makefile.target =================================================================== --- qemu-git.pt.orig/Makefile.target +++ qemu-git.pt/Makefile.target @@ -194,6 +194,7 @@ obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virt obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o obj-y += memory.o +obj-$(CONFIG_TPM) += tpm.o tpm_tis.o LIBS+=-lz QEMU_CFLAGS += $(VNC_TLS_CFLAGS) Index: qemu-git.pt/configure =================================================================== --- qemu-git.pt.orig/configure +++ qemu-git.pt/configure @@ -182,6 +182,7 @@ usb_redir="" opengl="" zlib="yes" guest_agent="yes" +tpm="no" # parse CC options first for opt do @@ -766,6 +767,8 @@ for opt do ;; --disable-guest-agent) guest_agent="no" ;; + --enable-tpm) tpm="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -1048,6 +1051,7 @@ echo " --disable-usb-redir disable echo " --enable-usb-redir enable usb network redirection support" echo " --disable-guest-agent disable building of the QEMU Guest Agent" echo " --enable-guest-agent enable building of the QEMU Guest Agent" +echo " --enable-tpm enable TPM support" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -2714,6 +2718,7 @@ echo "nss used $smartcard_nss" echo "usb net redir $usb_redir" echo "OpenGL support $opengl" echo "build guest agent $guest_agent" +echo "TPM support $tpm" if test "$sdl_too_old" = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -3558,6 +3563,12 @@ 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 + 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