From patchwork Wed Sep 28 13:22:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 116789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E9947B6F7F for ; Wed, 28 Sep 2011 23:25:19 +1000 (EST) Received: from localhost ([::1]:59777 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8u8Q-00028r-KL for incoming@patchwork.ozlabs.org; Wed, 28 Sep 2011 09:25:14 -0400 Received: from eggs.gnu.org ([140.186.70.92]:53245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8u7h-0000Rt-8J for qemu-devel@nongnu.org; Wed, 28 Sep 2011 09:24:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R8u7f-0006jp-85 for qemu-devel@nongnu.org; Wed, 28 Sep 2011 09:24:29 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:59182) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8u7f-0006jg-5F for qemu-devel@nongnu.org; Wed, 28 Sep 2011 09:24:27 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e6.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p8SD0ExT011586 for ; Wed, 28 Sep 2011 09:00:14 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p8SDOCbW142862 for ; Wed, 28 Sep 2011 09:24:18 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p8SDOAha029714 for ; Wed, 28 Sep 2011 10:24:11 -0300 Received: from localhost.localdomain (d941e-10.watson.ibm.com [9.59.241.154]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p8SDOA4q029699 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 28 Sep 2011 10:24:10 -0300 Received: from localhost.localdomain (d941e-10 [127.0.0.1]) by localhost.localdomain (8.14.4/8.14.3) with ESMTP id p8SDOA1a022845; Wed, 28 Sep 2011 09:24:10 -0400 Received: (from root@localhost) by localhost.localdomain (8.14.4/8.14.4/Submit) id p8SDOAM3022838; Wed, 28 Sep 2011 09:24:10 -0400 Message-Id: <20110928132409.957088081@linux.vnet.ibm.com> User-Agent: quilt/0.48-1 Date: Wed, 28 Sep 2011 09:22:59 -0400 From: Stefan Berger To: stefanb@linux.vnet.ibm.com, qemu-devel@nongnu.org References: <20110928132255.156431784@linux.vnet.ibm.com> Content-Disposition: inline; filename=buildit.diff X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.182.146 Cc: anbang.ruan@cs.ox.ac.uk, mst@redhat.com, andreas.niederl@iaik.tugraz.at, serge@hallyn.com Subject: [Qemu-devel] [PATCH V11 4/5] Build the TPM frontend code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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