handling guest multiple displays
cover handling guest multiple displays
This patch seires is for adding some useful features for the guest os with multi-displays. First patch is to make all of guest displays visible when guest os is launched using "detach". Second patch is for providing a method to assign each guest display to specific physical monitor, which would be useful if someone wants to directly full-screen individual guest scanouts to host's physical displays.
Dongwon Kim (2):
ui/gtk: detach VCS for additional guest displays ui/gtk: a new array param monitor to specify the target displays
qapi/ui.json | 7 ++++++- qemu-options.hx | 2 +- ui/gtk.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 48 insertions(+), 4 deletions(-)
Signature · 1 line
2.30.2
PATCH 1/2 ui/gtk: detach VCS for additional guest displays
Detaching any addtional guest displays in case there are multiple displays assigned to the guest OS (e.g. max_outputs=n) so that all of them are visible upon lauching.
--- ui/gtk.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
ui/gtk.c +10 -1
@@ -2304,6 +2304,8 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)GtkDisplayState *s =g_malloc0 (sizeof (*s));GdkDisplay *window_display;GtkIconTheme *theme; +int n_gfx_vcs =0 ; +int i;char *dir;if (!gtkinit) {
@@ -2374,7 +2376,14 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)gtk_widget_set_sensitive (s->copy_item, vc && vc->type ==GD_VC_VTE );#endif - +for (i =0 ; i < s->nb_vcs; i++) { +if (qemu_console_is_graphic (s->vc[i].gfx.dcl.con)) { +if (n_gfx_vcs >0 ) { +gtk_menu_item_activate (GTK_MENU_ITEM (s->untabify_item)); + } + n_gfx_vcs++; + } + }if (opts->has_full_screen && opts->full_screen) {gtk_menu_item_activate (GTK_MENU_ITEM (s->full_screen_item));
Signature · 1 line
2.30.2
Re: [PATCH 1/2] ui/gtk: detach VCS for additional guest displays
Quoted 11 lines · Dongwon Kim
Detaching any addtional guest displays in case there are multiple displays assigned to the guest OS (e.g. max_outputs=n) so that all of them are visible upon lauching.
Cc Daniel P. Berrangé <[email protected]>Cc Markus Armbruster <[email protected]>Cc Philippe Mathieu-Daudé <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Gerd Hoffmann <[email protected]>Cc Vivek Kasireddy <[email protected]>Signed-off-by Dongwon Kim <[email protected]>
Quoted 3 lines
--- ui/gtk.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 1/2] ui/gtk: detach VCS for additional guest displays
In reply to Dongwon KimQuoted 29 lines · Dongwon Kim
Detaching any addtional guest displays in case there are multiple displays assigned to the guest OS (e.g. max_outputs=n) so that all of them are visible upon lauching.
Cc Daniel P. Berrangé <[email protected]>Cc Markus Armbruster <[email protected]>Cc Philippe Mathieu-Daudé <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Gerd Hoffmann <[email protected]>Cc Vivek Kasireddy <[email protected]>Signed-off-by Dongwon Kim <[email protected]>--- ui/gtk.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)ui/gtk.c +2
-0@@ -2304,6 +2304,8 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)GtkDisplayState *s =g_malloc0 (sizeof (*s));GdkDisplay *window_display;GtkIconTheme *theme; +int n_gfx_vcs =0 ; +int i;char *dir;if (!gtkinit) {
ui/gtk.c static void gtk_display_init(DisplayState *ds, DisplayOptions *opts) · line 2380
Quoted 6 lines
ui/gtk.c +2
-1@@ -2374,7 +2376,14 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)gtk_widget_set_sensitive (s->copy_item, vc && vc->type ==GD_VC_VTE );#endif - +for (i =0 ; i < s->nb_vcs; i++) { +if (qemu_console_is_graphic (s->vc[i].gfx.dcl.con)) {
Accessing vc[i].gfx without checking vc[i].type beforehand is wrong.
Also note that graphical consoles are sorted to the head of the list. n_gfx_vcs should not be needed because the primary gfx display has index 0 no matter what.
take care,
Gerd
PATCH 2/2 ui/gtk: a new array param monitor to specify the target displays
In reply to Dongwon KimNew integer array parameter, 'monitor' is for specifying the target displays where individual QEMU windows are placed upon launching.
The array contains a series of numbers representing the monitor where QEMU windows are placed.
Numbers in the array are mapped to QEMU windows like,
[1st detached window, 2nd detached window,.... Main window]
Usage example: -display gtk,monitor.0=0,monitor.1=1.....
--- qapi/ui.json | 7 ++++++- qemu-options.hx | 2 +- ui/gtk.c | 32 +++++++++++++++++++++++++++++++- 3 files changed, 38 insertions(+), 3 deletions(-)
qapi/ui.json +6 -1
@@ -1195,12 +1195,17 @@ # assuming the guest will resize the display to match # the window size then. Otherwise it defaults to "off". # Since 3.1 +# @monitor: Array of numbers, each of which represents physical +# monitor where individual QEMU window is placed in case +# there are multiple of them +# since 7.1 # # Since: 2.12 ## { 'struct' : 'DisplayGTK', 'data' : { '*grab-on-hover' : 'bool', - '*zoom-to-fit' : 'bool' } } + '*zoom-to-fit' : 'bool', + '*monitor' : ['uint16'] } } ## # @DisplayEGLHeadless:
qemu-options.hx +1 -1
@@ -1943,7 +1943,7 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, #endif #if defined(CONFIG_GTK) "-display gtk[,full-screen=on|off][,gl=on|off][,grab-on-hover=on|off]\n" - " [,show-cursor=on|off][,window-close=on|off]\n" + " [,monitor.<order>=<value>][,show-cursor=on|off][,window-close=on|off]\n" #endif #if defined(CONFIG_VNC) "-display vnc=<display>[,<optargs>]\n"
ui/gtk.c +31 -1
@@ -2304,6 +2304,10 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)GtkDisplayState *s =g_malloc0 (sizeof (*s));GdkDisplay *window_display;GtkIconTheme *theme; +GtkWidget *win; +GdkRectangle dest; +uint16List *mon; +int n_mon;int n_gfx_vcs =0 ;int i;char *dir;
@@ -2384,7 +2388,33 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts) n_gfx_vcs++; } } -if (opts->has_full_screen && +if (opts->u.gtk.has_monitor) { + i =0 ; + n_mon =gdk_display_get_n_monitors (window_display); +for (mon = opts->u.gtk.monitor; mon; mon = mon->next) { +if (mon->value < n_mon) { +for (; i < s->nb_vcs; i++) { + win = s->vc[i].window ? s->vc[i].window : s->window; +if (opts->has_full_screen && opts->full_screen) { +gtk_window_fullscreen_on_monitor ( +GTK_WINDOW (win), +gdk_display_get_default_screen (window_display), + mon->value); + }else { +gdk_monitor_get_geometry ( +gdk_display_get_monitor (window_display, mon->value), + &dest); +gtk_window_move (GTK_WINDOW (win), + dest.x, dest.y); + } + i++; +break ; + } + } + } + } +if (!opts->u.gtk.has_monitor && + opts->has_full_screen && opts->full_screen) {gtk_menu_item_activate (GTK_MENU_ITEM (s->full_screen_item)); }
Signature · 1 line
2.30.2
Re: [PATCH 2/2] ui/gtk: a new array param monitor to specify the target displays
Quoted 19 lines · Dongwon Kim
New integer array parameter, 'monitor' is for specifying the target displays where individual QEMU windows are placed upon launching.
The array contains a series of numbers representing the monitor where QEMU windows are placed.
Numbers in the array are mapped to QEMU windows like,
[1st detached window, 2nd detached window,.... Main window]
Usage example: -display gtk,monitor.0=0,monitor.1=1.....
Cc Daniel P. Berrangé <[email protected]>Cc Markus Armbruster <[email protected]>Cc Philippe Mathieu-Daudé <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Gerd Hoffmann <[email protected]>Cc Vivek Kasireddy <[email protected]>Signed-off-by Dongwon Kim <[email protected]>
Quoted 5 lines
--- qapi/ui.json | 7 ++++++- qemu-options.hx | 2 +- ui/gtk.c | 32 +++++++++++++++++++++++++++++++- 3 files changed, 38 insertions(+), 3 deletions(-)
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 2/2] ui/gtk: a new array param monitor to specify the target displays
Quoted 26 lines · Daniel P. Berrangé
Quoted 19 lines · Dongwon Kim
New integer array parameter, 'monitor' is for specifying the target displays where individual QEMU windows are placed upon launching.
The array contains a series of numbers representing the monitor where QEMU windows are placed.
Numbers in the array are mapped to QEMU windows like,
[1st detached window, 2nd detached window,.... Main window]
Usage example: -display gtk,monitor.0=0,monitor.1=1.....
Cc Daniel P. Berrangé <[email protected]>Cc Markus Armbruster <[email protected]>Cc Philippe Mathieu-Daudé <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Gerd Hoffmann <[email protected]>Cc Vivek Kasireddy <[email protected]>Signed-off-by Dongwon Kim <[email protected]>Quoted 5 lines
--- qapi/ui.json | 7 ++++++- qemu-options.hx | 2 +- ui/gtk.c | 32 +++++++++++++++++++++++++++++++- 3 files changed, 38 insertions(+), 3 deletions(-)
Quoted 1 line
Reviewed-by Daniel P. Berrangé <[email protected]>
Thanks, queued up series.
take care,
Gerd
Re: [PATCH 2/2] ui/gtk: a new array param monitor to specify the target displays
In reply to Dongwon KimQuoted 11 lines · Dongwon Kim
New integer array parameter, 'monitor' is for specifying the target displays where individual QEMU windows are placed upon launching.
The array contains a series of numbers representing the monitor where QEMU windows are placed.
Numbers in the array are mapped to QEMU windows like,
[1st detached window, 2nd detached window,.... Main window]
Usage example: -display gtk,monitor.0=0,monitor.1=1.....
Both patches look good to me.
qapi/ui.json line 1208
Quoted 12 lines
qapi/ui.json +6
-1+# @monitor: Array of numbers, each of which represents physical +# monitor where individual QEMU window is placed in case +# there are multiple of them +# since 7.1 # # Since: 2.12 ## { 'struct' : 'DisplayGTK', 'data' : { '*grab-on-hover' : 'bool', - '*zoom-to-fit' : 'bool' } } + '*zoom-to-fit' : 'bool', + '*monitor' : ['uint16'] } }
This is what we've agreed to, so I guess this is fine with the QAPI maintainers too? Can I have an ack then?
thanks,
Gerd
Re: [PATCH 2/2] ui/gtk: a new array param monitor to specify the target displays
In reply to Dongwon KimQuoted 11 lines · Dongwon Kim
New integer array parameter, 'monitor' is for specifying the target displays where individual QEMU windows are placed upon launching.
The array contains a series of numbers representing the monitor where QEMU windows are placed.
Numbers in the array are mapped to QEMU windows like,
[1st detached window, 2nd detached window,.... Main window]
Usage example: -display gtk,monitor.0=0,monitor.1=1.....
Depends on patch #1, so dropped both. Please fix patch #1, rebase & resend.
thanks,
Gerd