[v2] Add TPM emulator <source file=''/>

[PATCH v2 1/4] util: check swtpm nvram-backend-dir capability

Posted by marcandre.lureau@redhat.com 1 year, 5 months ago

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 src/util/virtpm.c | 1 +
 src/util/virtpm.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/util/virtpm.c b/src/util/virtpm.c
index 81fd6166cf..84ed2f0edd 100644
--- a/src/util/virtpm.c
+++ b/src/util/virtpm.c
@@ -40,6 +40,7 @@ VIR_ENUM_IMPL(virTPMSwtpmFeature,
               VIR_TPM_SWTPM_FEATURE_LAST,
               "cmdarg-pwd-fd",
               "cmdarg-migration",
+              "nvram-backend-dir",
 );
 
 VIR_ENUM_IMPL(virTPMSwtpmSetupFeature,
diff --git a/src/util/virtpm.h b/src/util/virtpm.h
index fb330effa8..088bb2f667 100644
--- a/src/util/virtpm.h
+++ b/src/util/virtpm.h
@@ -31,6 +31,7 @@ bool virTPMHasSwtpm(void);
 typedef enum {
     VIR_TPM_SWTPM_FEATURE_CMDARG_PWD_FD,
     VIR_TPM_SWTPM_FEATURE_CMDARG_MIGRATION,
+    VIR_TPM_SWTPM_FEATURE_NVRAM_BACKEND_DIR,
 
     VIR_TPM_SWTPM_FEATURE_LAST
 } virTPMSwtpmFeature;
-- 
2.45.2.827.g557ae147e6

Re: [PATCH v2 1/4] util: check swtpm nvram-backend-dir capability

Posted by Martin Kletzander 1 year, 4 months ago

On Tue, Sep 10, 2024 at 11:05:57AM +0400, marcandre.lureau@redhat.com wrote:
>From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
>Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>---
> src/util/virtpm.c | 1 +
> src/util/virtpm.h | 1 +
> 2 files changed, 2 insertions(+)
>
>diff --git a/src/util/virtpm.c b/src/util/virtpm.c
>index 81fd6166cf..84ed2f0edd 100644
>--- a/src/util/virtpm.c
>+++ b/src/util/virtpm.c
>@@ -40,6 +40,7 @@ VIR_ENUM_IMPL(virTPMSwtpmFeature,
>               VIR_TPM_SWTPM_FEATURE_LAST,
>               "cmdarg-pwd-fd",
>               "cmdarg-migration",
>+              "nvram-backend-dir",

We should be using both nvram-backend-dir and nvram-backend-file.  Even
if they were added in the same release and it does not look like it
makes sense it is there for a reason and it won't hurt, it will be more
future-proof.

> );
>
> VIR_ENUM_IMPL(virTPMSwtpmSetupFeature,
>diff --git a/src/util/virtpm.h b/src/util/virtpm.h
>index fb330effa8..088bb2f667 100644
>--- a/src/util/virtpm.h
>+++ b/src/util/virtpm.h
>@@ -31,6 +31,7 @@ bool virTPMHasSwtpm(void);
> typedef enum {
>     VIR_TPM_SWTPM_FEATURE_CMDARG_PWD_FD,
>     VIR_TPM_SWTPM_FEATURE_CMDARG_MIGRATION,
>+    VIR_TPM_SWTPM_FEATURE_NVRAM_BACKEND_DIR,
>
>     VIR_TPM_SWTPM_FEATURE_LAST
> } virTPMSwtpmFeature;
>-- 
>2.45.2.827.g557ae147e6
>

Re: [PATCH v2 1/4] util: check swtpm nvram-backend-dir capability

Posted by Marc-André Lureau 1 year, 4 months ago

Hi

On Wed, Oct 2, 2024 at 11:01 AM Martin Kletzander <mkletzan@redhat.com> wrote:
>
> On Tue, Sep 10, 2024 at 11:05:57AM +0400, marcandre.lureau@redhat.com wrote:
> >From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> >Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> >---
> > src/util/virtpm.c | 1 +
> > src/util/virtpm.h | 1 +
> > 2 files changed, 2 insertions(+)
> >
> >diff --git a/src/util/virtpm.c b/src/util/virtpm.c
> >index 81fd6166cf..84ed2f0edd 100644
> >--- a/src/util/virtpm.c
> >+++ b/src/util/virtpm.c
> >@@ -40,6 +40,7 @@ VIR_ENUM_IMPL(virTPMSwtpmFeature,
> >               VIR_TPM_SWTPM_FEATURE_LAST,
> >               "cmdarg-pwd-fd",
> >               "cmdarg-migration",
> >+              "nvram-backend-dir",
>
> We should be using both nvram-backend-dir and nvram-backend-file.  Even
> if they were added in the same release and it does not look like it
> makes sense it is there for a reason and it won't hurt, it will be more
> future-proof.
>

ok, done

> > );
> >
> > VIR_ENUM_IMPL(virTPMSwtpmSetupFeature,
> >diff --git a/src/util/virtpm.h b/src/util/virtpm.h
> >index fb330effa8..088bb2f667 100644
> >--- a/src/util/virtpm.h
> >+++ b/src/util/virtpm.h
> >@@ -31,6 +31,7 @@ bool virTPMHasSwtpm(void);
> > typedef enum {
> >     VIR_TPM_SWTPM_FEATURE_CMDARG_PWD_FD,
> >     VIR_TPM_SWTPM_FEATURE_CMDARG_MIGRATION,
> >+    VIR_TPM_SWTPM_FEATURE_NVRAM_BACKEND_DIR,
> >
> >     VIR_TPM_SWTPM_FEATURE_LAST
> > } virTPMSwtpmFeature;
> >--
> >2.45.2.827.g557ae147e6
> >

Re: [PATCH v2 1/4] util: check swtpm nvram-backend-dir capability

Posted by Stefan Berger 1 year, 4 months ago


On 9/10/24 3:05 AM, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>

> ---
>   src/util/virtpm.c | 1 +
>   src/util/virtpm.h | 1 +
>   2 files changed, 2 insertions(+)
> 
> diff --git a/src/util/virtpm.c b/src/util/virtpm.c
> index 81fd6166cf..84ed2f0edd 100644
> --- a/src/util/virtpm.c
> +++ b/src/util/virtpm.c
> @@ -40,6 +40,7 @@ VIR_ENUM_IMPL(virTPMSwtpmFeature,
>                 VIR_TPM_SWTPM_FEATURE_LAST,
>                 "cmdarg-pwd-fd",
>                 "cmdarg-migration",
> +              "nvram-backend-dir",
>   );
>   
>   VIR_ENUM_IMPL(virTPMSwtpmSetupFeature,
> diff --git a/src/util/virtpm.h b/src/util/virtpm.h
> index fb330effa8..088bb2f667 100644
> --- a/src/util/virtpm.h
> +++ b/src/util/virtpm.h
> @@ -31,6 +31,7 @@ bool virTPMHasSwtpm(void);
>   typedef enum {
>       VIR_TPM_SWTPM_FEATURE_CMDARG_PWD_FD,
>       VIR_TPM_SWTPM_FEATURE_CMDARG_MIGRATION,
> +    VIR_TPM_SWTPM_FEATURE_NVRAM_BACKEND_DIR,
>   
>       VIR_TPM_SWTPM_FEATURE_LAST
>   } virTPMSwtpmFeature;