Skip to content

NVMem: fix build issue when FILE_BACKED_NV is set to 0 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
bradlitterell merged 1 commit into from
Nov 15, 2024
Merged

NVMem: fix build issue when FILE_BACKED_NV is set to 0 #7

bradlitterell merged 1 commit into from
Nov 15, 2024

Conversation

@stefano-garzarella
Copy link
Contributor

@stefano-garzarella stefano-garzarella commented Nov 12, 2024 •
edited
Loading

If FILE_BACKED_NV is set to NO(0), the delete variable is unused, causing a compiler warning:

Platform/src/NVMem.c: In function ‘_plat__NVDisable’:
Platform/src/NVMem.c:185:9: error: unused variable ‘delete’ [-Werror=unused-variable]
  185 |     int delete = ((intptr_t)platParameter != 0)
      |         ^~~~~~
cc1: all warnings being treated as errors
make[2]: *** [Makefile:2674: Platform/src/libplatform_a-NVMem.o] Error 1

Use NOT_REFERENCED() to silence this warning.

stefano-garzarella added a commit to stefano-garzarella/svsm that referenced this pull request Nov 12, 2024
@stefano-garzarella
libtcgtpm: little hack to disable pthread check
ef16d0f 
The pthread library is only required for the simulator, but we
don't build it, so let's use this workaround to make the `cofigure`
happy and avoid checks that the pthread is available.

When the  TrustedComputingGroup/TPM#7 will be
merged we can revert this commit and call `./configure --disable-pthread`.

With this patch we can then avoid using our fork in Coconut and switch
to using the upstream version directly (in the next commit).

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
stefano-garzarella added a commit to stefano-garzarella/svsm that referenced this pull request Nov 12, 2024
@stefano-garzarella
libtcgtpm: set -Wno-error=unused-variable in TPM CFLAGS
b3566f4 
The next commit switches to TCG TPM, but there is a problem when the
`FILE_BACKED_NV` macro is set to `NO`. It produces the following compile
error because a variable is not used:

    Platform/src/NVMem.c: In function ‘_plat__NVDisable’:
    Platform/src/NVMem.c:185:9: error: unused variable ‘delete’ [-Werror=unused-variable]
      185 |     int delete = ((intptr_t)platParameter != 0)
          |         ^~~~~~
    cc1: all warnings being treated as errors
    make[2]: *** [Makefile:2674: Platform/src/libplatform_a-NVMem.o] Error 1

