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

tpm-passthrough: simplify create() 

Use a similar code as tpm_emulator_create(), call handle_opts() and
handle failure cleanup with object_unref() in create().

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:11 +01:00 committed by Stefan Berger
parent 8df4d8484f
commit bef2ed3fd2
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hw/tpm/tpm_passthrough.c
View File

@ -261,49 +261,33 @@ tpm_passthrough_handle_device_opts(TPMPassthruState *tpm_pt, QemuOpts *opts)
if (tpm_pt->tpm_fd < 0) { if (tpm_pt->tpm_fd < 0) {
error_report("Cannot access TPM device using '%s': %s", error_report("Cannot access TPM device using '%s': %s",
tpm_pt->tpm_dev, strerror(errno)); tpm_pt->tpm_dev, strerror(errno));
goto err_free_parameters; return -1;
} }
if (tpm_util_test_tpmdev(tpm_pt->tpm_fd, &tpm_pt->tpm_version)) { if (tpm_util_test_tpmdev(tpm_pt->tpm_fd, &tpm_pt->tpm_version)) {
error_report("'%s' is not a TPM device.", error_report("'%s' is not a TPM device.",
tpm_pt->tpm_dev); tpm_pt->tpm_dev);
goto err_close_tpmdev; return -1;
}
tpm_pt->cancel_fd = tpm_passthrough_open_sysfs_cancel(tpm_pt);
if (tpm_pt->cancel_fd < 0) {
return -1;
} }
return 0; return 0;
err_close_tpmdev:
qemu_close(tpm_pt->tpm_fd);
tpm_pt->tpm_fd = -1;
err_free_parameters:
qapi_free_TPMPassthroughOptions(tpm_pt->options);
tpm_pt->options = NULL;
tpm_pt->tpm_dev = NULL;
return 1;
} }
static TPMBackend *tpm_passthrough_create(QemuOpts *opts) static TPMBackend *tpm_passthrough_create(QemuOpts *opts)
{ {
Object *obj = object_new(TYPE_TPM_PASSTHROUGH); Object *obj = object_new(TYPE_TPM_PASSTHROUGH);
TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(obj);
if (tpm_passthrough_handle_device_opts(tpm_pt, opts)) { if (tpm_passthrough_handle_device_opts(TPM_PASSTHROUGH(obj), opts)) {
goto err_exit; object_unref(obj);
} return NULL;
tpm_pt->cancel_fd = tpm_passthrough_open_sysfs_cancel(tpm_pt);
if (tpm_pt->cancel_fd < 0) {
goto err_exit;
} }
return TPM_BACKEND(obj); return TPM_BACKEND(obj);
err_exit:
object_unref(obj);
return NULL;
} }
static TpmTypeOptions *tpm_passthrough_get_tpm_options(TPMBackend *tb) static TpmTypeOptions *tpm_passthrough_get_tpm_options(TPMBackend *tb)