From patchwork Fri Apr 12 21:59:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 236229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A01FE2C00A3 for ; Sat, 13 Apr 2013 08:00:15 +1000 (EST) Received: from localhost ([::1]:43688 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQm0y-00069G-8P for incoming@patchwork.ozlabs.org; Fri, 12 Apr 2013 18:00:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQm0d-000680-Ed for qemu-devel@nongnu.org; Fri, 12 Apr 2013 17:59:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQm0X-0007vr-UM for qemu-devel@nongnu.org; Fri, 12 Apr 2013 17:59:51 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:42719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQm0X-0007va-Nv for qemu-devel@nongnu.org; Fri, 12 Apr 2013 17:59:45 -0400 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 12 Apr 2013 15:59:43 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e39.co.us.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 12 Apr 2013 15:59:42 -0600 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id F2A8019D8036 for ; Fri, 12 Apr 2013 15:59:36 -0600 (MDT) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3CLxelD112722 for ; Fri, 12 Apr 2013 15:59:40 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3CLxcl5007813 for ; Fri, 12 Apr 2013 15:59:39 -0600 Received: from [9.2.141.150] (k-d941e-10.watson.ibm.com [9.2.141.150]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3CLxba4007616; Fri, 12 Apr 2013 15:59:37 -0600 Message-ID: <1365803977.26271.2.camel@d941e-10> From: Stefan Berger To: "qemu-devel@nongnu.org" Date: Fri, 12 Apr 2013 17:59:37 -0400 X-Mailer: Evolution 3.2.3 (3.2.3-3.fc16) Mime-Version: 1.0 X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13041221-3620-0000-0000-000002035A63 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.110.160 Cc: coreyb@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v2] tpm: Move TPM passthrough specific command line options to backend structure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. Signed-off-by: Stefan Berger Reviewed-by: Corey Bryant --- 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 =================================================================== --- qemu-git.pt.orig/vl.c +++ qemu-git.pt/vl.c @@ -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 =================================================================== --- qemu-git.pt.orig/tpm/tpm.c +++ qemu-git.pt/tpm/tpm.c @@ -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 =================================================================== --- qemu-git.pt.orig/tpm/tpm_passthrough.c +++ qemu-git.pt/tpm/tpm_passthrough.c @@ -512,8 +512,24 @@ static void tpm_passthrough_destroy(TPMB g_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 =================================================================== --- qemu-git.pt.orig/tpm/tpm_int.h +++ qemu-git.pt/tpm/tpm_int.h @@ -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;