From patchwork Fri May 6 17:32:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 94409 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 650FA1007D1 for ; Sat, 7 May 2011 03:33:17 +1000 (EST) Received: from localhost ([::1]:55109 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QIOtt-00067m-G0 for incoming@patchwork.ozlabs.org; Fri, 06 May 2011 13:33:13 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QIOtf-00067b-00 for qemu-devel@nongnu.org; Fri, 06 May 2011 13:32:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QIOtd-0003nO-EP for qemu-devel@nongnu.org; Fri, 06 May 2011 13:32:58 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:54364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QIOtd-0003mk-9L for qemu-devel@nongnu.org; Fri, 06 May 2011 13:32:57 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e34.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p46HKTNr023705 for ; Fri, 6 May 2011 11:20:29 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id p46HWlB9054542 for ; Fri, 6 May 2011 11:32:49 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p46BWJlU004387 for ; Fri, 6 May 2011 05:32:20 -0600 Received: from localhost.localdomain (d941e-10.watson.ibm.com [9.59.241.154]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p46BWJ0r004315 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 6 May 2011 05:32:19 -0600 Received: from localhost.localdomain (d941e-10 [127.0.0.1]) by localhost.localdomain (8.14.4/8.14.3) with ESMTP id p46HWjfn001326; Fri, 6 May 2011 13:32:45 -0400 Received: (from root@localhost) by localhost.localdomain (8.14.4/8.14.4/Submit) id p46HWj5M001325; Fri, 6 May 2011 13:32:45 -0400 Message-Id: <20110506173245.713081858@linux.vnet.ibm.com> User-Agent: quilt/0.48-1 Date: Fri, 06 May 2011 13:32:28 -0400 From: Stefan Berger To: stefanb@linux.vnet.ibm.com, qemu-devel@nongnu.org References: <20110506173224.278066589@linux.vnet.ibm.com> Content-Disposition: inline; filename=qemu_tpm_build.diff X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.110.152 Cc: andreas.niederl@iaik.tugraz.at, serge@hallyn.com Subject: [Qemu-devel] [PATCH V4 04/10] Add tpm_tis driver to build process 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 The TPM interface (tpm_tis) needs to be explicitly enabled via ./configure --enable-tpm. This patch also restricts 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. v3: - fixed and moved hunks in Makefile.target into right place Signed-off-by: Stefan Berger Index:qemu/Makefile.target =================================================================== --- Makefile.target | 1 + configure | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) Index: qemu-git/Makefile.target =================================================================== --- qemu-git.orig/Makefile.target +++ qemu-git/Makefile.target @@ -226,6 +226,7 @@ obj-i386-y += device-hotplug.o pci-hotpl obj-i386-y += debugcon.o multiboot.o obj-i386-y += pc_piix.o kvmclock.o obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o +obj-i386-$(CONFIG_TPM) += tpm_tis.o # shared objects obj-ppc-y = ppc.o Index: qemu-git/configure =================================================================== --- qemu-git.orig/configure +++ qemu-git/configure @@ -178,6 +178,7 @@ rbd="" smartcard="" smartcard_nss="" opengl="" +tpm="no" # parse CC options first for opt do @@ -713,6 +714,8 @@ for opt do ;; --kerneldir=*) kerneldir="$optarg" ;; + --enable-tpm) tpm="yes" + ;; --with-pkgversion=*) pkgversion=" ($optarg)" ;; --disable-docs) docs="no" @@ -945,6 +948,7 @@ echo " --disable-smartcard disable echo " --enable-smartcard enable smartcard support" echo " --disable-smartcard-nss disable smartcard nss support" echo " --enable-smartcard-nss enable smartcard nss support" +echo " --enable-tpm enables an emulated TPM" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -2623,6 +2627,7 @@ echo "rbd support $rbd" echo "xfsctl support $xfs" echo "nss used $smartcard_nss" echo "OpenGL support $opengl" +echo "TPM support $tpm" if test $sdl_too_old = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -3433,6 +3438,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