[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v1 02/12] backends: Add TPM files into their own directory
From: |
Stefan Berger |
Subject: |
[PULL v1 02/12] backends: Add TPM files into their own directory |
Date: |
Tue, 23 Jun 2020 07:41:04 -0400 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
As we will have various TPM backend files, it is cleaner
to use a single directory.
Suggested-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-3-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
MAINTAINERS | 2 +-
backends/Makefile.objs | 2 +-
backends/tpm/Makefile.objs | 1 +
backends/{tpm.c => tpm/tpm_backend.c} | 0
4 files changed, 3 insertions(+), 2 deletions(-)
create mode 100644 backends/tpm/Makefile.objs
rename backends/{tpm.c => tpm/tpm_backend.c} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 955cc8dd5c..60a183c117 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2395,7 +2395,7 @@ F: hw/tpm/*
F: include/hw/acpi/tpm.h
F: include/sysemu/tpm*
F: qapi/tpm.json
-F: backends/tpm.c
+F: backends/tpm/
F: tests/qtest/*tpm*
T: git https://github.com/stefanberger/qemu-tpm.git tpm-next
diff --git a/backends/Makefile.objs b/backends/Makefile.objs
index 28a847cd57..22d204cb48 100644
--- a/backends/Makefile.objs
+++ b/backends/Makefile.objs
@@ -1,7 +1,7 @@
common-obj-y += rng.o rng-egd.o rng-builtin.o
common-obj-$(CONFIG_POSIX) += rng-random.o
-common-obj-$(CONFIG_TPM) += tpm.o
+common-obj-$(CONFIG_TPM) += tpm/
common-obj-y += hostmem.o hostmem-ram.o
common-obj-$(CONFIG_POSIX) += hostmem-file.o
diff --git a/backends/tpm/Makefile.objs b/backends/tpm/Makefile.objs
new file mode 100644
index 0000000000..8cf5772824
--- /dev/null
+++ b/backends/tpm/Makefile.objs
@@ -0,0 +1 @@
+common-obj-y += tpm_backend.o
diff --git a/backends/tpm.c b/backends/tpm/tpm_backend.c
similarity index 100%
rename from backends/tpm.c
rename to backends/tpm/tpm_backend.c
--
2.24.1
- [PULL v1 00/12] Merge tpm 2020/06/23 v1, Stefan Berger, 2020/06/23
- [PULL v1 02/12] backends: Add TPM files into their own directory,
Stefan Berger <=
- [PULL v1 01/12] docs/specs/tpm: Correct header path name, Stefan Berger, 2020/06/23
- [PULL v1 05/12] hw/tpm: Include missing 'qemu/option.h' header, Stefan Berger, 2020/06/23
- [PULL v1 04/12] hw/tpm: Do not include 'qemu/osdep.h' in header, Stefan Berger, 2020/06/23
- [PULL v1 03/12] hw/tpm: Rename TPMDEV as TPM_BACKEND in Kconfig, Stefan Berger, 2020/06/23
- [PULL v1 06/12] hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to sources, Stefan Berger, 2020/06/23
- [PULL v1 09/12] hw/tpm: Move few declarations from 'tpm_util.h' to 'tpm_int.h', Stefan Berger, 2020/06/23
- [PULL v1 07/12] hw/tpm: Remove unnecessary 'tpm_int.h' header inclusion, Stefan Berger, 2020/06/23
- [PULL v1 08/12] hw/tpm: Make TRACE_TPM_UTIL_SHOW_BUFFER check local to tpm_util.c, Stefan Berger, 2020/06/23
- [PULL v1 10/12] hw/tpm: Move DEFINE_PROP_TPMBE() macro to 'tmp_prop.h' local header, Stefan Berger, 2020/06/23
- [PULL v1 11/12] hw/tpm: Make 'tpm_util.h' publicly accessible as "sysemu/tpm_util.h", Stefan Berger, 2020/06/23