This commit can be reverted when the following PR will be merged:
TrustedComputingGroup/TPM#7

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
@stefano-garzarella stefano-garzarella mentioned this pull request Nov 12, 2024
Merged
bradlitterell
bradlitterell requested changes Nov 12, 2024
View reviewed changes
TPMCmd/Platform/src/NVMem.c Outdated
#if FILE_BACKED_NV
if(NULL != s_NvFile)
{
int delete = ((intptr_t)platParameter != 0)
Copy link
Member

@bradlitterell bradlitterell Nov 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would rather leave the interpretation of the parameter (the check and cast to boolean) outside the #if because I don't want the meaning of the parameter to depend upon the #ifdef. Instead just add a reference to the variable in a #else (or immediately after calculating it), to silence the warning.

Copy link
Contributor Author

@stefano-garzarella stefano-garzarella Nov 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see.

I'll add NOT_REFERENCED(delete) immediately after calculating it.

stefano-garzarella added a commit to stefano-garzarella/svsm that referenced this pull request Nov 13, 2024
@stefano-garzarella
libtcgtpm: little hack to disable pthread check
af795a6 
The pthread library is only required for the simulator, but we
don't build it, so let's use this workaround to make the `cofigure`
happy and avoid checks that the pthread is available.

When the  TrustedComputingGroup/TPM#7 will be
merged we can revert this commit and call `./configure --disable-pthread`.

With this patch we can then avoid using our fork in Coconut and switch
to using the upstream version directly (in the next commit).

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
stefano-garzarella added a commit to stefano-garzarella/svsm that referenced this pull request Nov 13, 2024
@stefano-garzarella
libtcgtpm: set -Wno-error=unused-variable in TPM CFLAGS
5d2dca2 
The next commit switches to TCG TPM, but there is a problem when the
`FILE_BACKED_NV` macro is set to `NO`. It produces the following compile
error because a variable is not used:

    Platform/src/NVMem.c: In function ‘_plat__NVDisable’:
    Platform/src/NVMem.c:185:9: error: unused variable ‘delete’ [-Werror=unused-variable]
      185 |     int delete = ((intptr_t)platParameter != 0)
          |         ^~~~~~
    cc1: all warnings being treated as errors
    make[2]: *** [Makefile:2674: Platform/src/libplatform_a-NVMem.o] Error 1

This commit can be reverted when the following PR will be merged:
TrustedComputingGroup/TPM#7

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
@stefano-garzarella
NVMem: fix build issue when FILE_BACKED_NV is set to 0
3f06329 
If FILE_BACKED_NV is set to NO(0), the `delete` variable is unused,
causing a compiler warning:

    Platform/src/NVMem.c: In function ‘_plat__NVDisable’:
    Platform/src/NVMem.c:185:9: error: unused variable ‘delete’ [-Werror=unused-variable]
      185 |     int delete = ((intptr_t)platParameter != 0)
          |         ^~~~~~
    cc1: all warnings being treated as errors
    make[2]: *** [Makefile:2674: Platform/src/libplatform_a-NVMem.o] Error 1

Use NOT_REFERENCED() to silence this warning.

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
@stefano-garzarella
Copy link
Contributor Author

stefano-garzarella commented Nov 13, 2024

v2:

  • used NOT_REFERENCED() instead of moving the declaration in the #if [@bradlitterell]

bradlitterell
bradlitterell approved these changes Nov 15, 2024
View reviewed changes
Copy link
Member

@bradlitterell bradlitterell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thank you!

@bradlitterell bradlitterell merged commit f490f00 into TrustedComputingGroup:main Nov 15, 2024
stefano-garzarella added a commit to stefano-garzarella/svsm that referenced this pull request Nov 18, 2024
@stefano-garzarella
libtcgtpm: little hack to disable pthread check
5b99b1e 
The pthread library is only required for the simulator, but we
don't build it, so let's use this workaround to make the `configure`
happy and avoid checks that the pthread is available.

When the  TrustedComputingGroup/TPM#7 will be
merged we can revert this commit and call `./configure --disable-pthread`.

With this patch we can then avoid using our fork in Coconut and switch
to using the upstream version directly (in the next commit).

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
stefano-garzarella added a commit to stefano-garzarella/svsm that referenced this pull request Nov 18, 2024
@stefano-garzarella
libtcgtpm: set -Wno-error=unused-variable in TPM CFLAGS
26e22e9 
The next commit switches to TCG TPM, but there is a problem when the
`FILE_BACKED_NV` macro is set to `NO`. It produces the following compile
error because a variable is not used:

    Platform/src/NVMem.c: In function ‘_plat__NVDisable’:
    Platform/src/NVMem.c:185:9: error: unused variable ‘delete’ [-Werror=unused-variable]
      185 |     int delete = ((intptr_t)platParameter != 0)
          |         ^~~~~~
    cc1: all warnings being treated as errors
    make[2]: *** [Makefile:2674: Platform/src/libplatform_a-NVMem.o] Error 1

This commit can be reverted when the following PR will be merged:
TrustedComputingGroup/TPM#7

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
stefano-garzarella added a commit to stefano-garzarella/svsm that referenced this pull request Jun 4, 2025
@stefano-garzarella
libtcgtpm: use --disable-pthread to skip pthread checks
a9281b7 
The pthread library is only required by the TPM simulator, which we
don't build (we need only the library). Since libcrt doesn't support
pthreads, and the upstream now supports --disable-pthread
(TrustedComputingGroup/TPM#7), we can safely
disable pthread support at configure time.

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
stefano-garzarella added a commit to stefano-garzarella/svsm that referenced this pull request Jun 4, 2025
@stefano-garzarella
Revert "libtcgtpm: little hack to disable pthread check"
e8041c2 
This reverts commit 5b99b1e.

TrustedComputingGroup/TPM#7 is now merged,
so we can safely drop this workaround, since we disabled pthread
check in the previous commit.

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bradlitterell bradlitterell bradlitterell approved these changes

@chrisfenner chrisfenner Awaiting requested review from chrisfenner

@amycnelson amycnelson Awaiting requested review from amycnelson

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@stefano-garzarella @bradlitterell