aboutsummaryrefslogtreecommitdiff
path: root/qemu-config.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2010-10-05 14:14:19 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2010-10-05 14:14:19 -0500
commit4447d609688e75a40a10b559e3b6ae83843e3095 (patch)
tree94e721b263ae28e68e8f1ccd1aa7db401c8b7129 /qemu-config.c
parent48f57044e6a826329ebcac5d5a76d776a14e5d43 (diff)
parent869564a9c0f78b1972e1ac51e69cb2016af3b060 (diff)
Merge remote branch 'spice/submit.6' into staging
Conflicts: configure Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-config.c')
-rw-r--r--qemu-config.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/qemu-config.c b/qemu-config.c
index 6052a289e9..32917cbda4 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -354,6 +354,24 @@ static QemuOptsList qemu_cpudef_opts = {
},
};
+QemuOptsList qemu_spice_opts = {
+ .name = "spice",
+ .head = QTAILQ_HEAD_INITIALIZER(qemu_spice_opts.head),
+ .desc = {
+ {
+ .name = "port",
+ .type = QEMU_OPT_NUMBER,
+ },{
+ .name = "password",
+ .type = QEMU_OPT_STRING,
+ },{
+ .name = "disable-ticketing",
+ .type = QEMU_OPT_BOOL,
+ },
+ { /* end if list */ }
+ },
+};
+
static QemuOptsList *vm_config_groups[32] = {
&qemu_drive_opts,
&qemu_chardev_opts,