qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 7bd43e: slirp: Properly initialize pollfds_id


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 7bd43e: slirp: Properly initialize pollfds_idx of new sock...
Date: Tue, 26 Feb 2013 14:30:14 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7bd43ec2dd3ffaa12e6331af41fc55d4b2b12f13
      
https://github.com/qemu/qemu/commit/7bd43ec2dd3ffaa12e6331af41fc55d4b2b12f13
  Author: Jan Kiszka <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M slirp/socket.c

  Log Message:
  -----------
  slirp: Properly initialize pollfds_idx of new sockets

Otherwise we may start processing sockets in slirp_pollfds_poll that
were created past slirp_pollfds_fill.

Signed-off-by: Jan Kiszka <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: f963e4d0ca5b7704aed8048e2bc293597d333dfb
      
https://github.com/qemu/qemu/commit/f963e4d0ca5b7704aed8048e2bc293597d333dfb
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  gtk ui: unbreak spice

Merge of the gtk ui brought a initialitation order issue for spice:
The using_spice variable isn't set yet when checked, leading to the
default UI being activated (additionally to spice remote access).

Let's set display_remote when we find a -spice switch on the command
line, like we do for vnc.

Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: cba68834c69f2d0fd04127301171fedac63d9b67
      
https://github.com/qemu/qemu/commit/cba68834c69f2d0fd04127301171fedac63d9b67
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  Add compat for gdk_drawable_get_size on GTK3

GTK3 lacks the gdk_drawable_get_size method, so we create a
stub impl which gets the get_width/get_height mehtods instead

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 66962f14378d0adf2e7d0fcfac66e2248b09bb4d
      
https://github.com/qemu/qemu/commit/66962f14378d0adf2e7d0fcfac66e2248b09bb4d
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  Remove use of gdk_drawable_get_{screen, display}

The gdk_drawable_get_screen and gdk_drawable_get_display
methods don't exist in GDK3. Fortunately, even on GTK2
they are not required - we can call the equivalent
gtk_widget_get_screen/gtk_widget_get_display methods
which have existed since GTK 2.2

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 655199da197d2c3407d4bc937c9d3d3ac4551764
      
https://github.com/qemu/qemu/commit/655199da197d2c3407d4bc937c9d3d3ac4551764
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  Conditionalize use of gdk_keyboard_grab / gdk_keyboard_ungrab

On GTK3 there is support for multiple keyboard devices, so
rather than using  gdk_keyboard_grab / gdk_keyboard_ungrab
we should iterate over all devices, grabbing each one in
turn

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 2a05485d72504ed92ce91dffd1f5867974c47ff0
      
https://github.com/qemu/qemu/commit/2a05485d72504ed92ce91dffd1f5867974c47ff0
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  Conditionalize use of gdk_pointer_grab / gdk_pointer_ungrab

On GTK3 there is support for multiple pointer devices, so
rather than using  gdk_pointer_grab / gdk_pointer_ungrab
we should iterate over all devices, grabbing each one in
turn

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 51572ab087b900ea67cc25f1c49dae4112274221
      
https://github.com/qemu/qemu/commit/51572ab087b900ea67cc25f1c49dae4112274221
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  Remove use of GtkVBox in GTK3

The GtkVBox class is deprecated, in favour of just using the
GtkBox class directly. Eventually even GtkBox will be
deprecated in favour of GtkGrid, but that is a bigger fix
which can wait.

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 530daf82c129c2a8a6fa757b3ef5a21f1f50f66a
      
https://github.com/qemu/qemu/commit/530daf82c129c2a8a6fa757b3ef5a21f1f50f66a
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  Replace gtk_menu_append with gtk_menu_shell_append

The gtk_menu_append method has long been deprecated in favour
of the gtk_menu_shell_append method. The former is now entirely
gone in GTK3, so switch all code to the latter which works on
both GTK2 and GTK3

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 8906de769be0978fed31a0341d0a5829a4ef7ecf
      
https://github.com/qemu/qemu/commit/8906de769be0978fed31a0341d0a5829a4ef7ecf
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  Conditionalize use of gdk_display_warp_pointer

In GTK3 the gdk_display_warp_pointer method is deprecated.
Instead we should use gdk_device_warp on the GdkDevice
instead associated with the event being processed.

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 1ed76b59c4f8670eb06df48cebe086da06111e1f
      
https://github.com/qemu/qemu/commit/1ed76b59c4f8670eb06df48cebe086da06111e1f
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  Conditionalize use of gtk_widget_size_request

The gtk_widget_size_request method has been replaced by
the gtk_widget_get_preferred_size method in GTK3. Conditionally
call the new method in GTK3

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: fe43bca85b269314b007cd9b2eecc4a52aa73dde
      
https://github.com/qemu/qemu/commit/fe43bca85b269314b007cd9b2eecc4a52aa73dde
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  Replace expose-event handler with draw handler in GTK3

