| Message ID | 20200909085829.29393-1-olaf@aepfle.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] stubdom: remove tpm_version from vtpmmgr | expand |
Olaf Hering, le mer. 09 sept. 2020 10:58:28 +0200, a ecrit: > 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 > > Signed-off-by: Olaf Hering <olaf@aepfle.de> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > --- > stubdom/vtpmmgr/vtpmmgr.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/stubdom/vtpmmgr/vtpmmgr.h b/stubdom/vtpmmgr/vtpmmgr.h > index 2e6f8de9e4..f40ca9fd67 100644 > --- a/stubdom/vtpmmgr/vtpmmgr.h > +++ b/stubdom/vtpmmgr/vtpmmgr.h > @@ -53,7 +53,7 @@ > enum { > TPM1_HARDWARE = 1, > TPM2_HARDWARE, > -} tpm_version; > +}; > > struct tpm_hardware_version { > int hw_version; >
diff --git a/stubdom/vtpmmgr/vtpmmgr.h b/stubdom/vtpmmgr/vtpmmgr.h index 2e6f8de9e4..f40ca9fd67 100644 --- a/stubdom/vtpmmgr/vtpmmgr.h +++ b/stubdom/vtpmmgr/vtpmmgr.h @@ -53,7 +53,7 @@ enum { TPM1_HARDWARE = 1, TPM2_HARDWARE, -} tpm_version; +}; struct tpm_hardware_version { int hw_version;
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 Signed-off-by: Olaf Hering <olaf@aepfle.de> --- stubdom/vtpmmgr/vtpmmgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)