[Qemu-commits] [qemu/qemu] deb22f: QEMUSizedBuffer based QEMUFile

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: deb22f9a4466e66ca25e90e5530cfe8544fe5bc7
      
https://github.com/qemu/qemu/commit/deb22f9a4466e66ca25e90e5530cfe8544fe5bc7
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M include/migration/qemu-file.h
    M include/qemu/typedefs.h
    M qemu-file.c

  Log Message:
  -----------
  QEMUSizedBuffer based QEMUFile

This is based on Stefan and Joel's patch that creates a QEMUFile that goes
to a memory buffer; from:

http://lists.gnu.org/archive/html/qemu-devel/2013-03/msg05036.html

Using the QEMUFile interface, this patch adds support functions for
operating on in-memory sized buffers that can be written to or read from.

Signed-off-by: Stefan Berger <address@hidden>
Signed-off-by: Joel Schopp <address@hidden>

For fixes/tweeks I've done:
Signed-off-by: Dr. David Alan Gilbert <address@hidden>

Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 9935baca9b3573dfdb19aff03b3cbe1116350400
      
https://github.com/qemu/qemu/commit/9935baca9b3573dfdb19aff03b3cbe1116350400
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M tests/Makefile
    M tests/test-vmstate.c

  Log Message:
  -----------
  Tests: QEMUSizedBuffer/QEMUBuffer

Modify some of tests/test-vmstate.c to use the in memory file based
on QEMUSizedBuffer to provide basic testing of QEMUSizedBuffer and
the associated memory backed QEMUFile type.

Only some of the tests are changed so that the fd backed QEMUFile is
still tested.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 7ea2d269cb84ca7a2f4b7c3735634176f7c1dc35
      
https://github.com/qemu/qemu/commit/7ea2d269cb84ca7a2f4b7c3735634176f7c1dc35
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M block.c
    M migration.c
    M nbd.c

  Log Message:
  -----------
  block/migration: Disable cache invalidate for incoming migration

When migrated using libvirt with "--copy-storage-all", at the end of
migration there is race between NBD mirroring task trying to do flush
and migration completion, both end up invalidating cache. Since qcow2
driver does not handle this situation very well, random crashes happen.

This disables the BDRV_O_INCOMING flag for the block device being migrated
once the cache has been invalidated.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>

--

fixed parens by hand
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 94ed706d53a9018f24c67374c71f358fca2f0413
      
https://github.com/qemu/qemu/commit/94ed706d53a9018f24c67374c71f358fca2f0413
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M include/migration/vmstate.h
    M vmstate.c

  Log Message:
  -----------
  vmstate: Allow dynamic allocation for VBUFFER during migration

This extends use of VMS_ALLOC flag from arrays to VBUFFER as well.

This defines VMSTATE_VBUFFER_ALLOC_UINT32 which makes use of VMS_ALLOC
and uses uint32_t type for a size.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 9a4ac51f7222011ea2d44a6bc3ef01e9107b0af4
      
https://github.com/qemu/qemu/commit/9a4ac51f7222011ea2d44a6bc3ef01e9107b0af4
  Author: Eduardo Habkost <address@hidden>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M qemu-file.c

  Log Message:
  -----------
  qemu-file: Add copyright header to qemu-file.c

The person who created qemu-file.c (me, on commit
093c455a8c6d8f715eabd8c8d346f08f17d686ec) didn't add a copyright/license
header to the file, even though the whole code was copied from savevm.c
(which had a copyright/license header).

To correct this, copy the copyright information and license from
savevm.c, that's where the original code came from.

Luckily, very few changes were made on qemu-file.c after it was created.
All the authors who touched the code are being CCed, so they can confirm
if they are OK with the copyright/license information being added.

Cc: Dr. David Alan Gilbert <address@hidden>
Cc: Alexey Kardashevskiy <address@hidden>
Cc: Markus Armbruster <address@hidden>
Cc: Juan Quintela <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Acked-by: Alexey Kardashevskiy <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: e68dd3659628c41447f46da6657d68da83c3cf88
      
https://github.com/qemu/qemu/commit/e68dd3659628c41447f46da6657d68da83c3cf88
  Author: Eduardo Habkost <address@hidden>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M include/migration/qemu-file.h
    M qemu-file.c

  Log Message:
  -----------
  qemu-file: Make qemu_file_is_writable() non-static

