[Qemu-commits] [qemu/qemu] a3120d: sheepdog: check if '-o redundancy' is passed from ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a3120deee5fc1d702ba5da98fd9c845ad1c8f301
      
https://github.com/qemu/qemu/commit/a3120deee5fc1d702ba5da98fd9c845ad1c8f301
  Author: Liu Yuan <address@hidden>
  Date:   2013-12-13 (Fri, 13 Dec 2013)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: check if '-o redundancy' is passed from user

This fix a segfault (that is caused by b3af018f3) of following command:

$ qemu-img convert some_img sheepdog:some_img

Cc: address@hidden
Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Liu Yuan <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 01443e1388971999514511a26f9d36a7cdaa2cc2
      
https://github.com/qemu/qemu/commit/01443e1388971999514511a26f9d36a7cdaa2cc2
  Author: Kevin Wolf <address@hidden>
  Date:   2013-12-13 (Fri, 13 Dec 2013)

  Changed paths:
    M qapi-schema.json

  Log Message:
  -----------
  qapi-schema.json: Change 1.8 reference to 2.0

Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f671d173c7e1da555b693e8b14f3ed0852601809
      
https://github.com/qemu/qemu/commit/f671d173c7e1da555b693e8b14f3ed0852601809
  Author: Stefan Weil <address@hidden>
  Date:   2013-12-13 (Fri, 13 Dec 2013)

  Changed paths:
    M block/vvfat.c

  Log Message:
  -----------
  block/vvfat: Fix compiler warnings for OpenBSD

The buildbot shows these compiler warnings:

block/vvfat.c: In function 'create_short_and_long_name':
block/vvfat.c:620: warning: array size (8) smaller than bound length (11)
block/vvfat.c:620: warning: array size (8) smaller than bound length (11)
block/vvfat.c:635: warning: array size (8) smaller than bound length (11)
block/vvfat.c:635: warning: array size (8) smaller than bound length (11)

They are caused by tricky code where 8 characters for the name are followed
by 3 characters for the extension, and some operations touch both name and
extension.

Using an 11 character name which includes the extension fixes the compiler
warning, satisfies cppcheck, valgrind and maybe other static and dynamic
code checkers, and even simplifies some parts of the code.

Signed-off-by: Stefan Weil <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 3d94ce60ae7ad7c31dc143fdd9da95c61b4e529e
      
https://github.com/qemu/qemu/commit/3d94ce60ae7ad7c31dc143fdd9da95c61b4e529e
  Author: Peter Lieven <address@hidden>
  Date:   2013-12-13 (Fri, 13 Dec 2013)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: expect get_block_status errors in bdrv_make_zero

during testing around with 4k LUNs a bad target implementation
triggert an -EIO in iscsi_get_block_status, but it got never caught
resulting in an infinite loop.

CC: address@hidden
Signed-off-by: Peter Lieven <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 802c3d4ccc9853ee11c742bc206f284f04259426
      
https://github.com/qemu/qemu/commit/802c3d4ccc9853ee11c742bc206f284f04259426
  Author: Peter Lieven <address@hidden>
  Date:   2013-12-13 (Fri, 13 Dec 2013)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: make progress output more accurate during convert

the progress output is very bumpy if the input images contains
a significant portion of unallocated sectors. This patch
checks how much sectors are allocated a priori if progress
output is selected.

Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: c547e5640d5b0993cdfb252331065c1a1d813bd8
      
https://github.com/qemu/qemu/commit/c547e5640d5b0993cdfb252331065c1a1d813bd8
  Author: Fam Zheng <address@hidden>
  Date:   2013-12-13 (Fri, 13 Dec 2013)

  Changed paths:
    M block/blkdebug.c

  Log Message:
  -----------
  blkdebug: Use QLIST_FOREACH_SAFE to resume IO

Qemu-iotest 030 was broken.

When the coroutine runs and finishes, it will remove itself from the req
list, so let's use safe version of foreach to avoid use after free.

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f1d3e586f069e17f83b669842bc02d60d509daca
      
