[Qemu-devel] [PULL 0/5] ui: misc bug fixes

[Qemu-devel] [PULL 0/5] ui: misc bug fixes

[Gerd Hoffmann]

  Hi,

Here comes the ui patch queue with a collection of bugfixes.

please pull,
  Gerd

The following changes since commit 0c33682d5f29b0a4ae53bdec4c8e52e4fae37b34:

  target-i386: Move user-mode exception actions out of user-exec.c (2016-06-09 15:55:02 +0100)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/pull-ui-20160610-1

for you to fetch changes up to 1185fde40c3ba02406665b9ee0743270c526be26:

  console: ignore ui_info updates which don't actually update something (2016-06-10 11:16:18 +0200)

----------------------------------------------------------------
ui: misc bug fixes.

----------------------------------------------------------------
Daniel P. Berrange (1):
      ui: fix regression in printing VNC host/port on startup

Gerd Hoffmann (2):
      vnc: drop unused depth arg for set_pixel_format
      console: ignore ui_info updates which don't actually update something

Olaf Hering (1):
      gtk: fix vte version check

Thomas Huth (1):
      ui/console-gl: Add support for big endian display surfaces

 ui/console-gl.c | 5 +++++
 ui/console.c    | 7 ++++++-
 ui/gtk.c        | 2 +-
 ui/vnc.c        | 8 +++-----
 4 files changed, 15 insertions(+), 7 deletions(-)

[Qemu-devel] [PULL 1/5] vnc: drop unused depth arg for set_pixel_format

[Gerd Hoffmann]

Spotted by Coverity.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1465204725-31562-1-git-send-email-kraxel@redhat.com
---
 ui/vnc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ui/vnc.c b/ui/vnc.c
index c862fdc..942cfb9 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2115,8 +2115,7 @@ static void send_color_map(VncState *vs)
     }
 }
 
