From patchwork Mon Apr 15 13:19:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 236607 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 7FB0E2C00E6 for ; Mon, 15 Apr 2013 23:29:13 +1000 (EST) Received: from localhost ([::1]:58716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjT5-0001TW-NP for incoming@patchwork.ozlabs.org; Mon, 15 Apr 2013 09:29:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjS7-0000AU-5J for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:28:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URjS3-00052t-PZ for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:28:11 -0400 Received: from mail-bk0-x22e.google.com ([2a00:1450:4008:c01::22e]:44085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjK6-0001XH-DT for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:19:54 -0400 Received: by mail-bk0-f46.google.com with SMTP id je9so2380404bkc.33 for ; Mon, 15 Apr 2013 06:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references:mime-version:content-type :content-transfer-encoding; bh=TIBHPq2W01Tw4q6a0uH0oDTUKuHoj1jL3nDe7RtS92I=; b=cqcLyETBagY2OBSnxrN8fL4EfY/2mcL42zTBhe6vb4lIVGCHtEqHVXE9U/kbjXw5x7 Vbn30YIfc7uj3YHcssDLypzqnLrUXb8657Cplhu6ztfzQvhfHcATbb/5dsehoka8anqj RubzcQNMbbOPxdaYVEXLklJYak+ejMb5VkQCEudBVYUIM48yzsf3NmVzrBU8xHGIURnI MUBlfzx50pd0zHkN0z3CsUjT84IGH1I5SOyPW6bQmuSZXyMlwF0scvFhIQ0VIqytUhmH JuBlEyQqqTrw11cGrXH1KD3l3vj7d4vnyzS/WhO0tlunzhylOl2PwX+eF1AVdssADDr9 2Chg== X-Received: by 10.204.61.71 with SMTP id s7mr736239bkh.74.1366031993599; Mon, 15 Apr 2013 06:19:53 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id js7sm8527139bkb.9.2013.04.15.06.19.51 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 15 Apr 2013 06:19:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 15 Apr 2013 15:19:28 +0200 Message-Id: <1366031973-7718-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1366031973-7718-1-git-send-email-pbonzini@redhat.com> References: <1366031973-7718-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4008:c01::22e Subject: [Qemu-devel] [PATCH 07/12] configure: fix TPM logic 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 A non-native i386 or x86_64 emulator should not have TPM passthrough support, since the TPM is only present for those hosts. Reviewed-by: Andreas Färber Signed-off-by: Paolo Bonzini --- configure | 24 ++++++++++++++++++------ default-configs/i386-softmmu.mak | 3 +-- default-configs/x86_64-softmmu.mak | 3 +-- tpm/Makefile.objs | 4 +--- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 258c82a..1c1e369 100755 --- a/configure +++ b/configure @@ -2337,6 +2337,15 @@ EOF fi ########################################## +# TPM passthrough is only on x86 Linux + +if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then + tpm_passthrough=$tpm +else + tpm_passthrough=no +fi + +########################################## # adjust virtio-blk-data-plane based on linux-aio if test "$virtio_blk_data_plane" = "yes" -a \ @@ -3436,6 +3445,7 @@ echo "virtio-blk-data-plane $virtio_blk_data_plane" echo "gcov $gcov_tool" echo "gcov enabled $gcov" 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" @@ -3811,6 +3821,14 @@ bsd) ;; esac +# TPM passthrough support? +if test "$tpm" = "yes"; then + echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak + if test "$tpm_passthrough" = "yes"; then + echo "CONFIG_TPM_PASSTHROUGH=y" >> $config_host_mak + fi +fi + # use default implementation for tracing backend-specific routines trace_default=yes echo "TRACE_BACKEND=$trace_backend" >> $config_host_mak @@ -4338,12 +4356,6 @@ 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/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 6d9d364..368a776 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -27,8 +27,7 @@ CONFIG_HPET=y CONFIG_APPLESMC=y CONFIG_I8259=y CONFIG_PFLASH_CFI01=y -CONFIG_TPM_TIS=y -CONFIG_TPM_PASSTHROUGH=y +CONFIG_TPM_TIS=$(CONFIG_TPM) CONFIG_PCI_HOTPLUG=y CONFIG_MC146818RTC=y CONFIG_PAM=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 3b06310..2711b83 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -27,8 +27,7 @@ CONFIG_HPET=y CONFIG_APPLESMC=y CONFIG_I8259=y CONFIG_PFLASH_CFI01=y -CONFIG_TPM_TIS=y -CONFIG_TPM_PASSTHROUGH=y +CONFIG_TPM_TIS=$(CONFIG_TPM) CONFIG_PCI_HOTPLUG=y CONFIG_MC146818RTC=y CONFIG_PAM=y diff --git a/tpm/Makefile.objs b/tpm/Makefile.objs index 8676824..366e4a7 100644 --- a/tpm/Makefile.objs +++ b/tpm/Makefile.objs @@ -1,6 +1,4 @@ common-obj-y = tpm.o -ifeq ($(CONFIG_TPM),y) -common-obj-y += tpm_backend.o +common-obj-$(CONFIG_TPM) += tpm_backend.o common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o -endif