From patchwork Wed Aug 25 16:33:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Niederl X-Patchwork-Id: 62723 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 363D8B70CC for ; Thu, 26 Aug 2010 02:38:37 +1000 (EST) Received: from localhost ([127.0.0.1]:57179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OoIzI-0003W7-Lh for incoming@patchwork.ozlabs.org; Wed, 25 Aug 2010 12:38:08 -0400 Received: from [140.186.70.92] (port=47217 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OoIup-0000fm-CP for qemu-devel@nongnu.org; Wed, 25 Aug 2010 12:33:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OoIuk-0006dP-P3 for qemu-devel@nongnu.org; Wed, 25 Aug 2010 12:33:27 -0400 Received: from mailrelay.tu-graz.ac.at ([129.27.2.202]:30308 helo=mailrelay.tugraz.at) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OoIuk-0006WO-Fh for qemu-devel@nongnu.org; Wed, 25 Aug 2010 12:33:26 -0400 Received: from thor.iaik.tugraz.at (mail1.iaik.tugraz.at [129.27.152.30]) by mailrelay2.tugraz.at (8.14.4/8.14.4) with ESMTP id o7PGWvWT019275 for ; Wed, 25 Aug 2010 18:32:57 +0200 (CEST) X-DKIM: Sendmail DKIM Filter v2.8.3 mailrelay2.tugraz.at o7PGWvWT019275 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tugraz.at; s=mailrelay; t=1282753979; i=@iaik.tugraz.at; bh=9QfLaTAzoGcpMUGETQPHqxDMjwepaiv84Cjk6SpFvWY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=fYaMyrGuX7s2xtgrY5Pfbgch9fzMQ6NxQro3HiG0DNqK6mvLRHqXZfrUEumotfhQK f59ww80Lv813ZIUINCyv8uM5D0pLtrlnNZJzNOXW8NAH/+jIA4cen4pEJNooZNUMob M9uREYAmKLpZ+0s+CL/+05N6cMWn1Ff+sYtPMVXk= Received: from sirius.iaik.tugraz.at (sirius.iaik.tugraz.at [10.27.152.109]) by thor.iaik.tugraz.at (Postfix) with ESMTP id 33E421067B3B8; Wed, 25 Aug 2010 18:32:58 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.96.1 at mail1 From: Andreas Niederl To: qemu-devel@nongnu.org Date: Wed, 25 Aug 2010 18:33:01 +0200 Message-Id: <1282753982-1761-2-git-send-email-andreas.niederl@iaik.tugraz.at> X-Mailer: git-send-email 1.7.2.2 In-Reply-To: <1282753982-1761-1-git-send-email-andreas.niederl@iaik.tugraz.at> References: <1282753982-1761-1-git-send-email-andreas.niederl@iaik.tugraz.at> X-TUG-Backscatter-control: V048+SNPHC2W9i+2rybNlw X-Scanned-By: MIMEDefang 2.70 on 129.27.10.19 X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) Cc: Andreas Niederl Subject: [Qemu-devel] [PATCH 2/3] Add command line options for TPM interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Andreas Niederl --- hw/pc.h | 5 +++++ qemu-config.c | 12 ++++++++++++ qemu-config.h | 1 + qemu-options.hx | 6 ++++++ vl.c | 25 +++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 0 deletions(-) diff --git a/hw/pc.h b/hw/pc.h index 63b0249..d95020c 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -176,4 +176,9 @@ void isa_ne2000_init(int base, int irq, NICInfo *nd); int e820_add_entry(uint64_t, uint64_t, uint32_t); +#ifdef CONFIG_TPM +/* tpm.c */ +extern int tpm_init(QemuOpts *opts); +#endif + #endif diff --git a/qemu-config.c b/qemu-config.c index 3abe655..aedca13 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -336,6 +336,18 @@ static QemuOptsList qemu_cpudef_opts = { }, }; +QemuOptsList qemu_tpm_opts = { + .name = "tpm", + .head = QTAILQ_HEAD_INITIALIZER(qemu_tpm_opts.head), + .desc = { + { + .name = "dev", + .type = QEMU_OPT_STRING, + }, + { /*End of list */ } + }, +}; + static QemuOptsList *vm_config_groups[32] = { &qemu_drive_opts, &qemu_chardev_opts, diff --git a/qemu-config.h b/qemu-config.h index 533a049..492a35d 100644 --- a/qemu-config.h +++ b/qemu-config.h @@ -3,6 +3,7 @@ extern QemuOptsList qemu_fsdev_opts; extern QemuOptsList qemu_virtfs_opts; +extern QemuOptsList qemu_tpm_opts; QemuOptsList *qemu_find_opts(const char *group); void qemu_add_opts(QemuOptsList *list); diff --git a/qemu-options.hx b/qemu-options.hx index 453f129..771990b 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2230,6 +2230,12 @@ Normally QEMU loads a configuration file from @var{sysconfdir}/qemu.conf and @var{sysconfdir}/target-@var{ARCH}.conf on startup. The @code{-nodefconfig} option will prevent QEMU from loading these configuration files at startup. ETEXI +#ifdef CONFIG_TPM +DEF("tpm", HAS_ARG, QEMU_OPTION_tpm, + "-tpm dev=\n" + " enable TPM support and forward commands to the given TPM device file\n", + QEMU_ARCH_I386) +#endif HXCOMM This is the last statement. Insert new options before this line! STEXI diff --git a/vl.c b/vl.c index 91d1684..fe35f49 100644 --- a/vl.c +++ b/vl.c @@ -1541,6 +1541,16 @@ static int fsdev_init_func(QemuOpts *opts, void *opaque) } #endif +#ifdef CONFIG_TPM +static int tpm_init_func(QemuOpts *opts, void *opaque) +{ + if (tpm_init(opts) != 0) { + return 1; + } + return 0; +} +#endif + static int mon_init_func(QemuOpts *opts, void *opaque) { CharDriverState *chr; @@ -1860,6 +1870,10 @@ int main(int argc, char **argv, char **envp) qemu_add_opts(&qemu_virtfs_opts); #endif +#ifdef CONFIG_TPM + qemu_add_opts(&qemu_tpm_opts); +#endif + /* first pass of option parsing */ optind = 1; while (optind < argc) { @@ -2360,6 +2374,12 @@ int main(int argc, char **argv, char **envp) qemu_free(arg_9p); break; } + case QEMU_OPTION_tpm: + opts = qemu_opts_parse(&qemu_tpm_opts, optarg, 0); + if (!opts) { + exit(1); + } + break; case QEMU_OPTION_serial: add_device_config(DEV_SERIAL, optarg); default_serial = 0; @@ -2713,6 +2733,11 @@ int main(int argc, char **argv, char **envp) exit(1); } #endif +#ifdef CONFIG_TPM + if (qemu_opts_foreach(&qemu_tpm_opts, tpm_init_func, NULL, 1) != 0) { + exit(1); + } +#endif os_daemonize();