https://github.com/qemu/qemu/commit/f1d3e586f069e17f83b669842bc02d60d509daca
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M ui/spice-core.c

  Log Message:
  -----------
  spice: flip streaming video mode to off by default

Video streaming detection heuristics in spice-server have problems
keeping modern desktop animations (as done by gnome shell) and real
video playback apart.  This leads to jpeg compression artefacts on
your desktop, due to spice using mjpeg to send what it thinks is
a video stream.

Turn off video detection by default to avoid these artifacts.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Alon Levy <address@hidden>


  Commit: fa88afa51c7db927b3dd6c2f7878c23e53441de6
      
https://github.com/qemu/qemu/commit/fa88afa51c7db927b3dd6c2f7878c23e53441de6
  Author: Marc-André Lureau <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M libcacard/vscclient.c

  Log Message:
  -----------
  vscclient: do not add a socket watch if there is not data to send

Fixes the following error:
** (process:780): CRITICAL **: do_socket_send: assertion
`socket_to_send->len != 0' failed

Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: d8a03a09524c141325f3469cc5c393f7eae3c9cf
      
https://github.com/qemu/qemu/commit/d8a03a09524c141325f3469cc5c393f7eae3c9cf
  Author: Marc-André Lureau <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M spice-qemu-char.c

  Log Message:
  -----------
  spice-char: remove unused field

Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 314f7ea74f0c36e3291c4c6d58816da83a232fc2
      
https://github.com/qemu/qemu/commit/314f7ea74f0c36e3291c4c6d58816da83a232fc2
  Author: Marc-André Lureau <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M blockdev.c
    M include/sysemu/blockdev.h
    M qmp.c

  Log Message:
  -----------
  qmp_change_blockdev() remove unused has_format

Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: f7d48052644f3307748f47062728bb3e5f051ffe
      
https://github.com/qemu/qemu/commit/f7d48052644f3307748f47062728bb3e5f051ffe
  Author: Marc-André Lureau <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M include/ui/qemu-spice.h

  Log Message:
  -----------
  include: add missing config-host.h include

Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: d61b0c9a2f7f39cc30cbd713e0798a23a51340e7
      
https://github.com/qemu/qemu/commit/d61b0c9a2f7f39cc30cbd713e0798a23a51340e7
  Author: Marc-André Lureau <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M include/sysemu/char.h
    M qemu-char.c

  Log Message:
  -----------
  char: add qemu_chr_fe_event()

Teach the chardev frontend to send event. This is used by the Spice port
chardev currently.

Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: be733d6d484cd6a9e27a43a3f426688124fd0652
      
https://github.com/qemu/qemu/commit/be733d6d484cd6a9e27a43a3f426688124fd0652
  Author: Marc-André Lureau <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M spice-qemu-char.c

  Log Message:
  -----------
  spice-char: implement chardev port event

Wire up chardev fe_event to Spice port.

Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 2302c1cafb13df23938b098d9c6595de52ec2577
      
https://github.com/qemu/qemu/commit/2302c1cafb13df23938b098d9c6595de52ec2577
  Author: Marc-André Lureau <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M block/Makefile.objs
    A block/nbd-client.c
    A block/nbd-client.h
    M block/nbd.c

  Log Message:
  -----------
  Split nbd block client code

Signed-off-by: Marc-André Lureau <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: e53a18e488c657bbc6f218ae60de8e813a912667
      
https://github.com/qemu/qemu/commit/e53a18e488c657bbc6f218ae60de8e813a912667
  Author: Marc-André Lureau <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M block/nbd-client.c
    M nbd.c

  Log Message:
  -----------
  nbd: don't change socket block during negotiate

The caller might handle non-blocking using coroutine. Leave the choice
to the caller to use a blocking or non-blocking negotiate.

Signed-off-by: Marc-André Lureau <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: e2bc625f9bbb3a5d3ef2cb0f14dd52b517b92ffd
      
https://github.com/qemu/qemu/commit/e2bc625f9bbb3a5d3ef2cb0f14dd52b517b92ffd
  Author: Marc-André Lureau <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M block/nbd-client.c
    M block/nbd-client.h
    M block/nbd.c

  Log Message:
  -----------
  nbd: pass export name as init argument

There is no need to keep the export name around, and it seems a better
fit as an argument in the init() call.

Signed-off-by: Marc-André Lureau <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 5ad283ebb82c007f49535907874213cdb05c307a
      
https://github.com/qemu/qemu/commit/5ad283ebb82c007f49535907874213cdb05c307a
  Author: Marc-André Lureau <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M block/nbd-client.c

  Log Message:
  -----------
  nbd: make nbd_client_session_close() idempotent

Signed-off-by: Marc-André Lureau <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 69152c09d337a8e1368e65bcd5a598def6c3079f
      
https://github.com/qemu/qemu/commit/69152c09d337a8e1368e65bcd5a598def6c3079f
  Author: Marc-André Lureau <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M block/nbd-client.c

  Log Message:
  -----------
  nbd: finish any pending coroutine

Make sure all pending coroutines are finished when closing the session.

Signed-off-by: Marc-André Lureau <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: b1b27b64262fdace45e5ab134c4438338076cb98
      
https://github.com/qemu/qemu/commit/b1b27b64262fdace45e5ab134c4438338076cb98
  Author: Marc-André Lureau <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M block/nbd-client.c

  Log Message:
  -----------
  nbd: avoid uninitialized warnings

==15815== Thread 1:
==15815== Syscall param socketcall.sendto(msg) points to uninitialised byte(s)
==15815==    at 0x65AD5CB: send (send.c:31)
==15815==    by 0x37F84B: nbd_wr_sync (nbd.c:145)
==15815==    by 0x37F94B: write_sync (nbd.c:186)
==15815==    by 0x380FA9: nbd_send_request (nbd.c:681)
==15815==    by 0x1C4A2D: nbd_teardown_connection (nbd-client.c:337)
==15815==    by 0x1C4AD8: nbd_client_session_close (nbd-client.c:354)
==15815==    by 0x1ED2D8: close_socketpair (spicebd.c:132)
==15815==    by 0x1EE265: spice_close (spicebd.c:457)
==15815==    by 0x1ACBF6: bdrv_close (block.c:1519)
==15815==    by 0x1AD804: bdrv_delete (block.c:1772)
==15815==    by 0x1B4136: bdrv_unref (block.c:4476)
==15815==    by 0x1ACCE0: bdrv_close (block.c:1541)
==15815==  Address 0x7feffef98 is on thread 1's stack

Signed-off-by: Marc-André Lureau <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 7cc6a25fe94b430cb5a041bcb19d7d854b4e99a7
      
https://github.com/qemu/qemu/commit/7cc6a25fe94b430cb5a041bcb19d7d854b4e99a7
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M ui/spice-core.c
    M ui/spice-display.c

  Log Message:
  -----------
  spice: move qemu_spice_display_*() from spice-graphics to spice-core

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


  Commit: b50f3e42b9438e033074222671c0502ecfeba82c
      
https://github.com/qemu/qemu/commit/b50f3e42b9438e033074222671c0502ecfeba82c
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M ui/spice-core.c

  Log Message:
  -----------
  spice: move spice_server_vm_{start,stop} calls into qemu_spice_display_*()

So calling spice server to start/stop the worker goes
hand in hand with the status variable update.

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


  Commit: 75c70e37bc4a6bdc394b4d1b163fe730abb82c72
      
https://github.com/qemu/qemu/commit/75c70e37bc4a6bdc394b4d1b163fe730abb82c72
  Author: Gerd Hoffmann <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M hw/display/qxl.c

  Log Message:
  -----------
  spice: stop server for qxl hard reset

Hard reset can happen at any time.  We should be able to put qxl into a
known-good state no matter what.  Stop spice server thread for reset so
it can't be confused by fetching stale commands lingering around in the
rings while we reset is ongoing.

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


  Commit: 80d6f5eae79b009bf3e02e59e9e225db42ddf887
      
https://github.com/qemu/qemu/commit/80d6f5eae79b009bf3e02e59e9e225db42ddf887
  Author: Anthony Liguori <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M block.c
    M block/blkdebug.c
    M block/sheepdog.c
    M block/vvfat.c
    M qapi-schema.json
    M qemu-img.c

  Log Message:
  -----------
  Merge remote-tracking branch 'kwolf/tags/for-anthony' into staging

Block patches

# gpg: Signature made Fri 13 Dec 2013 09:47:03 AM PST using RSA key ID C88F2FD6
# gpg: Can't check signature: public key not found

# By Peter Lieven (2) and others
# Via Kevin Wolf
* kwolf/tags/for-anthony:
  blkdebug: Use QLIST_FOREACH_SAFE to resume IO
  qemu-img: make progress output more accurate during convert
  block: expect get_block_status errors in bdrv_make_zero
  block/vvfat: Fix compiler warnings for OpenBSD
  qapi-schema.json: Change 1.8 reference to 2.0
  sheepdog: check if '-o redundancy' is passed from user

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


  Commit: b91f93243bbe36dc436a64a662a9bbfb2362534a
      
https://github.com/qemu/qemu/commit/b91f93243bbe36dc436a64a662a9bbfb2362534a
  Author: Anthony Liguori <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M block/Makefile.objs
    A block/nbd-client.c
    A block/nbd-client.h
    M block/nbd.c
    M blockdev.c
    M hw/display/qxl.c
    M include/sysemu/blockdev.h
    M include/sysemu/char.h
    M include/ui/qemu-spice.h
    M libcacard/vscclient.c
    M nbd.c
    M qemu-char.c
    M qmp.c
    M spice-qemu-char.c
    M ui/spice-core.c
    M ui/spice-display.c

  Log Message:
  -----------
  Merge remote-tracking branch 'spice/tags/pull-spice-1' into staging

Collection of little cleanups anf bugfixes.
nbd patches in preparation of spice-nbd.

# gpg: Signature made Mon 16 Dec 2013 01:27:45 AM PST using RSA key ID D3E87138
# gpg: Can't check signature: public key not found

# By Marc-André Lureau (12) and Gerd Hoffmann (4)
# Via Gerd Hoffmann
* spice/tags/pull-spice-1:
  spice: stop server for qxl hard reset
  spice: move spice_server_vm_{start,stop} calls into qemu_spice_display_*()
  spice: move qemu_spice_display_*() from spice-graphics to spice-core
  nbd: avoid uninitialized warnings
  nbd: finish any pending coroutine
  nbd: make nbd_client_session_close() idempotent
  nbd: pass export name as init argument
  nbd: don't change socket block during negotiate
  Split nbd block client code
  spice-char: implement chardev port event
  char: add qemu_chr_fe_event()
  include: add missing config-host.h include
  qmp_change_blockdev() remove unused has_format
  spice-char: remove unused field
  vscclient: do not add a socket watch if there is not data to send
  spice: flip streaming video mode to off by default


  Commit: f46e720a82ccdf1a521cf459448f3f96ed895d43
      
https://github.com/qemu/qemu/commit/f46e720a82ccdf1a521cf459448f3f96ed895d43
  Author: Laszlo Ersek <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  qemu_opts_parse(): always check return value

qemu_opts_parse() can always return NULL, even if the QemuOptsList.desc in
question would be trivial to satisfy (eg. because it's empty). For
example:

qemu_opts_parse()
  opts_parse()
    qemu_opts_create()
      id_wellformed()

In practice:

  $ .../qemu-system-x86_64 -acpitable id=3
  qemu-system-x86_64: -acpitable id=3: Parameter 'id' expects an identifier
  **
  ERROR:vl.c:3491:main: assertion failed: (opts != NULL)
  Aborted (core dumped)

  $ .../qemu-system-x86_64 -smbios id=3
  qemu-system-x86_64: -smbios id=3: Parameter 'id' expects an identifier
  Segmentation fault (core dumped)

I checked all qemu_opts_parse() invocations (and all drive_def()
invocations too, because it blindly forwards the former's retval). Only
the two above examples look problematic.

Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


Compare: https://github.com/qemu/qemu/compare/e157b8fdd412...f46e720a82cc