From patchwork Tue Mar 27 20:24:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 149041 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E6632B6EEF for ; Wed, 28 Mar 2012 08:46:48 +1100 (EST) Received: from localhost ([::1]:55048 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCeE2-00084d-Gz for incoming@patchwork.ozlabs.org; Tue, 27 Mar 2012 17:46:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCdwh-0002te-2B for qemu-devel@nongnu.org; Tue, 27 Mar 2012 17:28:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCdwe-0002oV-9Q for qemu-devel@nongnu.org; Tue, 27 Mar 2012 17:28:50 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:53399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCdwe-0002oF-2l for qemu-devel@nongnu.org; Tue, 27 Mar 2012 17:28:48 -0400 Received: from /spool/local by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 27 Mar 2012 15:28:46 -0600 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 27 Mar 2012 15:28:05 -0600 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 389CD1FF004B for ; Tue, 27 Mar 2012 15:28:04 -0600 (MDT) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2RLRRDu038174 for ; Tue, 27 Mar 2012 15:27:28 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2RLROIQ027034 for ; Tue, 27 Mar 2012 15:27:27 -0600 Received: from d941f-5.watson.ibm.com (d941f-5.watson.ibm.com [9.59.241.119]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q2RLRNik026865 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 27 Mar 2012 15:27:23 -0600 Received: from d941f-5.watson.ibm.com (localhost.localdomain [127.0.0.1]) by d941f-5.watson.ibm.com (8.14.4/8.14.4) with ESMTP id q2RKP3RG029524; Tue, 27 Mar 2012 16:25:03 -0400 Received: (from root@localhost) by d941f-5.watson.ibm.com (8.14.4/8.14.4/Submit) id q2RKP2UR029523; Tue, 27 Mar 2012 16:25:02 -0400 From: Stefan Berger To: stefanb@linux.vnet.ibm.com, qemu-devel@nongnu.org, anthony@codemonkey.ws Date: Tue, 27 Mar 2012 16:24:36 -0400 Message-Id: <1332879879-29460-5-git-send-email-stefanb@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1332879879-29460-1-git-send-email-stefanb@linux.vnet.ibm.com> References: <1332879879-29460-1-git-send-email-stefanb@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12032721-7408-0000-0000-000003C2DD1B X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.158 Cc: andreas.niederl@iaik.tugraz.at, mst@redhat.com Subject: [Qemu-devel] [PATCH V15 4/7] 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 | 2 ++ configure | 11 +++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Makefile.target b/Makefile.target index 44b2e83..7cb4588 100644 --- a/Makefile.target +++ b/Makefile.target @@ -220,6 +220,8 @@ obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o obj-$(CONFIG_VGA) += vga.o obj-y += memory.o savevm.o +obj-y += tpm.o +obj-$(CONFIG_TPM) += tpm_tis.o LIBS+=-lz obj-i386-$(CONFIG_KVM) += hyperv.o diff --git a/configure b/configure index 14ef738..c728b89 100755 --- a/configure +++ b/configure @@ -195,6 +195,7 @@ zlib="yes" guest_agent="yes" libiscsi="" coroutine="" +tpm="no" # parse CC options first for opt do @@ -825,6 +826,8 @@ for opt do ;; --disable-guest-agent) guest_agent="no" ;; + --enable-tpm) tpm="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -1115,6 +1118,7 @@ echo " --disable-guest-agent disable building of the QEMU Guest Agent" echo " --enable-guest-agent enable building of the QEMU Guest Agent" echo " --with-coroutine=BACKEND coroutine backend. Supported options:" echo " gthread, ucontext, sigaltstack, windows" +echo " --enable-tpm enable TPM support" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -2954,6 +2958,7 @@ echo "OpenGL support $opengl" echo "libiscsi support $libiscsi" echo "build guest agent $guest_agent" echo "coroutine backend $coroutine_backend" +echo "TPM support $tpm" if test "$sdl_too_old" = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -3840,6 +3845,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 + if test "$ARCH" = "tci"; then linker_script="" else