From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WT9zI-0005cq-Mp for qemu-devel@nongnu.org; Thu, 27 Mar 2014 09:04:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WT9zB-0000Qh-NM for qemu-devel@nongnu.org; Thu, 27 Mar 2014 09:04:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WT9zB-0000QS-AA for qemu-devel@nongnu.org; Thu, 27 Mar 2014 09:04:45 -0400 From: Amos Kong Date: Thu, 27 Mar 2014 21:04:29 +0800 Message-Id: <1395925471-19841-2-git-send-email-akong@redhat.com> In-Reply-To: <1395925471-19841-1-git-send-email-akong@redhat.com> References: <1395925471-19841-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH v5 for 2.0 1/3] only add qemu_tpmdev_opts when CONFIG_TPM is defined List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, libvirt-list@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com, afaerber@suse.de Signed-off-by: Amos Kong --- vl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vl.c b/vl.c index 2355227..596ecfa 100644 --- a/vl.c +++ b/vl.c @@ -449,6 +449,7 @@ static QemuOptsList qemu_object_opts = { }, }; +#ifdef CONFIG_TPM static QemuOptsList qemu_tpmdev_opts = { .name = "tpmdev", .implied_opt_name = "type", @@ -458,6 +459,7 @@ static QemuOptsList qemu_tpmdev_opts = { { /* end of list */ } }, }; +#endif static QemuOptsList qemu_realtime_opts = { .name = "realtime", @@ -2992,7 +2994,9 @@ int main(int argc, char **argv, char **envp) qemu_add_opts(&qemu_sandbox_opts); qemu_add_opts(&qemu_add_fd_opts); qemu_add_opts(&qemu_object_opts); +#ifdef CONFIG_TPM qemu_add_opts(&qemu_tpmdev_opts); +#endif qemu_add_opts(&qemu_realtime_opts); qemu_add_opts(&qemu_msg_opts); qemu_add_opts(&qemu_name_opts); -- 1.8.5.3