From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

The following changes since commit 6181478f6395cdd9d6ffd99623d0c9f39ea53606:

  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-02-28 08:46:03 +0000)

are available in the git repository at:

  git://github.com/dagrh/qemu.git tags/pull-migration-20170228a

for you to fetch changes up to 665414ad06aa1bc92e615db9641e58fb13d07de1:

  postcopy: Add extra check for COPY function (2017-02-28 11:30:24 +0000)

----------------------------------------------------------------
Migration pull

Note: The 'postcopy: Update userfaultfd.h header' is part of
Paolo's header update and will disappear if applied after it.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

----------------------------------------------------------------
Ashijeet Acharya (1):
      migrate: Introduce a 'dc->vmsd' check to avoid segfault for --only-migratable

Daniel Henrique Barboza (1):
      Changing error message of QMP 'migrate_set_downtime' to seconds

Dr. David Alan Gilbert (17):
      migration: Update docs to discourage version bumps
      postcopy: Transmit ram size summary word
      postcopy: Transmit and compare individual page sizes
      postcopy: Chunk discards for hugepages
      exec: ram_block_discard_range
      postcopy: enhance ram_block_discard_range for hugepages
      postcopy: Record largest page size
      postcopy: Plumb pagesize down into place helpers
      postcopy: Use temporary for placing zero huge pages
      postcopy: Load huge pages in one go
      postcopy: Mask fault addresses to huge page boundary
      postcopy: Send whole huge pages
      postcopy: Allow hugepages
      postcopy: Update userfaultfd.h header
      postcopy: Check for userfault+hugepage feature
      postcopy: Add doc about hugepages and postcopy
      postcopy: Add extra check for COPY function

Halil Pasic (5):
      migration/vmstate: renames in (load|save)_state
      migration/vmstate: split up vmstate_base_addr
      migration/vmstate: fix array of ptr with nullptrs
      tests/test-vmstate.c: test array of ptr with null
      tests/test-vmstate.c: test array of ptr to primitive

Laurent Vivier (1):
      vmstate-static-checker: update white list with spapr_pci

Marc-André Lureau (1):
      migration: fix id leak regression

Vladimir Sementsov-Ogievskiy (1):
      migration: fix use-after-free of to_dst_file

 docs/migration.txt                |  71 +++++++++++++++++++
 exec.c                            |  83 ++++++++++++++++++++++
 hw/core/qdev.c                    |   7 ++
 hw/usb/bus.c                      |  19 -----
 include/exec/cpu-common.h         |   2 +
 include/migration/migration.h     |   6 ++
 include/migration/postcopy-ram.h  |  13 ++--
 include/migration/vmstate.h       |   4 ++
 linux-headers/linux/userfaultfd.h |  67 +++++++++++++++---
 migration/migration.c             |  36 ++++++++--
 migration/postcopy-ram.c          | 142 ++++++++++++++++++--------------------
 migration/ram.c                   | 109 ++++++++++++++++++-----------
 migration/savevm.c                |  38 +++++++---
 migration/trace-events            |   2 +-
 migration/vmstate.c               |  97 +++++++++++++++++---------
 qdev-monitor.c                    |   9 ---
 scripts/vmstate-static-checker.py |   5 ++
 stubs/vmstate.c                   |   6 ++
 tests/test-vmstate.c              | 122 +++++++++++++++++++++++++++-----
 19 files changed, 608 insertions(+), 230 deletions(-)

On 28 February 2017 at 12:40, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 6181478f6395cdd9d6ffd99623d0c9f39ea53606:
>
>   Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-02-28 08:46:03 +0000)
>
> are available in the git repository at:
>
>   git://github.com/dagrh/qemu.git tags/pull-migration-20170228a
>
> for you to fetch changes up to 665414ad06aa1bc92e615db9641e58fb13d07de1:
>
>   postcopy: Add extra check for COPY function (2017-02-28 11:30:24 +0000)
>
> ----------------------------------------------------------------
> Migration pull
>
> Note: The 'postcopy: Update userfaultfd.h header' is part of
> Paolo's header update and will disappear if applied after it.

