[v4] swtpm: Add support for profiles

[PATCH v4 04/11] conf: Define enum virDomainTPMProfileRemoveDisabled

Posted by Stefan Berger 2 weeks, 6 days ago

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
 src/conf/domain_conf.c | 7 +++++++
 src/conf/domain_conf.h | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 3a32e50890..a5627ada88 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1337,6 +1337,13 @@ VIR_ENUM_IMPL(virDomainTPMPcrBank,
               "sha512",
 );
 
+VIR_ENUM_IMPL(virDomainTPMProfileRemoveDisabled,
+              VIR_DOMAIN_TPM_PROFILE_REMOVE_DISABLED_LAST,
+              "none",
+              "check",
+              "fips-host",
+);
+
 VIR_ENUM_IMPL(virDomainIOMMUModel,
               VIR_DOMAIN_IOMMU_MODEL_LAST,
               "intel",
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 08c6526711..e1103c3655 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1471,6 +1471,14 @@ typedef enum {
     VIR_DOMAIN_TPM_SOURCE_TYPE_LAST
 } virDomainTPMSourceType;
 
+typedef enum {
+    VIR_DOMAIN_TPM_PROFILE_REMOVE_DISABLED_NONE = 0,
+    VIR_DOMAIN_TPM_PROFILE_REMOVE_DISABLED_CHECK,
+    VIR_DOMAIN_TPM_PROFILE_REMOVE_DISABLED_FIPS_HOST,
+
+    VIR_DOMAIN_TPM_PROFILE_REMOVE_DISABLED_LAST
+} virDomainTPMProfileRemoveDisabled;
+
 #define VIR_DOMAIN_TPM_DEFAULT_DEVICE "/dev/tpm0"
 
 struct _virDomainTPMEmulatorDef {
@@ -4290,6 +4298,7 @@ VIR_ENUM_DECL(virDomainTPMBackend);
 VIR_ENUM_DECL(virDomainTPMVersion);
 VIR_ENUM_DECL(virDomainTPMSourceType);
 VIR_ENUM_DECL(virDomainTPMPcrBank);
+VIR_ENUM_DECL(virDomainTPMProfileRemoveDisabled);
 VIR_ENUM_DECL(virDomainMemoryModel);
 VIR_ENUM_DECL(virDomainMemoryBackingModel);
 VIR_ENUM_DECL(virDomainMemorySource);
-- 
2.47.0

Re: [PATCH v4 04/11] conf: Define enum virDomainTPMProfileRemoveDisabled

Posted by Michal Prívozník 2 weeks, 4 days ago

On 11/13/24 18:39, Stefan Berger wrote:
> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> ---
>  src/conf/domain_conf.c | 7 +++++++
>  src/conf/domain_conf.h | 9 +++++++++
>  2 files changed, 16 insertions(+)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 3a32e50890..a5627ada88 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -1337,6 +1337,13 @@ VIR_ENUM_IMPL(virDomainTPMPcrBank,
>                "sha512",
>  );
>  
> +VIR_ENUM_IMPL(virDomainTPMProfileRemoveDisabled,
> +              VIR_DOMAIN_TPM_PROFILE_REMOVE_DISABLED_LAST,
> +              "none",
> +              "check",
> +              "fips-host",
> +);
> +
>  VIR_ENUM_IMPL(virDomainIOMMUModel,
>                VIR_DOMAIN_IOMMU_MODEL_LAST,
>                "intel",
> diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
> index 08c6526711..e1103c3655 100644
> --- a/src/conf/domain_conf.h
> +++ b/src/conf/domain_conf.h
> @@ -1471,6 +1471,14 @@ typedef enum {
>      VIR_DOMAIN_TPM_SOURCE_TYPE_LAST
>  } virDomainTPMSourceType;
>  
> +typedef enum {
> +    VIR_DOMAIN_TPM_PROFILE_REMOVE_DISABLED_NONE = 0,
> +    VIR_DOMAIN_TPM_PROFILE_REMOVE_DISABLED_CHECK,
> +    VIR_DOMAIN_TPM_PROFILE_REMOVE_DISABLED_FIPS_HOST,
> +
> +    VIR_DOMAIN_TPM_PROFILE_REMOVE_DISABLED_LAST
> +} virDomainTPMProfileRemoveDisabled;
> +
>  #define VIR_DOMAIN_TPM_DEFAULT_DEVICE "/dev/tpm0"
>  
>  struct _virDomainTPMEmulatorDef {
> @@ -4290,6 +4298,7 @@ VIR_ENUM_DECL(virDomainTPMBackend);
>  VIR_ENUM_DECL(virDomainTPMVersion);
>  VIR_ENUM_DECL(virDomainTPMSourceType);
>  VIR_ENUM_DECL(virDomainTPMPcrBank);
> +VIR_ENUM_DECL(virDomainTPMProfileRemoveDisabled);
>  VIR_ENUM_DECL(virDomainMemoryModel);
>  VIR_ENUM_DECL(virDomainMemoryBackingModel);
>  VIR_ENUM_DECL(virDomainMemorySource);

Don't forget to add these new symbols to libvirt_private.syms

Michal