[Qemu-devel] [PULL for-2.2 0/2] gtk: two bugfixes for 2.2.

[Qemu-devel] [PULL for-2.2 0/2] gtk: two bugfixes for 2.2.

[Gerd Hoffmann]

  Hi,

Two gtk bugfixes for 2.2.

please pull,
  Gerd

The following changes since commit 9c7074da5ec64e1fd61df881ab291f75541ff2b0:

  hw/arm/virt: set stdout-path instead of linux,stdout-path (2014-11-20 14:58:37 +0000)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/pull-gtk-20141121-1

for you to fetch changes up to b310a2a6095ec927a42cc1aba520a316be0faf51:

  gtk: Don't crash if -nodefaults (2014-11-21 08:37:59 +0100)

----------------------------------------------------------------
gtk: two bugfixes for 2.2.

----------------------------------------------------------------
Fam Zheng (1):
      gtk: Don't crash if -nodefaults

zhanghailiang (1):
      gtk: fix possible memory leak about local_err

 ui/gtk.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

[Qemu-devel] [PULL for-2.2 1/2] gtk: fix possible memory leak about local_err

[Gerd Hoffmann]

From: zhanghailiang <zhang.zhanghailiang@huawei.com>

local_err in gd_vc_gfx_init() is not freed, and we don't use it,
so remove it.

Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/gtk.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index 38bf463..9496b8d 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1666,10 +1666,9 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
                               QemuConsole *con, int idx,
                               GSList *group, GtkWidget *view_menu)
 {
-    Error *local_err = NULL;
     Object *obj;
 
-    obj = object_property_get_link(OBJECT(con), "device", &local_err);
+    obj = object_property_get_link(OBJECT(con), "device", NULL);
     if (obj) {
         vc->label = g_strdup_printf("%s", object_get_typename(obj));
     } else {
-- 
1.8.3.1

[Qemu-devel] [PULL for-2.2 2/2] gtk: Don't crash if -nodefaults

[Gerd Hoffmann]

From: Fam Zheng <famz@redhat.com>

This fixes a crash by just skipping the vte resize hack if cur is NULL.

Reproducer:

qemu-system-x86_64 -nodefaults

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/gtk.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index 9496b8d..0385757 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1909,15 +1909,17 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
 #ifdef VTE_RESIZE_HACK
     {
         VirtualConsole *cur = gd_vc_find_current(s);
-        int i;
-
-        for (i = 0; i < s->nb_vcs; i++) {
-            VirtualConsole *vc = &s->vc[i];
-            if (vc && vc->type == GD_VC_VTE && vc != cur) {
-                gtk_widget_hide(vc->vte.terminal);
+        if (cur) {
+            int i;
+
+            for (i = 0; i < s->nb_vcs; i++) {
+                VirtualConsole *vc = &s->vc[i];
+                if (vc && vc->type == GD_VC_VTE && vc != cur) {
+                    gtk_widget_hide(vc->vte.terminal);
+                }
             }
+            gd_update_windowsize(cur);
         }
-        gd_update_windowsize(cur);
     }
 #endif
 
-- 
1.8.3.1

Re: [Qemu-devel] [PULL for-2.2 0/2] gtk: two bugfixes for 2.2.

[Peter Maydell]

On 21 November 2014 09:25, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Two gtk bugfixes for 2.2.
>
> please pull,
>   Gerd
>
> The following changes since commit 9c7074da5ec64e1fd61df881ab291f75541ff2b0:
>
>   hw/arm/virt: set stdout-path instead of linux,stdout-path (2014-11-20 14:58:37 +0000)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/pull-gtk-20141121-1
>
> for you to fetch changes up to b310a2a6095ec927a42cc1aba520a316be0faf51:
>
>   gtk: Don't crash if -nodefaults (2014-11-21 08:37:59 +0100)
>
> ----------------------------------------------------------------
> gtk: two bugfixes for 2.2.
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM