util: Add parsing support for swtpm_setup's cmdarg-profile capability

Add support for parsing swtpm_setup 'cmdarg-profile' capability
(since v0.10).

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/util/virtpm.c b/src/util/virtpm.c
index 8dcd3f90d9a02bad2e4fd1698931845e0ea70137..1c736b0229dd248895236dcf577e5b287324c1b3 100644 (file)
--- a/src/util/virtpm.c
+++ b/src/util/virtpm.c
@@ -53,6 +53,7 @@ VIR_ENUM_IMPL(virTPMSwtpmSetupFeature,
               "tpm-1.2",
               "tpm-2.0",
               "tpmstate-opt-lock",
+              "cmdarg-profile",
 );
 
 /**

diff --git a/src/util/virtpm.h b/src/util/virtpm.h
index 279cb7e976ce0ef5fdf03133bc3ae7333ec67beb..9ca09c2d803ca57a585583f5b94c8a594328032b 100644 (file)
--- a/src/util/virtpm.h
+++ b/src/util/virtpm.h
@@ -45,6 +45,7 @@ typedef enum {
     VIR_TPM_SWTPM_SETUP_FEATURE_TPM_1_2,
     VIR_TPM_SWTPM_SETUP_FEATURE_TPM_2_0,
     VIR_TPM_SWTPM_SETUP_FEATURE_TPMSTATE_OPT_LOCK,
+    VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PROFILE,
 
     VIR_TPM_SWTPM_SETUP_FEATURE_LAST
 } virTPMSwtpmSetupFeature;

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index f40bfa873c46056904e7d19aef807427a0489771..5caccbc6b4d54882d22af19c4dfc3bbddec0ae84 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -72,6 +72,7 @@ virTPMSwtpmSetupCapsGet(virTPMSwtpmSetupFeature cap)
     case VIR_TPM_SWTPM_SETUP_FEATURE_TPM12_NOT_NEED_ROOT:
     case VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_RECONFIGURE_PCR_BANKS:
     case VIR_TPM_SWTPM_SETUP_FEATURE_TPMSTATE_OPT_LOCK:
+    case VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PROFILE:
     case VIR_TPM_SWTPM_SETUP_FEATURE_LAST:
         break;
     }