[Qemu-commits] [qemu/qemu] 7ac9a9: qapi.py: avoid Python 2.5+ any() function

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7ac9a9d6e1fbc702dee8d2a2eb3151bc704104dc
      
https://github.com/qemu/qemu/commit/7ac9a9d6e1fbc702dee8d2a2eb3151bc704104dc
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M scripts/qapi.py

  Log Message:
  -----------
  qapi.py: avoid Python 2.5+ any() function

There is one instance of any() in qapi.py that breaks builds on older
distros that ship Python 2.4 (like RHEL5):

  GEN   qmp-commands.h
Traceback (most recent call last):
  File "build/scripts/qapi-commands.py", line 445, in ?
    exprs = parse_schema(input_file)
  File "build/scripts/qapi.py", line 329, in parse_schema
    schema = QAPISchema(open(input_file, "r"))
  File "build/scripts/qapi.py", line 110, in __init__
    if any(include_path == elem[1]
NameError: global name 'any' is not defined

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>


  Commit: 6b029216056b8e64a6b5b7c43d1342cd4ef7ebc0
      
https://github.com/qemu/qemu/commit/6b029216056b8e64a6b5b7c43d1342cd4ef7ebc0
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M tests/libqtest.c

  Log Message:
  -----------
  libqtest: launch QEMU with QEMU_AUDIO_DRV=none

No test case actually uses the audio backend.  Disable audio to prevent
warnings on hosts with no sound hardware present:

  GTESTER check-qtest-aarch64
  sdl: SDL_OpenAudio failed
  sdl: Reason: No available audio device
  sdl: SDL_OpenAudio failed
  sdl: Reason: No available audio device
  audio: Failed to create voice `lm4549.out'

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>


  Commit: 73735f72188bd5fe25c3478aa4a2f1a17cb878d8
      
https://github.com/qemu/qemu/commit/73735f72188bd5fe25c3478aa4a2f1a17cb878d8
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M scripts/tracetool/backend/__init__.py

  Log Message:
  -----------
  trace: avoid Python 2.5 all() in tracetool

Red Hat Enterprise Linux 5 ships Python 2.4.3.  The all() function was
added in Python 2.5 so we cannot use it.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>


  Commit: 6d0de8eb21b7a581999ca89a9b447fd1c91e23db
      
https://github.com/qemu/qemu/commit/6d0de8eb21b7a581999ca89a9b447fd1c91e23db
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M block/mirror.c

  Log Message:
  -----------
  mirror: fix uninitialized variable delay_ns warnings

The gcc 4.1.2 compiler warns that delay_ns may be uninitialized in
mirror_iteration().

There are two break statements in the do ... while loop that skip over
the delay_ns assignment.  These are probably the cause of the warning.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>


  Commit: ada4240103470371533967334cda9965854fcbda
      
https://github.com/qemu/qemu/commit/ada4240103470371533967334cda9965854fcbda
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: sort formats alphabetically in bdrv_iterate_format()

Format names are best consumed in alphabetical order.  This makes
human-readable output easy to produce.

bdrv_iterate_format() already has an array of format strings.  Sort them
before invoking the iteration callback.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>


  Commit: 00c6d403a3ac303ebdcb1706ee983e13ba8e2d5f
      
https://github.com/qemu/qemu/commit/00c6d403a3ac303ebdcb1706ee983e13ba8e2d5f
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  Revert "qemu-img: sort block formats in help message"

This reverts commit 1a443c1b8b4314d365e82bddeb1de5b4b1c15fb3 and the
later commit 395071a76328189f50c778f4dee6dabb90503dd9.

GSequence was introduced in glib 2.14.  RHEL 5 fails to compile since it
uses glib 2.12.3.

Now that bdrv_iterate_format() invokes the iteration callback in sorted
order these commits are unnecessary.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>


  Commit: 795c050e379ab21b75fc2bbb30699fe8752be157
      
https://github.com/qemu/qemu/commit/795c050e379ab21b75fc2bbb30699fe8752be157
  Author: Peter Maydell <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M block.c
    M block/mirror.c
    M qemu-img.c
    M scripts/qapi.py
    M scripts/tracetool/backend/__init__.py
    M tests/libqtest.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/stefanha/tags/fix-buildbot-12082014-pull-request' into staging

Pull request

# gpg: Signature made Thu 28 Aug 2014 13:43:00 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/fix-buildbot-12082014-pull-request:
  Revert "qemu-img: sort block formats in help message"
  block: sort formats alphabetically in bdrv_iterate_format()
  mirror: fix uninitialized variable delay_ns warnings
  trace: avoid Python 2.5 all() in tracetool
  libqtest: launch QEMU with QEMU_AUDIO_DRV=none
  qapi.py: avoid Python 2.5+ any() function

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/0265361a722f...795c050e379a