The alternative to PATCH 1 is a proper conversion to Error, as
discussed in

    Subject: Re: What is TYPE_TPM_TIS_ISA? (Not an ISA Device)
    Message-ID: <87tuxyoauy.fsf@dusky.pond.sub.org>

Such a conversion would be much too invasive for 5.1.  Going the other
way, like PATCH 1 does, is simple enough to be considered for 5.1.

To make this series a complete alternative to Philippe's
"[PATCH-for-5.1 v2 0/2] tpm: Improve error reporting", PATCH 2
improves help.

Markus Armbruster (2):
  Revert "tpm: Clean up error reporting in tpm_init_tpmdev()"
  tpm: Improve help on TPM types when none are available

 include/sysemu/tpm.h |  2 +-
 softmmu/vl.c         |  4 +++-
 stubs/tpm.c          |  3 ++-
 tpm.c                | 43 ++++++++++++++++++++++++++++++-------------
 4 files changed, 36 insertions(+), 16 deletions(-)

-- 
2.26.2