Commit 9af7a721 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Stefan Berger
Browse files

tpm: add TPM interface to lookup TPM version 



Do not hardcode TPM device model to lookup version, use an interface
instead.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
parent 3dfd5a2a

hw/tpm/tpm_tis.c

+3 −2
Original line number Diff line number Diff line
@@ -990,9 +990,9 @@ static void tpm_tis_realloc_buffer(TPMSizedBuffer *sb) 
/*

 * Get the TPMVersion of the backend device being used

 */

TPMVersion tpm_tis_get_tpm_version(Object *obj)

static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti)

{

    TPMState *s = TPM(obj);

    TPMState *s = TPM(ti);



    if (tpm_backend_had_startup_error(s->be_driver)) {

        return TPM_VERSION_UNSPEC;
@@ -1102,6 +1102,7 @@ static void tpm_tis_class_init(ObjectClass *klass, void *data) 
    dc->reset = tpm_tis_reset;

    dc->vmsd  = &vmstate_tpm_tis;

    tc->model = TPM_MODEL_TPM_TIS;

    tc->get_version = tpm_tis_get_tpm_version;

    tc->request_completed = tpm_tis_request_completed;

}

include/sysemu/tpm.h

+2 −3
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ typedef struct TPMIfClass { 


    enum TpmModel model;

    void (*request_completed)(TPMIf *obj);

    enum TPMVersion (*get_version)(TPMIf *obj);

} TPMIfClass;



#define TYPE_TPM_TIS                "tpm-tis"
@@ -54,15 +55,13 @@ static inline TPMIf *tpm_find(void) 
    return TPM_IF(obj);

}



TPMVersion tpm_tis_get_tpm_version(Object *obj);



static inline TPMVersion tpm_get_version(TPMIf *ti)

{

    if (!ti) {

        return TPM_VERSION_UNSPEC;

    }



    return tpm_tis_get_tpm_version(OBJECT(ti));

    return TPM_IF_GET_CLASS(ti)->get_version(ti);

}



#endif /* QEMU_TPM_H */