From: Amos Kong <akong@redhat.com>
To: qemu-devel@nongnu.org
Cc: armbru@redhat.com, libvirt-list@redhat.com,
anthony@codemonkey.ws, pbonzini@redhat.com, afaerber@suse.de
Subject: [Qemu-devel] [PATCH v5 for 2.0 1/3] only add qemu_tpmdev_opts when CONFIG_TPM is defined
Date: Thu, 27 Mar 2014 21:04:29 +0800 [thread overview]
Message-ID: <1395925471-19841-2-git-send-email-akong@redhat.com> (raw)
In-Reply-To: <1395925471-19841-1-git-send-email-akong@redhat.com>
Signed-off-by: Amos Kong <akong@redhat.com>
---
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
next prev parent reply other threads:[~2014-03-27 13:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-27 13:04 [Qemu-devel] [PATCH v5 for 2.0 0/3] ABI change: change group name of option table to match with option name Amos Kong
2014-03-27 13:04 ` Amos Kong [this message]
2014-03-28 12:04 ` [Qemu-devel] [PATCH v5 for 2.0 1/3] only add qemu_tpmdev_opts when CONFIG_TPM is defined Markus Armbruster
2014-03-28 15:47 ` [Qemu-devel] [libvirt] " Eric Blake
2014-03-28 17:46 ` Markus Armbruster
2014-03-27 13:04 ` [Qemu-devel] [PATCH v5 for 2.0 2/3] update names in option tables to match with actual command-line spelling Amos Kong
2014-03-27 13:04 ` [Qemu-devel] [PATCH v5 for 2.0 3/3] abort QEMU if group name in option table doesn't match with defined option name Amos Kong
2014-03-28 12:53 ` Leandro Dorileo
2014-03-28 14:55 ` Markus Armbruster
2014-03-28 15:19 ` Eric Blake
2014-03-28 17:43 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395925471-19841-2-git-send-email-akong@redhat.com \
--to=akong@redhat.com \
--cc=afaerber@suse.de \
--cc=anthony@codemonkey.ws \
--cc=armbru@redhat.com \
--cc=libvirt-list@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).