Skip to content
Snippets Groups Projects
  • Markus Armbruster's avatar
    d64072c0
    Revert "tpm: Clean up error reporting in tpm_init_tpmdev()" · d64072c0
    Markus Armbruster authored
    
    This reverts commit d10e05f1.
    
    We report some -tpmdev failures, but then continue as if all was fine.
    Reproducer:
    
        $ qemu-system-x86_64 -nodefaults -S -display none -monitor stdio -chardev null,id=tpm0 -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0
        qemu-system-x86_64: -tpmdev emulator,id=tpm0,chardev=chrtpm: tpm-emulator: tpm chardev 'chrtpm' not found.
        qemu-system-x86_64: -tpmdev emulator,id=tpm0,chardev=chrtpm: tpm-emulator: Could not cleanly shutdown the TPM: No such file or directory
        QEMU 5.0.90 monitor - type 'help' for more information
        (qemu) qemu-system-x86_64: -device tpm-tis,tpmdev=tpm0: Property 'tpm-tis.tpmdev' can't find value 'tpm0'
        $ echo $?
        1
    
    This is a regression caused by commit d10e05f1 "tpm: Clean up error
    reporting in tpm_init_tpmdev()".  It's incomplete: be->create(opts)
    continues to use error_report(), and we don't set an error when it
    fails.
    
    I figure converting the create() methods to Error would make some
    sense, but I'm not sure it's worth the effort right now.  Revert the
    broken commit instead, and add a comment to tpm_init_tpmdev().
    
    Straightforward conflict in tpm.c resolved.
    
    Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
    Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
    Reviewed-by: default avatarStefan Berger <stefanb@linux.ibm.com>
    Signed-off-by: default avatarStefan Berger <stefanb@linux.ibm.com>
    d64072c0
    History
    Revert "tpm: Clean up error reporting in tpm_init_tpmdev()"
    Markus Armbruster authored
    
    This reverts commit d10e05f1.
    
    We report some -tpmdev failures, but then continue as if all was fine.
    Reproducer:
    
        $ qemu-system-x86_64 -nodefaults -S -display none -monitor stdio -chardev null,id=tpm0 -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0
        qemu-system-x86_64: -tpmdev emulator,id=tpm0,chardev=chrtpm: tpm-emulator: tpm chardev 'chrtpm' not found.
        qemu-system-x86_64: -tpmdev emulator,id=tpm0,chardev=chrtpm: tpm-emulator: Could not cleanly shutdown the TPM: No such file or directory
        QEMU 5.0.90 monitor - type 'help' for more information
        (qemu) qemu-system-x86_64: -device tpm-tis,tpmdev=tpm0: Property 'tpm-tis.tpmdev' can't find value 'tpm0'
        $ echo $?
        1
    
    This is a regression caused by commit d10e05f1 "tpm: Clean up error
    reporting in tpm_init_tpmdev()".  It's incomplete: be->create(opts)
    continues to use error_report(), and we don't set an error when it
    fails.
    
    I figure converting the create() methods to Error would make some
    sense, but I'm not sure it's worth the effort right now.  Revert the
    broken commit instead, and add a comment to tpm_init_tpmdev().
    
    Straightforward conflict in tpm.c resolved.
    
    Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
    Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
    Reviewed-by: default avatarStefan Berger <stefanb@linux.ibm.com>
    Signed-off-by: default avatarStefan Berger <stefanb@linux.ibm.com>