From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB9zZ-0007es-2l for qemu-devel@nongnu.org; Tue, 04 Oct 2011 14:45:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RB9zX-0003CH-FB for qemu-devel@nongnu.org; Tue, 04 Oct 2011 14:45:24 -0400 Received: from e38.co.us.ibm.com ([32.97.110.159]:37779) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB9zX-0003C7-8I for qemu-devel@nongnu.org; Tue, 04 Oct 2011 14:45:23 -0400 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e38.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p94Ib7D6017251 for ; Tue, 4 Oct 2011 12:37:07 -0600 Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p94Ij9HM072156 for ; Tue, 4 Oct 2011 12:45:10 -0600 Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p94Ij6aU022841 for ; Tue, 4 Oct 2011 12:45:08 -0600 Message-ID: <4E8B542F.5070501@linux.vnet.ibm.com> Date: Tue, 04 Oct 2011 14:45:03 -0400 From: Stefan Berger MIME-Version: 1.0 References: <20110928132255.156431784@linux.vnet.ibm.com> In-Reply-To: <20110928132255.156431784@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 8/5] Add fd parameter for TPM passthrough driver List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: anbang.ruan@cs.ox.ac.uk, mst@redhat.com, Stefan Berger , andreas.niederl@iaik.tugraz.at, serge@hallyn.com Enable the passing of a file descriptor via fd=<..> to access the host's TPM device using the TPM passthrough driver. Signed-off-by: Stefan Berger --- hw/tpm_passthrough.c | 74 +++++++++++++++++++++++++++++++++------------------ qemu-config.c | 5 +++ 2 files changed, 53 insertions(+), 26 deletions(-) Index: qemu-git.pt/qemu-config.c =================================================================== --- qemu-git.pt.orig/qemu-config.c +++ qemu-git.pt/qemu-config.c @@ -523,6 +523,11 @@ static QemuOptsList qemu_tpmdev_opts = { .type = QEMU_OPT_STRING, .help = "Persistent storage for TPM state", }, + { + .name = "fd", + .type = QEMU_OPT_STRING, + .help = "Filedescriptor for accessing the TPM", + }, { /* end of list */ } }, }; Index: qemu-git.pt/hw/tpm_passthrough.c =================================================================== --- qemu-git.pt.orig/hw/tpm_passthrough.c +++ qemu-git.pt/hw/tpm_passthrough.c @@ -356,32 +356,54 @@ static int tpm_passthrough_handle_device char buf[64]; int n; - value = qemu_opt_get(opts, "path"); - if (!value) { - value = TPM_PASSTHROUGH_DEFAULT_DEVICE; - } - - n = snprintf(tb->s.tpm_pt->tpm_dev, sizeof(tb->s.tpm_pt->tpm_dev), - "%s", value); - - if (n >= sizeof(tb->s.tpm_pt->tpm_dev)) { - error_report("TPM device path is too long.\n"); - goto err_exit; - } - - snprintf(buf, sizeof(buf), "path=%s", tb->s.tpm_pt->tpm_dev); - - tb->parameters = g_strdup(buf); - - if (tb->parameters == NULL) { - return 1; - } - - tb->s.tpm_pt->tpm_fd = open(tb->s.tpm_pt->tpm_dev, O_RDWR); - if (tb->s.tpm_pt->tpm_fd < 0) { - error_report("Cannot access TPM device using '%s'.\n", - tb->s.tpm_pt->tpm_dev); - goto err_exit; + value = qemu_opt_get(opts, "fd"); + if (value) { + if (qemu_opt_get(opts, "path")) { + error_report("fd= is invalid with path="); + return -1; + } + + tb->s.tpm_pt->tpm_fd = qemu_parse_fd(value); + if (tb->s.tpm_pt->tpm_fd < 0) { + error_report("Illegal file descriptor for TPM device.\n"); + return -1; + } + + snprintf(buf, sizeof(buf), "fd=%d", tb->s.tpm_pt->tpm_fd); + + tb->parameters = g_strdup(buf); + + if (tb->parameters == NULL) { + goto err_close_tpmdev; + } + } else { + value = qemu_opt_get(opts, "path"); + if (!value) { + value = TPM_PASSTHROUGH_DEFAULT_DEVICE; + } + + n = snprintf(tb->s.tpm_pt->tpm_dev, sizeof(tb->s.tpm_pt->tpm_dev), + "%s", value); + + if (n >= sizeof(tb->s.tpm_pt->tpm_dev)) { + error_report("TPM device path is too long.\n"); + goto err_exit; + } + + snprintf(buf, sizeof(buf), "path=%s", tb->s.tpm_pt->tpm_dev); + + tb->parameters = g_strdup(buf); + + if (tb->parameters == NULL) { + return 1; + } + + tb->s.tpm_pt->tpm_fd = open(tb->s.tpm_pt->tpm_dev, O_RDWR); + if (tb->s.tpm_pt->tpm_fd < 0) { + error_report("Cannot access TPM device using '%s'.\n", + tb->s.tpm_pt->tpm_dev); + goto err_exit; + } } if (tpm_passthrough_test_tpmdev(tb->s.tpm_pt->tpm_fd)) {