-static void set_pixel_format(VncState *vs,
-                             int bits_per_pixel, int depth,
+static void set_pixel_format(VncState *vs, int bits_per_pixel,
                              int big_endian_flag, int true_color_flag,
                              int red_max, int green_max, int blue_max,
                              int red_shift, int green_shift, int blue_shift)
@@ -2124,7 +2123,6 @@ static void set_pixel_format(VncState *vs,
     if (!true_color_flag) {
         /* Expose a reasonable default 256 color map */
         bits_per_pixel = 8;
-        depth = 8;
         red_max = 7;
         green_max = 7;
         blue_max = 3;
@@ -2231,7 +2229,7 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len)
         if (len == 1)
             return 20;
 
-        set_pixel_format(vs, read_u8(data, 4), read_u8(data, 5),
+        set_pixel_format(vs, read_u8(data, 4),
                          read_u8(data, 6), read_u8(data, 7),
                          read_u16(data, 8), read_u16(data, 10),
                          read_u16(data, 12), read_u8(data, 14),
-- 
1.8.3.1

[Qemu-devel] [PULL 2/5] ui: fix regression in printing VNC host/port on startup

[Gerd Hoffmann]

From: "Daniel P. Berrange" <berrange@redhat.com>

If VNC is chosen as the compile time default display backend,
QEMU will print the host/port it listens on at startup.
Previously this would look like

  VNC server running on '::1:5900'

but in 04d2529da27db512dcbd5e99d0e26d333f16efcc the ':' was
accidentally replaced with a ';'. This the ':' back.

Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1465382576-25552-1-git-send-email-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/vnc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/vnc.c b/ui/vnc.c
index 942cfb9..95e4db7 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3223,7 +3223,7 @@ char *vnc_display_local_addr(const char *id)
         qapi_free_SocketAddress(addr);
         return NULL;
     }
-    ret = g_strdup_printf("%s;%s", addr->u.inet.data->host,
+    ret = g_strdup_printf("%s:%s", addr->u.inet.data->host,
                           addr->u.inet.data->port);
     qapi_free_SocketAddress(addr);
 
-- 
1.8.3.1

[Qemu-devel] [PULL 3/5] gtk: fix vte version check

[Gerd Hoffmann]

From: Olaf Hering <olaf@aepfle.de>

vte_terminal_set_encoding takes 3 args since 0.38.0.
This fixes commit fba958c6 ("gtk: implement set_echo")

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Message-id: 20160608214352.32669-1-olaf@aepfle.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/gtk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index 01b8216..58d20ee 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1748,7 +1748,7 @@ static GSList *gd_vc_vte_init(GtkDisplayState *s, VirtualConsole *vc,
     /* The documentation says that the default is UTF-8, but actually it is
      * 7-bit ASCII at least in VTE 0.38.
      */
-#if VTE_CHECK_VERSION(0, 40, 0)
+#if VTE_CHECK_VERSION(0, 38, 0)
     vte_terminal_set_encoding(VTE_TERMINAL(vc->vte.terminal), "UTF-8", NULL);
 #else
     vte_terminal_set_encoding(VTE_TERMINAL(vc->vte.terminal), "UTF-8");
-- 
1.8.3.1

[Qemu-devel] [PULL 4/5] ui/console-gl: Add support for big endian display surfaces

[Gerd Hoffmann]

From: Thomas Huth <thuth@redhat.com>

This is required for running QEMU on big endian hosts (like
PowerPC machines) that use RGB instead of BGR byte ordering.

Ticket: https://bugs.launchpad.net/qemu/+bug/1581796
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-id: 1465243261-26731-1-git-send-email-thuth@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/console-gl.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/console-gl.c b/ui/console-gl.c
index 74b1bed..5165e21 100644
--- a/ui/console-gl.c
+++ b/ui/console-gl.c
@@ -88,6 +88,11 @@ void surface_gl_create_texture(ConsoleGLState *gls,
         surface->glformat = GL_BGRA_EXT;
         surface->gltype = GL_UNSIGNED_BYTE;
         break;
+    case PIXMAN_BE_x8r8g8b8:
+    case PIXMAN_BE_a8r8g8b8:
+        surface->glformat = GL_RGBA;
+        surface->gltype = GL_UNSIGNED_BYTE;
+        break;
     case PIXMAN_r5g6b5:
         surface->glformat = GL_RGB;
         surface->gltype = GL_UNSIGNED_SHORT_5_6_5;
-- 
1.8.3.1

[Qemu-devel] [PULL 5/5] console: ignore ui_info updates which don't actually update something

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1464597673-26464-1-git-send-email-kraxel@redhat.com
---
 ui/console.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/console.c b/ui/console.c
index bf38579..ce1e105 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1453,16 +1453,21 @@ bool dpy_ui_info_supported(QemuConsole *con)
 int dpy_set_ui_info(QemuConsole *con, QemuUIInfo *info)
 {
     assert(con != NULL);
-    con->ui_info = *info;
+
     if (!dpy_ui_info_supported(con)) {
         return -1;
     }
+    if (memcmp(&con->ui_info, info, sizeof(con->ui_info)) == 0) {
+        /* nothing changed -- ignore */
+        return 0;
+    }
 
     /*
      * Typically we get a flood of these as the user resizes the window.
      * Wait until the dust has settled (one second without updates), then
      * go notify the guest.
      */
+    con->ui_info = *info;
     timer_mod(con->ui_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + 1000);
     return 0;
 }
-- 
1.8.3.1

Re: [Qemu-devel] [PULL 0/5] ui: misc bug fixes

[Peter Maydell]

On 10 June 2016 at 10:58, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Here comes the ui patch queue with a collection of bugfixes.
>
> please pull,
>   Gerd
>
> The following changes since commit 0c33682d5f29b0a4ae53bdec4c8e52e4fae37b34:
>
>   target-i386: Move user-mode exception actions out of user-exec.c (2016-06-09 15:55:02 +0100)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/pull-ui-20160610-1
>
> for you to fetch changes up to 1185fde40c3ba02406665b9ee0743270c526be26:
>
>   console: ignore ui_info updates which don't actually update something (2016-06-10 11:16:18 +0200)
>
> ----------------------------------------------------------------
> ui: misc bug fixes.
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM