From patchwork Tue Oct 11 17:32:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 119033 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 8D09FB6F18 for ; Wed, 12 Oct 2011 04:40:19 +1100 (EST) Received: from localhost ([::1]:39632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDgJM-0004Oa-VE for incoming@patchwork.ozlabs.org; Tue, 11 Oct 2011 13:40:16 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDgJG-0004Nx-I6 for qemu-devel@nongnu.org; Tue, 11 Oct 2011 13:40:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RDgJF-0002bo-Dw for qemu-devel@nongnu.org; Tue, 11 Oct 2011 13:40:10 -0400 Received: from e3.ny.us.ibm.com ([32.97.182.143]:43201) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDgJF-0002bi-BM for qemu-devel@nongnu.org; Tue, 11 Oct 2011 13:40:09 -0400 Received: from /spool/local by us.ibm.com with XMail ESMTP for from ; Tue, 11 Oct 2011 13:34:20 -0400 Received: from d01relay04.pok.ibm.com ([9.56.227.236]) by us.ibm.com ([192.168.1.103]) with XMail ESMTP; Tue, 11 Oct 2011 13:33:27 -0400 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9BHXCdu073904 for ; Tue, 11 Oct 2011 13:33:13 -0400 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 p9BHX7mT009320 for ; Tue, 11 Oct 2011 11:33:08 -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 p9BHX7MK009259 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 11 Oct 2011 11:33:07 -0600 Received: from localhost.localdomain (d941e-10 [127.0.0.1]) by localhost.localdomain (8.14.4/8.14.3) with ESMTP id p9BHX6YW027792; Tue, 11 Oct 2011 13:33:06 -0400 Received: (from root@localhost) by localhost.localdomain (8.14.4/8.14.4/Submit) id p9BHX6IM027791; Tue, 11 Oct 2011 13:33:06 -0400 Message-Id: <20111011173306.643535119@linux.vnet.ibm.com> User-Agent: quilt/0.48-1 Date: Tue, 11 Oct 2011 13:32:22 -0400 From: Stefan Berger To: stefanb@linux.vnet.ibm.com, qemu-devel@nongnu.org References: <20111011173216.247822737@linux.vnet.ibm.com> Content-Disposition: inline; filename=qemu_tpm_pt_config_opt.diff x-cbid: 11101117-8974-0000-0000-000000C7352C X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.182.143 Cc: mst@redhat.com, andreas.niederl@iaik.tugraz.at, serge@hallyn.com Subject: [Qemu-devel] [PATCH V12 6/8] Introduce --enable-tpm-passthrough configure option 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 Introduce --enable-tpm-passthrough configure option. Signed-off-by: Stefan Berger --- configure | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) Index: qemu-git.pt/configure =================================================================== --- qemu-git.pt.orig/configure +++ qemu-git.pt/configure @@ -183,6 +183,7 @@ opengl="" zlib="yes" guest_agent="yes" tpm="no" +tpm_passthrough="no" # parse CC options first for opt do @@ -775,11 +776,20 @@ for opt do ;; --enable-tpm) tpm="yes" ;; + --enable-tpm-passthrough) tpm_passthrough="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac done +if test "$tpm" = "no" ; then + if test "$tpm_passthrough" = "yes"; then + echo "ERROR: --enable-tpm-passthrough requires --enable-tpm" + exit 1 + fi +fi + # # If cpu ~= sparc and sparc_cpu hasn't been defined, plug in the right # QEMU_CFLAGS/LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for 64-bit) @@ -1058,6 +1068,7 @@ echo " --enable-usb-redir enable echo " --disable-guest-agent disable building of the QEMU Guest Agent" echo " --enable-guest-agent enable building of the QEMU Guest Agent" echo " --enable-tpm enable TPM support" +echo " --enable-tpm-passthrough enable TPM passthrough driver" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -2725,6 +2736,7 @@ echo "usb net redir $usb_redir" echo "OpenGL support $opengl" echo "build guest agent $guest_agent" echo "TPM support $tpm" +echo "TPM passthrough $tpm_passthrough" if test "$sdl_too_old" = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -3575,7 +3587,9 @@ fi if test "$tpm" = "yes"; then if test "$target_softmmu" = "yes" ; then if test "$linux" = "yes" ; then - echo "CONFIG_TPM_PASSTHROUGH=y" >> $config_target_mak + if test "$tpm_passthrough" = "yes" ; then + echo "CONFIG_TPM_PASSTHROUGH=y" >> $config_target_mak + fi fi echo "CONFIG_TPM=y" >> $config_host_mak fi