[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 14/32] tpm-passthrough: simplify create()
From: |
Stefan Berger |
Subject: |
[Qemu-devel] [PULL v1 14/32] tpm-passthrough: simplify create() |
Date: |
Sat, 16 Dec 2017 12:41:31 -0500 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Signed-off-by: Stefan Berger <address@hidden>
---
hw/tpm/tpm_passthrough.c | 36 ++++++++++--------------------------
1 file changed, 10 insertions(+), 26 deletions(-)
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index aa9167e..788be38 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -261,49 +261,33 @@ tpm_passthrough_handle_device_opts(TPMPassthruState
*tpm_pt, QemuOpts *opts)
if (tpm_pt->tpm_fd < 0) {
error_report("Cannot access TPM device using '%s': %s",
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)) {
error_report("'%s' is not a TPM device.",
tpm_pt->tpm_dev);
- goto err_close_tpmdev;
+ return -1;
}
- 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;
+ tpm_pt->cancel_fd = tpm_passthrough_open_sysfs_cancel(tpm_pt);
+ if (tpm_pt->cancel_fd < 0) {
+ return -1;
+ }
- return 1;
+ return 0;
}
static TPMBackend *tpm_passthrough_create(QemuOpts *opts)
{
Object *obj = object_new(TYPE_TPM_PASSTHROUGH);
- TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(obj);
- if (tpm_passthrough_handle_device_opts(tpm_pt, opts)) {
- goto err_exit;
- }
-
- tpm_pt->cancel_fd = tpm_passthrough_open_sysfs_cancel(tpm_pt);
- if (tpm_pt->cancel_fd < 0) {
- goto err_exit;
+ if (tpm_passthrough_handle_device_opts(TPM_PASSTHROUGH(obj), opts)) {
+ object_unref(obj);
+ return NULL;
}
return TPM_BACKEND(obj);
-
-err_exit:
- object_unref(obj);
-
- return NULL;
}
static TpmTypeOptions *tpm_passthrough_get_tpm_options(TPMBackend *tb)
--
2.5.5
- [Qemu-devel] [PULL v1 06/32] tpm-be: report error instead of front-end, (continued)
- [Qemu-devel] [PULL v1 06/32] tpm-be: report error instead of front-end, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 05/32] tpm-be: call request_completed() out of thread, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 04/32] tpm-tis: no longer expose TPMState, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 08/32] tpm: remove unused opened code, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 13/32] tpm-passthrough: make it safer to destroy after creation, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 11/32] tpm-passthrough: pass TPMPassthruState to handle_device_opts, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 10/32] tpm-be: update optional function pointers, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 09/32] tpm-passthrough: don't save guessed cancel_path in options, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 12/32] tpm-backend: move set 'id' to common code, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 15/32] tpm-passthrough: workaround a possible race, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 14/32] tpm-passthrough: simplify create(),
Stefan Berger <=
- [Qemu-devel] [PULL v1 17/32] tpm: rename qemu_find_tpm() -> qemu_find_tpm_be(), Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 18/32] tpm: lookup the the TPM interface instead of TIS device, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 16/32] tpm-tis: simplify header inclusion, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 20/32] tpm: add tpm_cmd_get_size() to tpm_util, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 19/32] tpm: add TPM interface to lookup TPM version, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 21/32] acpi: change TPM TIS data conditions, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 22/32] tpm-emulator: add a FIXME comment about blocking cancel, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 23/32] tpm-tis: remove redundant 'tpm_tis:' in error messages, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 25/32] qdev: add DEFINE_PROP_TPMBE, Stefan Berger, 2017/12/16