Skip to contentSkip to conversation

stubdom: remove tpm_version from vtpmmgr

PATCH In review Olaf Hering 2 participants 2 messages Sep 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 stubdom: remove tpm_version from vtpmmgr

Giving an enum a name turns it into a variable, which is bad when it is done in a header file that is consumbed by multiple files.

ld: /home/abuild/rpmbuild/BUILD/xen-4.14.20200616T103126.3625b04991/non-dbg/stubdom/vtpmmgr/vtpmmgr.a(vtpm_cmd_handler.o):(.bss+0x0): multiple definition of `tpm_version'; /home/abuild/rpmbuild/BUILD/xen-4.14.20200616T103126.3625b04991/non-dbg/stubdom/vtpmmgr/vtpmmgr.a(vtpmmgr.o):(.bss+0x0): first defined here

---
 stubdom/vtpmmgr/vtpmmgr.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
stubdom/vtpmmgr/vtpmmgr.h +1 -1
index 2e6f8de9e4..f40ca9fd67 100644
@@ -53,7 +53,7 @@
 enum {
     TPM1_HARDWARE = 1,
     TPM2_HARDWARE,
-} tpm_version;
+};
 
 struct tpm_hardware_version {
     int hw_version;
Reviewed-by on v2 1/1
#1 lore raw

Olaf Hering, le mer. 09 sept. 2020 10:58:28 +0200, a ecrit:

Quoted 6 lines

Giving an enum a name turns it into a variable, which is bad when it is done in a header file that is consumbed by multiple files.

ld: /home/abuild/rpmbuild/BUILD/xen-4.14.20200616T103126.3625b04991/non-dbg/stubdom/vtpmmgr/vtpmmgr.a(vtpm_cmd_handler.o):(.bss+0x0): multiple definition of `tpm_version'; /home/abuild/rpmbuild/BUILD/xen-4.14.20200616T103126.3625b04991/non-dbg/stubdom/vtpmmgr/vtpmmgr.a(vtpmmgr.o):(.bss+0x0): first defined here

Quoted 18 lines
---
 stubdom/vtpmmgr/vtpmmgr.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
stubdom/vtpmmgr/vtpmmgr.h +1 -1
index 2e6f8de9e4..f40ca9fd67 100644
@@ -53,7 +53,7 @@
 enum {
     TPM1_HARDWARE = 1,
     TPM2_HARDWARE,
-} tpm_version;
+};
 
 struct tpm_hardware_version {
     int hw_version;