From patchwork Wed May 2 22:02:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 156563 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 EA640B6FA4 for ; Thu, 3 May 2012 08:04:23 +1000 (EST) Received: from localhost ([::1]:60207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPhen-0002iJ-JU for incoming@patchwork.ozlabs.org; Wed, 02 May 2012 18:04:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPheW-0002a3-Kx for qemu-devel@nongnu.org; Wed, 02 May 2012 18:04:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPheU-0007nH-CS for qemu-devel@nongnu.org; Wed, 02 May 2012 18:04:04 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:57246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPheU-0007ma-5h for qemu-devel@nongnu.org; Wed, 02 May 2012 18:04:02 -0400 Received: from /spool/local by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 2 May 2012 16:04:00 -0600 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 2 May 2012 16:03:38 -0600 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 06A9A3E40036 for ; Wed, 2 May 2012 16:03:35 -0600 (MDT) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q42M3XdD145774 for ; Wed, 2 May 2012 16:03:34 -0600 Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q42M3VGo026537 for ; Wed, 2 May 2012 16:03:32 -0600 Received: from d941e-5.watson.ibm.com (d941e-5.watson.ibm.com [9.59.241.149]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q42M3JQ0025800 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 2 May 2012 16:03:19 -0600 Received: from d941e-5.watson.ibm.com (localhost [127.0.0.1]) by d941e-5.watson.ibm.com (8.14.5/8.14.3) with ESMTP id q42M3HBg005109; Wed, 2 May 2012 18:03:18 -0400 Received: (from root@localhost) by d941e-5.watson.ibm.com (8.14.5/8.14.5/Submit) id q42M3HVi005108; Wed, 2 May 2012 18:03:17 -0400 From: Stefan Berger To: stefanb@linux.vnet.ibm.com, qemu-devel@nongnu.org, anthony@codemonkey.ws Date: Wed, 2 May 2012 18:02:55 -0400 Message-Id: <1335996178-5046-5-git-send-email-stefanb@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1335996178-5046-1-git-send-email-stefanb@linux.vnet.ibm.com> References: <1335996178-5046-1-git-send-email-stefanb@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12050222-1780-0000-0000-0000053F8CC5 X-IBM-ISS-SpamDetectors: X-IBM-ISS-DetailInfo: BY=3.00000274; HX=3.00000188; KW=3.00000007; PH=3.00000001; SC=3.00000001; SDB=6.00135783; UDB=6.00031726; UTC=2012-05-02 22:03:55 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.152 Cc: andreas.niederl@iaik.tugraz.at, mst@redhat.com Subject: [Qemu-devel] [PATCH V18 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 1582904..cdf108a 100644 --- a/Makefile.target +++ b/Makefile.target @@ -192,6 +192,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 cputlb.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 0111774..3ad8ddf 100755 --- a/configure +++ b/configure @@ -194,6 +194,7 @@ zlib="yes" guest_agent="yes" libiscsi="" coroutine="" +tpm="no" # parse CC options first for opt do @@ -824,6 +825,8 @@ for opt do ;; --disable-guest-agent) guest_agent="no" ;; + --enable-tpm) tpm="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -1110,6 +1113,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 @@ -3009,6 +3013,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" @@ -3887,6 +3892,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