[PULL,v1,02/12] backends: Add TPM files into their own directory

Commit Message

Stefan Berger June 23, 2020, 11:41 a.m. UTC

From: Philippe Mathieu-Daudé <[e-mail]>

As we will have various TPM backend files, it is cleaner
to use a single directory.

Suggested-by: Stefan Berger <[e-mail]>
Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
Reviewed-by: Stefan Berger <[e-mail]>
Message-id: [e-mail]
Signed-off-by: Stefan Berger <[e-mail]>
---
 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%)

Patch

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