tpm: Move TPM passthrough specific command line options to backend structure
PATCH v2 1/1 tpm: Move TPM passthrough specific command line options to backend structure
Move the TPM passthrough specific command line options to the passthrough backend implementation and attach them to the backend's interface structure.
Add code to tpm.c for validating the TPM command line options.
--- tpm/tpm.c | 8 ++++++++ tpm/tpm_int.h | 8 ++++++++ tpm/tpm_passthrough.c | 16 ++++++++++++++++ vl.c | 16 +--------------- 4 files changed, 33 insertions(+), 15 deletions(-)
vl.c +1 -15
@@ -502,21 +502,7 @@ static QemuOptsList qemu_tpmdev_opts = { .implied_opt_name = "type", .head = QTAILQ_HEAD_INITIALIZER(qemu_tpmdev_opts.head), .desc = { - { - .name = "type", - .type = QEMU_OPT_STRING, - .help = "Type of TPM backend", - }, - { - .name = "cancel-path", - .type = QEMU_OPT_STRING, - .help = "Sysfs file entry for canceling TPM commands", - }, - { - .name = "path", - .type = QEMU_OPT_STRING, - .help = "Path to TPM device on the host", - }, +/* options are defined in the TPM backends */ {/* end of list */ } }, };
tpm/tpm.c +8 -0
@@ -174,6 +174,14 @@ static int configure_tpm(QemuOpts *opts)return 1 ; } +/* validate backend specific opts */ +qemu_opts_validate (opts, be->opts, &local_err); +if (error_is_set (&local_err)) { +qerror_report_err (local_err); +error_free (local_err); +return 1 ; + } + drv = be->create (opts, id);if (!drv) {return 1 ;
tpm/tpm_passthrough.c +16 -0
@@ -512,8 +512,24 @@ static void tpm_passthrough_destroy(TPMBg_free (tpm_pt->tpm_dev); } +static const QemuOptDesc tpm_passthrough_cmdline_opts[] = { +TPM_STANDARD_CMDLINE_OPTS , + { + .name ="cancel-path" , + .type =QEMU_OPT_STRING , + .help ="Sysfs file entry for canceling TPM commands" , + }, + { + .name ="path" , + .type =QEMU_OPT_STRING , + .help ="Path to TPM device on the host" , + }, + {/* end of list */ }, +}; +const TPMDriverOps tpm_passthrough_driver = { .type =TPM_TYPE_PASSTHROUGH , + .opts = tpm_passthrough_cmdline_opts, .desc = tpm_passthrough_create_desc, .create = tpm_passthrough_create, .destroy = tpm_passthrough_destroy,
tpm/tpm_int.h +8 -0
@@ -35,6 +35,7 @@ struct TPMState {struct TPMDriverOps {enum TpmType type; +const QemuOptDesc *opts;/* get a descriptive text of the backend to display to the user */ const char *(*desc)(void );
@@ -59,6 +60,13 @@ struct TPMDriverOps {bool (*get_tpm_established_flag)(TPMBackend *t); }; +#define TPM_STANDARD_CMDLINE_OPTS \ + { \ + .name = "type", \ + .type = QEMU_OPT_STRING, \ + .help = "Type of TPM backend", \ + } +struct tpm_req_hdr {uint16_t tag;uint32_t len;
Quoted 107 lines · Stefan Berger
Move the TPM passthrough specific command line options to the passthrough backend implementation and attach them to the backend's interface structure.
Add code to
tpm.cfor validating the TPM command line options.Signed-off-by Stefan Berger <[email protected]>--- tpm/tpm.c | 8 ++++++++ tpm/tpm_int.h | 8 ++++++++ tpm/tpm_passthrough.c | 16 ++++++++++++++++ vl.c | 16 +--------------- 4 files changed, 33 insertions(+), 15 deletions(-)Index:
qemu-git.pt/vl.c
===================================================================vl.c +1
-15@@ -502,21 +502,7 @@ static QemuOptsList qemu_tpmdev_opts = { .implied_opt_name = "type", .head = QTAILQ_HEAD_INITIALIZER(qemu_tpmdev_opts.head), .desc = { - { - .name = "type", - .type = QEMU_OPT_STRING, - .help = "Type of TPM backend", - }, - { - .name = "cancel-path", - .type = QEMU_OPT_STRING, - .help = "Sysfs file entry for canceling TPM commands", - }, - { - .name = "path", - .type = QEMU_OPT_STRING, - .help = "Path to TPM device on the host", - }, +/* options are defined in the TPM backends */ {/* end of list */ } }, };Index:
qemu-git.pt/tpm/tpm.c
===================================================================tpm/tpm.c +8
-0@@ -174,6 +174,14 @@ static int configure_tpm(QemuOpts *opts)return 1 ; } +/* validate backend specific opts */ +qemu_opts_validate (opts, be->opts, &local_err); +if (error_is_set (&local_err)) { +qerror_report_err (local_err); +error_free (local_err); +return 1 ; + } + drv = be->create (opts, id);if (!drv) {return 1 ;Index:
qemu-git.pt/tpm/tpm_passthrough.c
===================================================================tpm/tpm_passthrough.c +16
-0@@ -512,8 +512,24 @@ static void tpm_passthrough_destroy(TPMBg_free (tpm_pt->tpm_dev); } +static const QemuOptDesc tpm_passthrough_cmdline_opts[] = { +TPM_STANDARD_CMDLINE_OPTS , + { + .name ="cancel-path" , + .type =QEMU_OPT_STRING , + .help ="Sysfs file entry for canceling TPM commands" , + }, + { + .name ="path" , + .type =QEMU_OPT_STRING , + .help ="Path to TPM device on the host" , + }, + {/* end of list */ }, +}; +const TPMDriverOps tpm_passthrough_driver = { .type =TPM_TYPE_PASSTHROUGH , + .opts = tpm_passthrough_cmdline_opts, .desc = tpm_passthrough_create_desc, .create = tpm_passthrough_create, .destroy = tpm_passthrough_destroy,Index:
qemu-git.pt/tpm/tpm_int.h
===================================================================tpm/tpm_int.h +1
-0@@ -35,6 +35,7 @@ struct TPMState {struct TPMDriverOps {enum TpmType type; +const QemuOptDesc *opts;/* get a descriptive text of the backend to display to the user */ const char *(*desc)(void );@@ -59,6 +60,13 @@ struct TPMDriverOps {bool (*get_tpm_established_flag)(TPMBackend *t); };
tpm/tpm_int.h struct TPMDriverOps { · line 72
Quoted 10 lines
tpm/tpm_int.h +7
-0+#define TPM_STANDARD_CMDLINE_OPTS \ + { \ + .name = "type", \ + .type = QEMU_OPT_STRING, \ + .help = "Type of TPM backend", \ + } +struct tpm_req_hdr {uint16_t tag;uint32_t len;
Signature · 2 lines
Regards, Corey Bryant
Quoted 6 lines · Stefan Berger
Move the TPM passthrough specific command line options to the passthrough backend implementation and attach them to the backend's interface structure.
Add code to
tpm.cfor validating the TPM command line options.Signed-off-by Stefan Berger <[email protected]>
This doesn't apply. Looks like it's pre-QOM?
Regards,
Anthony Liguori
Quoted 109 lines
--- tpm/tpm.c | 8 ++++++++ tpm/tpm_int.h | 8 ++++++++ tpm/tpm_passthrough.c | 16 ++++++++++++++++ vl.c | 16 +--------------- 4 files changed, 33 insertions(+), 15 deletions(-)Index:
qemu-git.pt/vl.c
===================================================================vl.c +1
-15@@ -502,21 +502,7 @@ static QemuOptsList qemu_tpmdev_opts = { .implied_opt_name = "type", .head = QTAILQ_HEAD_INITIALIZER(qemu_tpmdev_opts.head), .desc = { - { - .name = "type", - .type = QEMU_OPT_STRING, - .help = "Type of TPM backend", - }, - { - .name = "cancel-path", - .type = QEMU_OPT_STRING, - .help = "Sysfs file entry for canceling TPM commands", - }, - { - .name = "path", - .type = QEMU_OPT_STRING, - .help = "Path to TPM device on the host", - }, +/* options are defined in the TPM backends */ {/* end of list */ } }, };Index:
qemu-git.pt/tpm/tpm.c
===================================================================tpm/tpm.c +8
-0@@ -174,6 +174,14 @@ static int configure_tpm(QemuOpts *opts)return 1 ; } +/* validate backend specific opts */ +qemu_opts_validate (opts, be->opts, &local_err); +if (error_is_set (&local_err)) { +qerror_report_err (local_err); +error_free (local_err); +return 1 ; + } + drv = be->create (opts, id);if (!drv) {return 1 ;Index:
qemu-git.pt/tpm/tpm_passthrough.c
===================================================================tpm/tpm_passthrough.c +16
-0@@ -512,8 +512,24 @@ static void tpm_passthrough_destroy(TPMBg_free (tpm_pt->tpm_dev); } +static const QemuOptDesc tpm_passthrough_cmdline_opts[] = { +TPM_STANDARD_CMDLINE_OPTS , + { + .name ="cancel-path" , + .type =QEMU_OPT_STRING , + .help ="Sysfs file entry for canceling TPM commands" , + }, + { + .name ="path" , + .type =QEMU_OPT_STRING , + .help ="Path to TPM device on the host" , + }, + {/* end of list */ }, +}; +const TPMDriverOps tpm_passthrough_driver = { .type =TPM_TYPE_PASSTHROUGH , + .opts = tpm_passthrough_cmdline_opts, .desc = tpm_passthrough_create_desc, .create = tpm_passthrough_create, .destroy = tpm_passthrough_destroy,Index:
qemu-git.pt/tpm/tpm_int.h
===================================================================tpm/tpm_int.h +8
-0@@ -35,6 +35,7 @@ struct TPMState {struct TPMDriverOps {enum TpmType type; +const QemuOptDesc *opts;/* get a descriptive text of the backend to display to the user */ const char *(*desc)(void );@@ -59,6 +60,13 @@ struct TPMDriverOps {bool (*get_tpm_established_flag)(TPMBackend *t); }; +#define TPM_STANDARD_CMDLINE_OPTS \ + { \ + .name = "type", \ + .type = QEMU_OPT_STRING, \ + .help = "Type of TPM backend", \ + } +struct tpm_req_hdr {uint16_t tag;uint32_t len;
Quoted 9 lines · Anthony Liguori
Quoted 6 lines · Stefan Berger
Move the TPM passthrough specific command line options to the passthrough backend implementation and attach them to the backend's interface structure.
Add code to
tpm.cfor validating the TPM command line options.Signed-off-by Stefan Berger <[email protected]>This doesn't apply. Looks like it's pre-QOM?
It was from before Paolo moved the files around.
I just reposted this patch as v3.
Thanks.
Stefan