[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[qemu-xen master] tpm: Improve help on TPM types when none are available



commit 5a6791c3d4a7719e8d0797afe0e2822a54bda6a2
Author:     Markus Armbruster <armbru@xxxxxxxxxx>
AuthorDate: Thu Jul 23 13:58:45 2020 +0200
Commit:     Stefan Berger <stefanb@xxxxxxxxxxxxxxxxxx>
CommitDate: Fri Jul 24 12:44:13 2020 -0400

    tpm: Improve help on TPM types when none are available
    
    Help is a bit awkward when no TPM types are built into QEMU:
    
        $ qemu-system-x86_64 -tpmdev nonexistent,id=tpm0
        qemu-system-x86_64: -tpmdev nonexistent,id=tpm0: Parameter 'type' 
expects a TPM backend type
        Supported TPM types (choose only one):
    
    Improve to
    
        qemu-system-x86_64: -tpmdev nonexistent,id=tpm0: Parameter 'type' 
expects a TPM backend type
        No TPM backend types are available
    
    Signed-off-by: Markus Armbruster <armbru@xxxxxxxxxx>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
    Reviewed-by: Stefan Berger <stefanb@xxxxxxxxxxxxx>
    Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxxxxx>
---
 tpm.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tpm.c b/tpm.c
index f6045bb6da..cab206355a 100644
--- a/tpm.c
+++ b/tpm.c
@@ -47,18 +47,23 @@ tpm_be_find_by_type(enum TpmType type)
  */
 static void tpm_display_backend_drivers(void)
 {
+    bool got_one = false;
     int i;
 
-    fprintf(stderr, "Supported TPM types (choose only one):\n");
-
     for (i = 0; i < TPM_TYPE__MAX; i++) {
         const TPMBackendClass *bc = tpm_be_find_by_type(i);
         if (!bc) {
             continue;
         }
-        fprintf(stderr, "%12s   %s\n", TpmType_str(i), bc->desc);
+        if (!got_one) {
+            error_printf("Supported TPM types (choose only one):\n");
+            got_one = true;
+        }
+        error_printf("%12s   %s\n", TpmType_str(i), bc->desc);
+    }
+    if (!got_one) {
+        error_printf("No TPM backend types are available\n");
     }
-    fprintf(stderr, "\n");
 }
 
 /*
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.