File xen.84a37d24a9e962e9c2fa8eb4671ea60c0958157d.patch of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File xen.84a37d24a9e962e9c2fa8eb4671ea60c0958157d.patch of Package xen

From: Olaf Hering <olaf@aepfle.de>
Date: Thu, 14 Jan 2021 13:03:23 +0100
Subject: 84a37d24a9e962e9c2fa8eb4671ea60c0958157d

stubdom: fix tpm_version

It is just a declaration, not a variable.

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(-)

--- a/stubdom/vtpmmgr/vtpmmgr.h
+++ b/stubdom/vtpmmgr/vtpmmgr.h
@@ -44,25 +44,25 @@
 #include "uuid.h"
 #include "tcg.h"
 #include "vtpm_manager.h"
 #include "tpm2_types.h"
 
 #define TPM2_EXTRA_OPT "tpm2=1"
 #define RSA_KEY_SIZE 0x0800
 #define RSA_CIPHER_SIZE (RSA_KEY_SIZE / 8)
 
 enum {
     TPM1_HARDWARE = 1,
     TPM2_HARDWARE,
-} tpm_version;
+};
 
 struct tpm_hardware_version {
     int hw_version;
 };
 
 extern struct tpm_hardware_version hardware_version;
 
 struct vtpm_globals {
    int tpm_fd;
    TPM_AUTH_SESSION    oiap;                // OIAP session for storageKey
 
    TPM_AUTHDATA        owner_auth;

Places

File xen.84a37d24a9e962e9c2fa8eb4671ea60c0958157d.patch of Package xen

Places