In GTK3 the 'expose-event' signal has been replaced by a new
'draw' signal. The only difference is that the latter will
pre-create the cairo drawing context & set the clip mask.
Since the drawing code is already structured in a nice way,
we can just wire up the 'gd_draw_event' method to the 'draw'
signal in GTK3

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 0d20664018a401120af28ff80ac8d22fbc887956
      
https://github.com/qemu/qemu/commit/0d20664018a401120af28ff80ac8d22fbc887956
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ui/Makefile.objs

  Log Message:
  -----------
  Ensure x_keymap.o is built when GTK is enabled

The x_keymap.o file is required by both GTK and SDL builds,
so it must be explicitly listed as a GTK dep to ensure the
linker works when SDL is disabled

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 528de90ab7133e22df7c1da4632a6dcd525e88f0
      
https://github.com/qemu/qemu/commit/528de90ab7133e22df7c1da4632a6dcd525e88f0
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M configure

  Log Message:
  -----------
  Add support for enabling build with GTK3

Add a arg to configure to switch from GTK2 (default) to
GTK3 (optional) build for QEMU.

  ./configure --with-gtkabi=3.0

will choose GTK3, while

  ./configure --with-gtkabi=2.0

will choose GTK2 (and remains the current default)

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: ef6413a2a833abe24aae072bd59c7434969fc59d
      
https://github.com/qemu/qemu/commit/ef6413a2a833abe24aae072bd59c7434969fc59d
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  Add compat macro for gtk_widget_get_realized

The gtk_widget_get_realized method only arrived in GTK 2.20,
so defined a compat macro for earlier GTK

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: bc0477c7d6445730b22e733ad4a65f0cc23fa405
      
https://github.com/qemu/qemu/commit/bc0477c7d6445730b22e733ad4a65f0cc23fa405
  Author: Daniel P. Berrange <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  Add compat for GDK_KEY_XXX symbols

The GDK_KEY_XXX symbols are new in GTK3 and only the most
recent GTK2 releases. Most versions of GTK2 have simply
used GDK_XXX

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: ab4004495cb1cf38ab2e35f84ee54e669e2ad08a
      
https://github.com/qemu/qemu/commit/ab4004495cb1cf38ab2e35f84ee54e669e2ad08a
  Author: Hu Tao <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M configure

  Log Message:
  -----------
  show --disable-gtk and --enable-gtk in the help message

Signed-off-by: Hu Tao <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 989b697ddd46769b0999e8cd16b5ecd393204734
      
https://github.com/qemu/qemu/commit/989b697ddd46769b0999e8cd16b5ecd393204734
  Author: Peter Maydell <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M bsd-user/main.c
    M hmp-commands.hx
    M include/qemu/log.h
    M linux-user/main.c
    M qemu-doc.texi
    M qemu-log.c
    M qemu-options.hx
    M tcg/tci/README

  Log Message:
  -----------
  qemu-log: default to stderr for logging output

Switch the default for qemu_log logging output from "/tmp/qemu.log"
to stderr. This is an incompatible change in some sense, but logging
is mostly used for debugging purposes so it shouldn't affect production
use. The previous behaviour can be obtained by adding "-D /tmp/qemu.log"
to the command line.

This change requires us to:
 * update all the documentation/help text (we take the opportunity
   to smooth out minor inconsistencies between the phrasing in
   linux-user/bsd-user/system help messages)
 * make linux-user and bsd-user defer to qemu-log for the default
   logging destination rather than overriding it themselves
 * ensure that all logfile closing is done via qemu_log_close()
   and that that function doesn't close stderr
as well as the obvious change to the behaviour of do_qemu_set_log()
when no logfile name has been specified.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 31e76f65a98e1502cbfd362eed5768c48e264c23
      
https://github.com/qemu/qemu/commit/31e76f65a98e1502cbfd362eed5768c48e264c23
  Author: Alexander Graf <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M include/qemu-common.h

  Log Message:
  -----------
  glib: Add compat wrapper for g_poll on old glib

Older glib doesn't implement g_poll(). Most notably the glib version in use
on SLE11 is on 2.18 which is hit by this.

We do want to use g_poll() in the source however. So on older systems, just
wrap it with functions that do exist on older versions.

Signed-off-by: Anthony Liguori <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: ee24aaf356f44ca7c8fbef136a438c12091cffd0
      
https://github.com/qemu/qemu/commit/ee24aaf356f44ca7c8fbef136a438c12091cffd0
  Author: Anthony Liguori <address@hidden>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M slirp/socket.c

  Log Message:
  -----------
  Merge remote-tracking branch 'kiszka/queues/slirp' into staging

# By Jan Kiszka
# Via Jan Kiszka
* kiszka/queues/slirp:
  slirp: Properly initialize pollfds_idx of new sockets


Compare: https://github.com/qemu/qemu/compare/864a556e9a80...ee24aaf356f4

reply via email to

[Prev in Thread] Current Thread [Next in Thread]