[PULL,00/15] migration pull request

Hi

This patch series got:

- migration compression patches by Liang Li
  I have to modify ""type" to "struct" in qapi
- division by zero fixed by Michael Champan.

Thanks, please apply.


The following changes since commit 38003aee196a96edccd4d64471beb1b67e9b2b17:

  Merge remote-tracking branch 'remotes/rth/tags/tcg-next-20150505' into staging (2015-05-06 11:16:35 +0100)

are available in the git repository at:

  git://github.com/juanquintela/qemu.git tags/migration/20150506

for you to fetch changes up to de6478785dc4e1e5835c91fb9e21d070c7ce3be9:

  migration: avoid divide by zero in xbzrle cache miss rate (2015-05-06 19:45:36 +0200)

----------------------------------------------------------------
migration/next for 20150506

----------------------------------------------------------------
Liang Li (14):
      docs: Add a doc about multiple thread compression
      migration: Add the framework of multi-thread compression
      migration: Add the framework of multi-thread decompression
      qemu-file: Add compression functions to QEMUFile
      arch_init: Alloc and free data struct for compression
      arch_init: Add and free data struct for decompression
      migration: Split save_zero_page from ram_save_page
      migration: Add the core code of multi-thread compression
      migration: Make compression co-work with xbzrle
      migration: Add the core code for decompression
      migration: Add interface to control compression
      migration: Use an array instead of 3 parameters
      migration: Add qmp commands to set and query parameters
      migration: Add hmp interface to set and query parameters

Michael Chapman (1):
      migration: avoid divide by zero in xbzrle cache miss rate

 arch_init.c                       | 514 ++++++++++++++++++++++++++++++++++++--
 docs/multi-thread-compression.txt | 149 +++++++++++
 hmp-commands.hx                   |  17 ++
 hmp.c                             |  65 +++++
 hmp.h                             |   4 +
 include/migration/migration.h     |  10 +
 include/migration/qemu-file.h     |   3 +
 migration/migration.c             | 122 +++++++++
 migration/qemu-file.c             |  39 +++
 monitor.c                         |  25 ++
 qapi-schema.json                  |  79 +++++-
 qmp-commands.hx                   |  57 +++++
 12 files changed, 1058 insertions(+), 26 deletions(-)
 create mode 100644 docs/multi-thread-compression.txt

On 6 May 2015 at 18:49, Juan Quintela <quintela@redhat.com> wrote:
> Hi
>
> This patch series got:
>
> - migration compression patches by Liang Li
>   I have to modify ""type" to "struct" in qapi
> - division by zero fixed by Michael Champan.
>
> Thanks, please apply.
>
>
> The following changes since commit 38003aee196a96edccd4d64471beb1b67e9b2b17:
>
>   Merge remote-tracking branch 'remotes/rth/tags/tcg-next-20150505' into staging (2015-05-06 11:16:35 +0100)
>
> are available in the git repository at:
>
>   git://github.com/juanquintela/qemu.git tags/migration/20150506
>
> for you to fetch changes up to de6478785dc4e1e5835c91fb9e21d070c7ce3be9:
>
>   migration: avoid divide by zero in xbzrle cache miss rate (2015-05-06 19:45:36 +0200)
>
> ----------------------------------------------------------------
> migration/next for 20150506

Fails to build on 32 bit, I'm afraid:

/root/qemu/arch_init.c: In function ‘do_data_decompress’:
/root/qemu/arch_init.c:1486:28: error: passing argument 2 of
‘uncompress’ from incompatible pointer type [-Werror]
In file included from /root/qemu/arch_init.c:27:0:
/usr/include/zlib.h:1180:12: note: expected ‘uLongf *’ but argument is
of type ‘size_t *’
cc1: all warnings being treated as errors

-- PMM

On 05/06/2015 12:37 PM, Peter Maydell wrote:
> On 6 May 2015 at 18:49, Juan Quintela <quintela@redhat.com> wrote:
>> Hi
>>

> 
> Fails to build on 32 bit, I'm afraid:
> 
> /root/qemu/arch_init.c: In function ‘do_data_decompress’:
> /root/qemu/arch_init.c:1486:28: error: passing argument 2 of
> ‘uncompress’ from incompatible pointer type [-Werror]

Then you might as well also fix up the .json file references to 2.3 on
the respin.

Eric Blake <eblake@redhat.com> wrote:
> On 05/06/2015 12:37 PM, Peter Maydell wrote:
>> On 6 May 2015 at 18:49, Juan Quintela <quintela@redhat.com> wrote:
>>> Hi
>>>
>
>> 
>> Fails to build on 32 bit, I'm afraid:
>> 
>> /root/qemu/arch_init.c: In function ‘do_data_decompress’:
>> /root/qemu/arch_init.c:1486:28: error: passing argument 2 of
>> ‘uncompress’ from incompatible pointer type [-Werror]
>
> Then you might as well also fix up the .json file references to 2.3 on
> the respin.

Done both things.

Sorry for the noise.

Thanks,