diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-03-18 16:37:50 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-15 15:16:41 +0200 |
| commit | 3b8acc11d3f60792f9f716f2a93c258e729af980 (patch) | |
| tree | 712b31622010d0abe8d064e95b426e6cb5872958 /default-configs | |
| parent | e53339cf7cf90cf5c7a6bca64d0e7c0956f53a66 (diff) | |
| download | qemu-3b8acc11d3f60792f9f716f2a93c258e729af980.tar.gz | |
configure: fix TPM logic
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 <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'default-configs')
| -rw-r--r-- | default-configs/i386-softmmu.mak | 3 | ||||
| -rw-r--r-- | default-configs/x86_64-softmmu.mak | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 6d9d364ff8..368a776166 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 3b063101cf..2711b83bf0 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 |