[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 8/9] spice: add display & head options
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 8/9] spice: add display & head options |
Date: |
Mon, 27 Feb 2017 17:18:42 +0100 |
This allows to specify display and head to use, simliar to vnc.
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
ui/spice-core.c | 6 ++++++
ui/spice-display.c | 22 +++++++++++++++++++++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 39ccab7..804abc5 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -497,6 +497,12 @@ static QemuOptsList qemu_spice_opts = {
},{
.name = "seamless-migration",
.type = QEMU_OPT_BOOL,
+ },{
+ .name = "display",
+ .type = QEMU_OPT_STRING,
+ },{
+ .name = "head",
+ .type = QEMU_OPT_NUMBER,
#ifdef HAVE_SPICE_GL
},{
.name = "gl",
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 23ccf2a..b353445 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -1035,9 +1035,26 @@ static void qemu_spice_display_init_one(QemuConsole *con)
void qemu_spice_display_init(void)
{
- QemuConsole *con;
+ QemuOptsList *olist = qemu_find_opts("spice");
+ QemuOpts *opts = QTAILQ_FIRST(&olist->head);
+ QemuConsole *spice_con, *con;
+ const char *str;
int i;
+ str = qemu_opt_get(opts, "display");
+ if (str) {
+ int head = qemu_opt_get_number(opts, "head", 0);
+ Error *err = NULL;
+
+ spice_con = qemu_console_lookup_by_device_name(str, head, &err);
+ if (err) {
+ error_report("Failed to lookup display/head");
+ exit(1);
+ }
+ } else {
+ spice_con = NULL;
+ }
+
for (i = 0;; i++) {
con = qemu_console_lookup_by_index(i);
if (!con || !qemu_console_is_graphic(con)) {
@@ -1046,6 +1063,9 @@ void qemu_spice_display_init(void)
if (qemu_spice_have_display_interface(con)) {
continue;
}
+ if (spice_con != NULL && spice_con != con) {
+ continue;
+ }
qemu_spice_display_init_one(con);
}
}
--
1.8.3.1
- [Qemu-devel] [PULL 0/9] ui patch queue, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 2/9] console: add dpy_gl_scanout_disable, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 3/9] virtio-gpu: use dpy_gl_scanout_disable, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 5/9] sdl2: add scanout_disable support, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 4/9] spice: add scanout_disable support, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 6/9] gtk-egl: add scanout_disable support, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 8/9] spice: add display & head options,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 9/9] vnc: fix double free issues, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 7/9] ui: Use XkbGetMap and XkbGetNames instead of XkbGetKeyboard, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 1/9] console: rename dpy_gl_scanout to dpy_gl_scanout_texture, Gerd Hoffmann, 2017/02/27
- Re: [Qemu-devel] [PULL 0/9] ui patch queue, Peter Maydell, 2017/02/28