mbox

[PULL,00/16,for-1.7] Trivial patches for 2013-11-13

Message ID 1384347680-15976-1-git-send-email-mjt@msgid.tls.msk.ru
State New
Headers show

Pull-request

git://git.corpit.ru/qemu.git trivial-patches

Message

Michael Tokarev Nov. 13, 2013, 1:01 p.m. UTC
Here's a next trivial-patches pull request, for patches collected
in almost 3 weeks.

There's nothing extra-ordinary here, except of one thing: this is
keyboard maps handling series by Jan Krupa.  While I don't expect
any breakage in this area, but the series introduces a new keymap
(cz), fixes other keymaps by adding symbol definitions used in there
to qemu, and adds some functionality which may be helpful when
working with keymaps (like recognizing (only basic) unicode chars
in form of Uxxxx).  I haven't heard anything about this series
from anyone else, except of the comments from Anthony that the
whole kbd handling needs some major restructuring/changing, so
I still don't understand whenever applying this is a good idea
or not.  If you think it is not a good idea, I can easily prepare
another pull request without these changes.

There are a few other changes which potentially might be a bit
dangerous, like the trace.h include changes by Stefan Weil --
while these changes look fine, there's still a remote chance
that one of them will break build in some configuration or platform.
Maybe it is not a good idea to apply this at such late point in
the release cycle.  I verified these, but I haven't tested all
platforms, especially win*.

Please consider applying.

Thanks,

/mjt

The following changes since commit 964668b03d26f0b5baa5e5aff0c966f4fcb76e9e:

  Update version for 1.7.0-rc0 release (2013-11-06 21:49:39 -0800)

are available in the git repository at:

  git://git.corpit.ru/qemu.git trivial-patches

for you to fetch changes up to e239f1ce7690065e16e2a2ec9baf6d9b66ca5efb:

  qga: Fix shutdown command of guest agent to work with SysV (2013-11-13 16:05:11 +0400)

----------------------------------------------------------------
Alex Bennée (1):
      .travis.yml: basic compile and check recipes

Antony Pavlov (1):
      vl: fix build when configured with no graphic support

Cole Robinson (1):
      pci-assign: Fix error_report of pci-stub message

Fam Zheng (1):
      qapi: Fix comment for create-type to match code.

Jan Krupa (4):
      qemu-char: add Czech characters to VNC keysyms
      qemu-char: add Czech keymap file
      qemu-char: add support for U-prefixed symbols
      qemu-char: add missing characters used in keymaps

Stefan Hajnoczi (1):
      usb: drop unused USBNetState.inpkt field

Stefan Weil (6):
      qga: Fix compilation for old versions of MinGW
      console: Remove unused debug code
      trace: Remove trace.h from console.h (less dependencies)
      trace: Remove trace.h from hw/usb/hcd-ehci.h (less dependencies)
      console: Replace conditional debug messages by trace methods
      gtk: Replace conditional debug messages by trace methods

whitearchey (1):
      qga: Fix shutdown command of guest agent to work with SysV

 .travis.yml               |   71 +++++++++
 Makefile                  |    2 +-
 hw/display/vmware_vga.c   |    1 +
 hw/i386/kvm/pci-assign.c  |   36 ++---
 hw/usb/dev-network.c      |    1 -
 hw/usb/hcd-ehci.c         |    1 +
 hw/usb/hcd-ehci.h         |    1 -
 include/ui/console.h      |    1 -
 pc-bios/keymaps/cz        |   94 ++++++++++++
 qapi-schema.json          |    2 +-
 qga/commands-posix.c      |    2 +-
 qga/vss-win32/requester.h |    1 +
 trace-events              |    7 +
 ui/console.c              |   45 +-----
 ui/gtk.c                  |   19 +--
 ui/keymaps.c              |    6 +
 ui/vnc_keysym.h           |  373 +++++++++++++++++++++++++++++++++++++++++++++
 vl.c                      |    1 +
 18 files changed, 583 insertions(+), 81 deletions(-)
 create mode 100644 .travis.yml
 create mode 100644 pc-bios/keymaps/cz

Comments

Stefan Weil Nov. 13, 2013, 6:05 p.m. UTC | #1
Am 13.11.2013 14:01, schrieb Michael Tokarev:
> Here's a next trivial-patches pull request, for patches collected
> in almost 3 weeks.
>
> There's nothing extra-ordinary here, except of one thing: this is
> keyboard maps handling series by Jan Krupa.  While I don't expect
> any breakage in this area, but the series introduces a new keymap
> (cz), fixes other keymaps by adding symbol definitions used in there
> to qemu, and adds some functionality which may be helpful when
> working with keymaps (like recognizing (only basic) unicode chars
> in form of Uxxxx).  I haven't heard anything about this series
> from anyone else, except of the comments from Anthony that the
> whole kbd handling needs some major restructuring/changing, so
> I still don't understand whenever applying this is a good idea
> or not.  If you think it is not a good idea, I can easily prepare
> another pull request without these changes.
>
> There are a few other changes which potentially might be a bit
> dangerous, like the trace.h include changes by Stefan Weil --
> while these changes look fine, there's still a remote chance
> that one of them will break build in some configuration or platform.
> Maybe it is not a good idea to apply this at such late point in
> the release cycle.  I verified these, but I haven't tested all
> platforms, especially win*.
>
> Please consider applying.

The two trace.h related patches moved include statements from .h files
to .c files.
I compiled the resulting code on 64 bit Linux, also with cross
compilation for
MinGW, so win* won't be a problem.

Nevertheless there remains a risk because my builds don't include all QEMU
options (especially not spice, rbd, nss, libusb, seccomp).

Both patches were not marked for 1.7, so please skip them when pulling
for 1.7.

You will also have to skip "Console: Replace conditional debug messages
by trace methods"
because it depends on one of the other patches.

Cheers,
Stefan
Michael Tokarev Nov. 13, 2013, 6:24 p.m. UTC | #2
13.11.2013 22:05, Stefan Weil wrote:
[]
> The two trace.h related patches moved include statements from .h files
> to .c files.
> I compiled the resulting code on 64 bit Linux, also with cross
> compilation for
> MinGW, so win* won't be a problem.
> 
> Nevertheless there remains a risk because my builds don't include all QEMU
> options (especially not spice, rbd, nss, libusb, seccomp).
> 
> Both patches were not marked for 1.7, so please skip them when pulling
> for 1.7.

How about all other patches, because none of them were marked for 1.7?

Thanks,

/mjt
Stefan Weil Nov. 13, 2013, 6:59 p.m. UTC | #3
Am 13.11.2013 19:24, schrieb Michael Tokarev:
> 13.11.2013 22:05, Stefan Weil wrote: []
>> The two trace.h related patches moved include statements from .h
>> files to .c files. I compiled the resulting code on 64 bit Linux,
>> also with cross compilation for MinGW, so win* won't be a problem.
>> Nevertheless there remains a risk because my builds don't include all
>> QEMU options (especially not spice, rbd, nss, libusb, seccomp). Both
>> patches were not marked for 1.7, so please skip them when pulling for
>> 1.7. 
> How about all other patches, because none of them were marked for 1.7?
> Thanks, /mjt

This one was marked for 1.7 and is needed to fix the MinGW buildbots:

qga: Fix compilation for old versions of MinGW

This one was not marked, but is safe (although it can also wait until
after 1.7):

console: Remove unused debug code

All other of my patches here can wait.

Cheers,
Stefan