ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tpm: remove unused opened code 

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Marc-André Lureau 2017-11-06 19:39:05 +01:00 committed by Stefan Berger
parent 191adc9476
commit 3c3ef63062
3 changed files with 0 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
backends/tpm.c
View File

@ -159,52 +159,10 @@ TPMInfo *tpm_backend_query_tpm(TPMBackend *s)
return info; return info;
} }
static bool tpm_backend_prop_get_opened(Object *obj, Error **errp)
{
TPMBackend *s = TPM_BACKEND(obj);
return s->opened;
}
void tpm_backend_open(TPMBackend *s, Error **errp)
{
object_property_set_bool(OBJECT(s), true, "opened", errp);
}
static void tpm_backend_prop_set_opened(Object *obj, bool value, Error **errp)
{
TPMBackend *s = TPM_BACKEND(obj);
TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
Error *local_err = NULL;
if (value == s->opened) {
return;
}
if (!value && s->opened) {
error_setg(errp, QERR_PERMISSION_DENIED);
return;
}
if (k->opened) {
k->opened(s, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
}
}
s->opened = true;
}
static void tpm_backend_instance_init(Object *obj) static void tpm_backend_instance_init(Object *obj)
{ {
TPMBackend *s = TPM_BACKEND(obj); TPMBackend *s = TPM_BACKEND(obj);
object_property_add_bool(obj, "opened",
tpm_backend_prop_get_opened,
tpm_backend_prop_set_opened,
NULL);
s->bh = qemu_bh_new(tpm_backend_request_completed_bh, s); s->bh = qemu_bh_new(tpm_backend_request_completed_bh, s);
} }

12
include/sysemu/tpm_backend.h
View File

@ -80,8 +80,6 @@ struct TPMBackendClass {
TpmTypeOptions *(*get_tpm_options)(TPMBackend *t); TpmTypeOptions *(*get_tpm_options)(TPMBackend *t);
void (*opened)(TPMBackend *s, Error **errp);
void (*handle_request)(TPMBackend *s, TPMBackendCmd *cmd); void (*handle_request)(TPMBackend *s, TPMBackendCmd *cmd);
}; };
@ -171,16 +169,6 @@ bool tpm_backend_get_tpm_established_flag(TPMBackend *s);
*/ */
int tpm_backend_reset_tpm_established_flag(TPMBackend *s, uint8_t locty); int tpm_backend_reset_tpm_established_flag(TPMBackend *s, uint8_t locty);
/**
* tpm_backend_open:
* @s: the backend to open
* @errp: a pointer to return the #Error object if an error occurs.
*
* This function will open the backend if it is not already open. Calling this
* function on an already opened backend will not result in an error.
*/
void tpm_backend_open(TPMBackend *s, Error **errp);
/** /**
* tpm_backend_get_tpm_version: * tpm_backend_get_tpm_version:
* @s: the backend to call into * @s: the backend to call into

6
tpm.c
View File

@ -132,12 +132,6 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp)
return 1; return 1;
} }
tpm_backend_open(drv, &local_err);
if (local_err) {
error_report_err(local_err);
return 1;
}
QLIST_INSERT_HEAD(&tpm_backends, drv, list); QLIST_INSERT_HEAD(&tpm_backends, drv, list);
return 0; return 0;