From patchwork Fri Jan 18 16:02:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 213657 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 BB80A2C007B for ; Sat, 19 Jan 2013 03:09:22 +1100 (EST) Received: from localhost ([::1]:46128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwEVM-0005Ec-OI for incoming@patchwork.ozlabs.org; Fri, 18 Jan 2013 11:09:20 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwEVD-0005AQ-D3 for qemu-devel@nongnu.org; Fri, 18 Jan 2013 11:09:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TwEV9-0008Jg-Ho for qemu-devel@nongnu.org; Fri, 18 Jan 2013 11:09:11 -0500 Received: from e7.ny.us.ibm.com ([32.97.182.137]:56237) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwEV9-0008Jb-Co for qemu-devel@nongnu.org; Fri, 18 Jan 2013 11:09:07 -0500 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 18 Jan 2013 11:09:06 -0500 Received: from d01dlp01.pok.ibm.com (9.56.250.166) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 18 Jan 2013 11:08:00 -0500 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id CDB5138C803B for ; Fri, 18 Jan 2013 11:07:58 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r0IG7wmX275958 for ; Fri, 18 Jan 2013 11:07:58 -0500 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r0IG7vel005456 for ; Fri, 18 Jan 2013 11:07:58 -0500 Received: from k-d941f-5.watson.ibm.com (k-d941f-5.watson.ibm.com [9.2.141.165]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r0IG7vn7005395 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 18 Jan 2013 11:07:57 -0500 Received: from k-d941f-5.watson.ibm.com (localhost.localdomain [127.0.0.1]) by k-d941f-5.watson.ibm.com (8.14.5/8.14.3) with ESMTP id r0IG7tpP022471; Fri, 18 Jan 2013 11:07:56 -0500 Received: (from root@localhost) by k-d941f-5.watson.ibm.com (8.14.5/8.14.5/Submit) id r0IG3BsD022358; Fri, 18 Jan 2013 11:03:11 -0500 From: Stefan Berger To: stefanb@linux.vnet.ibm.com, qemu-devel@nongnu.org, anthony@codemonkey.ws Date: Fri, 18 Jan 2013 11:02:44 -0500 Message-Id: <1358524968-22297-5-git-send-email-stefanb@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358524968-22297-1-git-send-email-stefanb@linux.vnet.ibm.com> References: <1358524968-22297-1-git-send-email-stefanb@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13011816-5806-0000-0000-00001E6D8976 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.182.137 Cc: andreas.niederl@iaik.tugraz.at, mst@redhat.com Subject: [Qemu-devel] [PATCH V20 4/8] 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 Reviewed-by: Corey Bryant --- Makefile.objs | 1 + configure | 11 +++++++++++ hw/Makefile.objs | 3 +++ 3 files changed, 15 insertions(+) diff --git a/Makefile.objs b/Makefile.objs index 3c7abca..637669d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -101,6 +101,7 @@ common-obj-$(CONFIG_POSIX) += compatfd.o common-obj-y += qemu-timer.o qemu-timer-common.o common-obj-y += qtest.o common-obj-y += vl.o +common-obj-y += tpm.o common-obj-$(CONFIG_SLIRP) += slirp/ diff --git a/configure b/configure index 994f731..a6f8c4c 100755 --- a/configure +++ b/configure @@ -223,6 +223,7 @@ libiscsi="" coroutine="" seccomp="" glusterfs="" +tpm="no" # parse CC options first for opt do @@ -871,6 +872,8 @@ for opt do ;; --enable-glusterfs) glusterfs="yes" ;; + --enable-tpm) tpm="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -1119,6 +1122,7 @@ echo " --with-coroutine=BACKEND coroutine backend. Supported options:" echo " gthread, ucontext, sigaltstack, windows" echo " --enable-glusterfs enable GlusterFS backend" echo " --disable-glusterfs disable GlusterFS backend" +echo " --enable-tpm enable TPM support" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -3250,6 +3254,7 @@ echo "build guest agent $guest_agent" echo "seccomp support $seccomp" echo "coroutine backend $coroutine_backend" echo "GlusterFS support $glusterfs" +echo "TPM support $tpm" if test "$sdl_too_old" = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -4149,6 +4154,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 diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d581d8d..15eb567 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -141,6 +141,9 @@ common-obj-$(CONFIG_MIPSNET) += mipsnet.o common-obj-y += null-machine.o +# TPM +common-obj-$(CONFIG_TPM) += tpm_tis.o + # Sound sound-obj-y = sound-obj-$(CONFIG_SB16) += sb16.o