d64072c0ac
This reverts commitd10e05f15d. 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 commitd10e05f15d"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: Markus Armbruster <armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
78 lines
2.1 KiB
C
78 lines
2.1 KiB
C
/*
|
|
* Public TPM functions
|
|
*
|
|
* Copyright (C) 2011-2013 IBM Corporation
|
|
*
|
|
* Authors:
|
|
* Stefan Berger <stefanb@us.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
#ifndef QEMU_TPM_H
|
|
#define QEMU_TPM_H
|
|
|
|
#include "qapi/qapi-types-tpm.h"
|
|
#include "qom/object.h"
|
|
|
|
int tpm_config_parse(QemuOptsList *opts_list, const char *optarg);
|
|
int tpm_init(void);
|
|
void tpm_cleanup(void);
|
|
|
|
typedef enum TPMVersion {
|
|
TPM_VERSION_UNSPEC = 0,
|
|
TPM_VERSION_1_2 = 1,
|
|
TPM_VERSION_2_0 = 2,
|
|
} TPMVersion;
|
|
|
|
#define TYPE_TPM_IF "tpm-if"
|
|
#define TPM_IF_CLASS(klass) \
|
|
OBJECT_CLASS_CHECK(TPMIfClass, (klass), TYPE_TPM_IF)
|
|
#define TPM_IF_GET_CLASS(obj) \
|
|
OBJECT_GET_CLASS(TPMIfClass, (obj), TYPE_TPM_IF)
|
|
#define TPM_IF(obj) \
|
|
INTERFACE_CHECK(TPMIf, (obj), TYPE_TPM_IF)
|
|
|
|
typedef struct TPMIf TPMIf;
|
|
|
|
typedef struct TPMIfClass {
|
|
InterfaceClass parent_class;
|
|
|
|
enum TpmModel model;
|
|
void (*request_completed)(TPMIf *obj, int ret);
|
|
enum TPMVersion (*get_version)(TPMIf *obj);
|
|
} TPMIfClass;
|
|
|
|
#define TYPE_TPM_TIS_ISA "tpm-tis"
|
|
#define TYPE_TPM_TIS_SYSBUS "tpm-tis-device"
|
|
#define TYPE_TPM_CRB "tpm-crb"
|
|
#define TYPE_TPM_SPAPR "tpm-spapr"
|
|
|
|
#define TPM_IS_TIS_ISA(chr) \
|
|
object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA)
|
|
#define TPM_IS_TIS_SYSBUS(chr) \
|
|
object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_SYSBUS)
|
|
#define TPM_IS_CRB(chr) \
|
|
object_dynamic_cast(OBJECT(chr), TYPE_TPM_CRB)
|
|
#define TPM_IS_SPAPR(chr) \
|
|
object_dynamic_cast(OBJECT(chr), TYPE_TPM_SPAPR)
|
|
|
|
/* returns NULL unless there is exactly one TPM device */
|
|
static inline TPMIf *tpm_find(void)
|
|
{
|
|
Object *obj = object_resolve_path_type("", TYPE_TPM_IF, NULL);
|
|
|
|
return TPM_IF(obj);
|
|
}
|
|
|
|
static inline TPMVersion tpm_get_version(TPMIf *ti)
|
|
{
|
|
if (!ti) {
|
|
return TPM_VERSION_UNSPEC;
|
|
}
|
|
|
|
return TPM_IF_GET_CLASS(ti)->get_version(ti);
|
|
}
|
|
|
|
#endif /* QEMU_TPM_H */
|