[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/28] TPM: fix build with tpm disabled
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 04/28] TPM: fix build with tpm disabled |
Date: |
Thu, 4 Jun 2015 13:10:23 +0200 |
From: Juan Quintela <address@hidden>
Failure was included on commit
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/sysemu/tpm.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h
index c143890..c8afa17 100644
--- a/include/sysemu/tpm.h
+++ b/include/sysemu/tpm.h
@@ -32,11 +32,13 @@ TPMVersion tpm_tis_get_tpm_version(Object *obj);
static inline TPMVersion tpm_get_version(void)
{
+#ifdef CONFIG_TPM
Object *obj = object_resolve_path_type("", TYPE_TPM_TIS, NULL);
if (obj) {
return tpm_tis_get_tpm_version(obj);
}
+#endif
return TPM_VERSION_UNSPEC;
}
--
MST
- [Qemu-devel] [PULL 00/28] pc, acpi, virtio, tpm, Michael S. Tsirkin, 2015/06/04
- [Qemu-devel] [PULL 01/28] acpi: add missing ssdt, Michael S. Tsirkin, 2015/06/04
- [Qemu-devel] [PULL 02/28] hw/q35: fix floppy controller definition in ich9, Michael S. Tsirkin, 2015/06/04
- [Qemu-devel] [PULL 03/28] virtio-pci: don't try to mask or unmask vqs without notifiers, Michael S. Tsirkin, 2015/06/04
- [Qemu-devel] [PULL 04/28] TPM: fix build with tpm disabled,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 05/28] virtio: 64bit features fixups., Michael S. Tsirkin, 2015/06/04
- [Qemu-devel] [PULL 06/28] acpi: add acpi_send_gpe_event() to rise sci for hotplug, Michael S. Tsirkin, 2015/06/04
- [Qemu-devel] [PULL 07/28] acpi: add implementation of aml_while() term, Michael S. Tsirkin, 2015/06/04
- [Qemu-devel] [PULL 08/28] hw/pci: made pci_bus_is_root a PCIBusClass method, Michael S. Tsirkin, 2015/06/04
- [Qemu-devel] [PULL 09/28] hw/pci: made pci_bus_num a PCIBusClass method, Michael S. Tsirkin, 2015/06/04
- [Qemu-devel] [PULL 10/28] hw/i386: query only for q35/pc when looking for pci host bridge, Michael S. Tsirkin, 2015/06/04
- [Qemu-devel] [PULL 11/28] hw/pci: extend PCI config access to support devices behind PXB, Michael S. Tsirkin, 2015/06/04
- [Qemu-devel] [PULL 12/28] hw/acpi: add support for i440fx 'snooping' root busses, Michael S. Tsirkin, 2015/06/04
- [Qemu-devel] [PULL 13/28] hw/apci: add _PRT method for extra PCI root busses, Michael S. Tsirkin, 2015/06/04
- [Qemu-devel] [PULL 14/28] hw/acpi: add _CRS method for extra root busses, Michael S. Tsirkin, 2015/06/04