The QEMUFileStdio code will use qemu_file_is_writable() and will be
moved to a separate file.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 532bc727c34665370ab0ba94a9536fd3a6c2c5bc
      
https://github.com/qemu/qemu/commit/532bc727c34665370ab0ba94a9536fd3a6c2c5bc
  Author: Eduardo Habkost <address@hidden>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M qemu-file.c

  Log Message:
  -----------
  qemu-file: Use qemu_file_is_writable() on stdio_fclose()

Use the existing function which checks if writev_buffer() or
put_buffer() are set, instead of duplicating it.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: bee223ba27934e86e8f08673a9efdf89773764f7
      
https://github.com/qemu/qemu/commit/bee223ba27934e86e8f08673a9efdf89773764f7
  Author: Eduardo Habkost <address@hidden>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M Makefile.objs
    A qemu-file-unix.c
    M qemu-file.c
    M tests/Makefile

  Log Message:
  -----------
  qemu-file: Move unix and socket implementations to qemu-file-unix.c

Separate the QEMUFile interface from the implementation, to reduce
dependencies from code using QEMUFile.

All the code that is being moved to the new file is exactly the same
code that was on savevm.c (moved by commit
093c455a8c6d8f715eabd8c8d346f08f17d686ec), so I am using the copyright
and license header from savevm.c for the new file.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: c54d1c067080ca18b50b593dcc935365387e11b6
      
https://github.com/qemu/qemu/commit/c54d1c067080ca18b50b593dcc935365387e11b6
  Author: Eduardo Habkost <address@hidden>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M Makefile.objs
    A qemu-file-stdio.c
    M qemu-file.c

  Log Message:
  -----------
  qemu-file: Move stdio implementation to qemu-file-stdio.c

Separate the QEMUFile interface from the stdio-specific implementation,
to reduce dependencies from code using QEMUFile.

The code that is being moved is similar to the one that was on savevm.c before
it was moved in commit 093c455a8c6d8f715eabd8c8d346f08f17d686ec, except for
some changes done by Markus, Juan, and myself. So, I am using the copyright and
license header from savevm.c, but CCing Juan and Markus so they can review the
copyright/license header.

Cc: Markus Armbruster <address@hidden>
Cc: Juan Quintela <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 5b0e9dd46fbda5152566a4a26fd96bc0d0452bf7
      
https://github.com/qemu/qemu/commit/5b0e9dd46fbda5152566a4a26fd96bc0d0452bf7
  Author: Peter Lieven <address@hidden>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  migration: catch unknown flag combinations in ram_load

this patch extends commit db80fac by not only checking
for unknown flags, but also filtering out unknown flag
combinations.

Suggested-by: Eric Blake <address@hidden>
Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 32d9c5613e3cbb5d90daa3a1c629fb389e749d03
      
https://github.com/qemu/qemu/commit/32d9c5613e3cbb5d90daa3a1c629fb389e749d03
  Author: Peter Maydell <address@hidden>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

  Changed paths:
    M Makefile.objs
    M arch_init.c
    M block.c
    M include/migration/qemu-file.h
    M include/migration/vmstate.h
    M include/qemu/typedefs.h
    M migration.c
    M nbd.c
    A qemu-file-stdio.c
    A qemu-file-unix.c
    M qemu-file.c
    M tests/Makefile
    M tests/test-vmstate.c
    M vmstate.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20141015' 
into staging

migration/next for 20141015

# gpg: Signature made Wed 15 Oct 2014 09:21:54 BST using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20141015:
  migration: catch unknown flag combinations in ram_load
  qemu-file: Move stdio implementation to qemu-file-stdio.c
  qemu-file: Move unix and socket implementations to qemu-file-unix.c
  qemu-file: Use qemu_file_is_writable() on stdio_fclose()
  qemu-file: Make qemu_file_is_writable() non-static
  qemu-file: Add copyright header to qemu-file.c
  vmstate: Allow dynamic allocation for VBUFFER during migration
  block/migration: Disable cache invalidate for incoming migration
  Tests: QEMUSizedBuffer/QEMUBuffer
  QEMUSizedBuffer based QEMUFile

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


Compare: https://github.com/qemu/qemu/compare/88e6599669a2...32d9c5613e3c