From patchwork Thu Feb 24 20:01:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 84470 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 593FCB70A6 for ; Fri, 25 Feb 2011 07:14:53 +1100 (EST) Received: from localhost ([127.0.0.1]:43820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PshZd-0001eX-Ip for incoming@patchwork.ozlabs.org; Thu, 24 Feb 2011 15:14:05 -0500 Received: from [140.186.70.92] (port=38912 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PshVc-000070-JB for qemu-devel@nongnu.org; Thu, 24 Feb 2011 15:10:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PshNo-0003vu-JU for qemu-devel@nongnu.org; Thu, 24 Feb 2011 15:01:53 -0500 Received: from e32.co.us.ibm.com ([32.97.110.150]:51341) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PshNo-0003vm-AT for qemu-devel@nongnu.org; Thu, 24 Feb 2011 15:01:52 -0500 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e32.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p1OJpOqe002619 for ; Thu, 24 Feb 2011 12:51:24 -0700 Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p1OK1ofo087012 for ; Thu, 24 Feb 2011 13:01:50 -0700 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 p1OK1oso008114 for ; Thu, 24 Feb 2011 13:01:50 -0700 Received: from [9.59.241.154] (d941e-10.watson.ibm.com [9.59.241.154]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p1OK1nRO008104; Thu, 24 Feb 2011 13:01:50 -0700 From: Stefan Berger To: "qemu-devel@nongnu.org" In-Reply-To: <1298576432.17424.1.camel@d941e-10> References: <1298576432.17424.1.camel@d941e-10> Date: Thu, 24 Feb 2011 15:01:49 -0500 Message-ID: <1298577709.17969.1.camel@d941e-10> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 (2.32.1-1.fc14) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.110.150 Cc: Andreas Niederl Subject: [Qemu-devel] [PATCH 1/5]: Add tpm_tis driver to build process X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The TPM interface (tpm_tis) needs to be explicitly enabled via ./configure --enable-tpm. I am restricting the building of the TPM support to i386 and x86_64 targets since both backends I know of, the Xen backend and the libtpms-based backend, will likely only be available for these targets, at least initially. The list can be easily extend. I am trying to prevent that one will end up with support for a frontend but no available backend. Signed-off-by: Stefan Berger Index:qemu/Makefile.target =================================================================== --- Makefile.target | 10 ++++++++++ configure | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+) Index: qemu-git/Makefile.target =================================================================== --- qemu-git.orig/Makefile.target +++ qemu-git/Makefile.target @@ -290,6 +293,13 @@ obj-sparc-y += cs4231.o eccmemctl.o sbi. # GRLIB obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o + +ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),i386 x86_64)) + +obj-i386-$(CONFIG_TPM) += tpm_tis.o qemu-thread.o + +endif + endif obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o Index: qemu-git/configure =================================================================== --- qemu-git.orig/configure +++ qemu-git/configure @@ -174,6 +174,7 @@ trace_backend="nop" trace_file="trace" spice="" rbd="" +tpm="no" # parse CC options first for opt do @@ -703,6 +704,8 @@ for opt do ;; --kerneldir=*) kerneldir="$optarg" ;; + --enable-tpm) tpm="yes" + ;; --with-pkgversion=*) pkgversion=" ($optarg)" ;; --disable-docs) docs="no" @@ -914,6 +917,7 @@ echo " Default echo " --disable-spice disable spice" echo " --enable-spice enable spice" echo " --enable-rbd enable building the rados block device (rbd)" +echo " --enable-tpm enables an emulated TPM" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -2525,6 +2529,7 @@ echo "Trace output file $trace_file- Your SDL version is too old - please upgrade to have SDL support" @@ -3303,6 +3308,21 @@ if test "$gprof" = "yes" ; then fi fi +if test "$tpm" = "yes"; then + has_tpm=0 + if test "$target_softmmu" = "yes" ; then + case "$TARGET_BASE_ARCH" in + i386) + has_tpm=1 + ;; + esac + fi + + if test "$has_tpm" = "1"; 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