From patchwork Thu Apr 11 16:10:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 235842 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 BD9092C00B9 for ; Fri, 12 Apr 2013 03:34:08 +1000 (EST) Received: from localhost ([::1]:48163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQK7D-0002Oz-L4 for incoming@patchwork.ozlabs.org; Thu, 11 Apr 2013 12:12:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQK5Q-00010x-Ld for qemu-devel@nongnu.org; Thu, 11 Apr 2013 12:10:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQK5L-0003p8-34 for qemu-devel@nongnu.org; Thu, 11 Apr 2013 12:10:56 -0400 Received: from mail-bk0-x231.google.com ([2a00:1450:4008:c01::231]:39527) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQK5K-0003op-Go for qemu-devel@nongnu.org; Thu, 11 Apr 2013 12:10:50 -0400 Received: by mail-bk0-f49.google.com with SMTP id w12so921363bku.8 for ; Thu, 11 Apr 2013 09:10:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=AHohVsTHy211LlHL6x5XgMQ8FxAWl2lNGJXlaSk0uvY=; b=L1tft8TZVrObmLKLeXFobNxfjOOl6RduAjEiBmKBCM4LSW+T3hMcpILevPCmZxkCIi N8FwhkiTakGq/EFRhPTgqLgT1EVSSeStf8Qw56R0JSbSRfGT99rm8ufoAoukS+nA/dOS PDvKny9lOMzOA0CHmXRYf8TdATe3D0jojFQkzme6hLNY/cgeBnfJqlQe35pXpUHRGzCB CGE6TNpzk9l5DM9IvgD8PsNaKorMLoSpZcmUzGZHFhpgW383g7AY94XYE1KQhT0/jqmh v5nmCXVxLB5I+0+Vn6D67hrbWvEeYpmTSmKucGHmOThT/aa/+h7rsPa9o9IPpWD6mvKK rhbQ== X-Received: by 10.205.129.16 with SMTP id hg16mr2848735bkc.11.1365696649660; Thu, 11 Apr 2013 09:10:49 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id r17sm2225568bkw.21.2013.04.11.09.10.47 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 11 Apr 2013 09:10:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2013 18:10:26 +0200 Message-Id: <1365696633-30727-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365696633-30727-1-git-send-email-pbonzini@redhat.com> References: <1365696633-30727-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4008:c01::231 Cc: peter.maydell@linaro.org, mst@redhat.com Subject: [Qemu-devel] [PATCH 05/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. 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 ee07f07..7fedb5a 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" @@ -3814,6 +3824,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 @@ -4341,12 +4359,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