Is that a linux-headers update not done via the update script? :-(

thanks
-- PMM

* Peter Maydell (peter.maydell@linaro.org) wrote:
> On 28 February 2017 at 12:40, Dr. David Alan Gilbert (git)
> <dgilbert@redhat.com> wrote:
> > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> >
> > The following changes since commit 6181478f6395cdd9d6ffd99623d0c9f39ea53606:
> >
> >   Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-02-28 08:46:03 +0000)
> >
> > are available in the git repository at:
> >
> >   git://github.com/dagrh/qemu.git tags/pull-migration-20170228a
> >
> > for you to fetch changes up to 665414ad06aa1bc92e615db9641e58fb13d07de1:
> >
> >   postcopy: Add extra check for COPY function (2017-02-28 11:30:24 +0000)
> >
> > ----------------------------------------------------------------
> > Migration pull
> >
> > Note: The 'postcopy: Update userfaultfd.h header' is part of
> > Paolo's header update and will disappear if applied after it.
> 
> Is that a linux-headers update not done via the update script? :-(

It was in earlier version of my patchset, but I replaced it by 
Paolo's update that he made via the script; the one in the pull
should be identical to Paolo's change - but just the userfaultfd.h
change.

Dave

> thanks
> -- PMM
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

On 28 February 2017 at 12:40, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 6181478f6395cdd9d6ffd99623d0c9f39ea53606:
>
>   Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-02-28 08:46:03 +0000)
>
> are available in the git repository at:
>
>   git://github.com/dagrh/qemu.git tags/pull-migration-20170228a
>
> for you to fetch changes up to 665414ad06aa1bc92e615db9641e58fb13d07de1:
>
>   postcopy: Add extra check for COPY function (2017-02-28 11:30:24 +0000)
>
> ----------------------------------------------------------------
> Migration pull
>
> Note: The 'postcopy: Update userfaultfd.h header' is part of
> Paolo's header update and will disappear if applied after it.
>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>
> ----------------------------------------------------------------
> Ashijeet Acharya (1):
>       migrate: Introduce a 'dc->vmsd' check to avoid segfault for --only-migratable
>
> Daniel Henrique Barboza (1):
>       Changing error message of QMP 'migrate_set_downtime' to seconds
>
> Dr. David Alan Gilbert (17):
>       migration: Update docs to discourage version bumps
>       postcopy: Transmit ram size summary word
>       postcopy: Transmit and compare individual page sizes
>       postcopy: Chunk discards for hugepages
>       exec: ram_block_discard_range
>       postcopy: enhance ram_block_discard_range for hugepages
>       postcopy: Record largest page size
>       postcopy: Plumb pagesize down into place helpers
>       postcopy: Use temporary for placing zero huge pages
>       postcopy: Load huge pages in one go
>       postcopy: Mask fault addresses to huge page boundary
>       postcopy: Send whole huge pages
>       postcopy: Allow hugepages
>       postcopy: Update userfaultfd.h header
>       postcopy: Check for userfault+hugepage feature
>       postcopy: Add doc about hugepages and postcopy
>       postcopy: Add extra check for COPY function
>
> Halil Pasic (5):
>       migration/vmstate: renames in (load|save)_state
>       migration/vmstate: split up vmstate_base_addr
>       migration/vmstate: fix array of ptr with nullptrs
>       tests/test-vmstate.c: test array of ptr with null
>       tests/test-vmstate.c: test array of ptr to primitive
>
> Laurent Vivier (1):
>       vmstate-static-checker: update white list with spapr_pci
>
> Marc-André Lureau (1):
>       migration: fix id leak regression
>
> Vladimir Sementsov-Ogievskiy (1):
>       migration: fix use-after-free of to_dst_file

Applied, thanks.

-- PMM