From: Juan Quintela <quintela@redhat.com>

The following changes since commit 3b33ae48ec28e1e0d1bc28a85c7423724bcb1a2c:

  Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging (2023-02-09 15:29:14 +0000)

are available in the Git repository at:

  https://gitlab.com/juan.quintela/qemu.git tags/migration-20230213-pull-request

for you to fetch changes up to 24f3e8188c13e5a8b9ad6f2a353f7d0cf80f461c:

  ram: Document migration ram flags (2023-02-13 02:58:26 +0100)

----------------------------------------------------------------
Migration Pull request (take2)

Hi

In this PULL request:

- rebase to latest upstream
- fix compilation of linux-user (if have_system was missing) (me)
- cleanup multifd_load_cleanup(leonardo)
- Document RAM flags (me)

Please apply.

[take 1]
This are all the reviewed patches for migration:
- AVX512 support for xbzrle (Ling Xu)
- /dev/userfaultd support (Peter Xu)
- Improve ordering of channels (Peter Xu)
- multifd cleanups (Li Zhang)
- Remove spurious files from last merge (me)
  Rebase makes that to you
- Fix mixup between state_pending_{exact,estimate} (me)
- Cache RAM size during migration (me)
- cleanup several functions (me)

Please apply.

----------------------------------------------------------------

Juan Quintela (8):
  migration: Remove spurious files
  migration: Simplify ram_find_and_save_block()
  migration: Make find_dirty_block() return a single parameter
  migration: Split ram_bytes_total_common() in two functions
  migration: Calculate ram size once
  migration: Make ram_save_target_page() a pointer
  migration: I messed state_pending_exact/estimate
  ram: Document migration ram flags

Leonardo Bras (4):
  migration/multifd: Change multifd_load_cleanup() signature and usage
  migration/multifd: Remove unnecessary assignment on
    multifd_load_cleanup()
  migration/multifd: Join all multifd threads in order to avoid leaks
  migration/multifd: Move load_cleanup inside incoming_state_destroy

Li Zhang (2):
  multifd: cleanup the function multifd_channel_connect
  multifd: Remove some redundant code

Peter Xu (6):
  linux-headers: Update to v6.1
  util/userfaultfd: Support /dev/userfaultfd
  migration: Rework multi-channel checks on URI
  migration: Cleanup postcopy_preempt_setup()
  migration: Add a semaphore to count PONGs
  migration: Postpone postcopy preempt channel to be after main

ling xu (2):
  AVX512 support for xbzrle_encode_buffer
  Update bench-code for addressing CI problem

 .../x86_64-quintela-devices.mak               |    7 -
 .../x86_64-quintela2-devices.mak              |    6 -
 meson.build                                   |   17 +
 include/standard-headers/drm/drm_fourcc.h     |   34 +-
 include/standard-headers/linux/ethtool.h      |   63 +-
 include/standard-headers/linux/fuse.h         |    6 +-
 .../linux/input-event-codes.h                 |    1 +
 include/standard-headers/linux/virtio_blk.h   |   19 +
 linux-headers/asm-generic/hugetlb_encode.h    |   26 +-
 linux-headers/asm-generic/mman-common.h       |    2 +
 linux-headers/asm-mips/mman.h                 |    2 +
 linux-headers/asm-riscv/kvm.h                 |    4 +
 linux-headers/linux/kvm.h                     |    1 +
 linux-headers/linux/psci.h                    |   14 +
 linux-headers/linux/userfaultfd.h             |    4 +
 linux-headers/linux/vfio.h                    |  142 ++
 migration/migration.h                         |   15 +-
 migration/multifd.h                           |    3 +-
 migration/postcopy-ram.h                      |    4 +-
 migration/xbzrle.h                            |    4 +
 migration/migration.c                         |  138 +-
 migration/multifd.c                           |   87 +-
 migration/postcopy-ram.c                      |   31 +-
 migration/ram.c                               |  148 +-
 migration/savevm.c                            |   56 +-
 migration/xbzrle.c                            |  124 ++
 tests/bench/xbzrle-bench.c                    |  469 ++++++
 tests/unit/test-xbzrle.c                      |   39 +-
 util/userfaultfd.c                            |   32 +
 meson_options.txt                             |    2 +
 migration/multifd.c.orig                      | 1274 -----------------
 scripts/meson-buildoptions.sh                 |    3 +
 tests/bench/meson.build                       |    6 +
 util/trace-events                             |    1 +
 34 files changed, 1278 insertions(+), 1506 deletions(-)
 delete mode 100644 configs/devices/x86_64-softmmu/x86_64-quintela-devices.mak
 delete mode 100644 configs/devices/x86_64-softmmu/x86_64-quintela2-devices.mak
 create mode 100644 tests/bench/xbzrle-bench.c
 delete mode 100644 migration/multifd.c.orig

-- 
2.39.1

Xxx Xx <quintela@redhat.com> wrote:
> From: Juan Quintela <quintela@redhat.com>

Nack

Misses Fixes: label by leanardo

Sorry.

> The following changes since commit 3b33ae48ec28e1e0d1bc28a85c7423724bcb1a2c:
>
>   Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging (2023-02-09 15:29:14 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/juan.quintela/qemu.git tags/migration-20230213-pull-request
>
> for you to fetch changes up to 24f3e8188c13e5a8b9ad6f2a353f7d0cf80f461c:
>
>   ram: Document migration ram flags (2023-02-13 02:58:26 +0100)
>
> ----------------------------------------------------------------
> Migration Pull request (take2)
>
> Hi
>
> In this PULL request:
>
> - rebase to latest upstream
> - fix compilation of linux-user (if have_system was missing) (me)
> - cleanup multifd_load_cleanup(leonardo)
> - Document RAM flags (me)
>
> Please apply.
>
> [take 1]
> This are all the reviewed patches for migration:
> - AVX512 support for xbzrle (Ling Xu)
> - /dev/userfaultd support (Peter Xu)
> - Improve ordering of channels (Peter Xu)
> - multifd cleanups (Li Zhang)
> - Remove spurious files from last merge (me)
>   Rebase makes that to you
> - Fix mixup between state_pending_{exact,estimate} (me)
> - Cache RAM size during migration (me)
> - cleanup several functions (me)
>
> Please apply.
>
> ----------------------------------------------------------------
>
> Juan Quintela (8):
>   migration: Remove spurious files
>   migration: Simplify ram_find_and_save_block()
>   migration: Make find_dirty_block() return a single parameter
>   migration: Split ram_bytes_total_common() in two functions
>   migration: Calculate ram size once
>   migration: Make ram_save_target_page() a pointer
>   migration: I messed state_pending_exact/estimate
>   ram: Document migration ram flags
>
> Leonardo Bras (4):
>   migration/multifd: Change multifd_load_cleanup() signature and usage
>   migration/multifd: Remove unnecessary assignment on
>     multifd_load_cleanup()
>   migration/multifd: Join all multifd threads in order to avoid leaks
>   migration/multifd: Move load_cleanup inside incoming_state_destroy
>
> Li Zhang (2):
>   multifd: cleanup the function multifd_channel_connect
>   multifd: Remove some redundant code
>
> Peter Xu (6):
>   linux-headers: Update to v6.1
>   util/userfaultfd: Support /dev/userfaultfd
>   migration: Rework multi-channel checks on URI
>   migration: Cleanup postcopy_preempt_setup()
>   migration: Add a semaphore to count PONGs
>   migration: Postpone postcopy preempt channel to be after main
>
> ling xu (2):
>   AVX512 support for xbzrle_encode_buffer
>   Update bench-code for addressing CI problem
>
>  .../x86_64-quintela-devices.mak               |    7 -
>  .../x86_64-quintela2-devices.mak              |    6 -
>  meson.build                                   |   17 +
>  include/standard-headers/drm/drm_fourcc.h     |   34 +-
>  include/standard-headers/linux/ethtool.h      |   63 +-
>  include/standard-headers/linux/fuse.h         |    6 +-
>  .../linux/input-event-codes.h                 |    1 +
>  include/standard-headers/linux/virtio_blk.h   |   19 +
>  linux-headers/asm-generic/hugetlb_encode.h    |   26 +-
>  linux-headers/asm-generic/mman-common.h       |    2 +
>  linux-headers/asm-mips/mman.h                 |    2 +
>  linux-headers/asm-riscv/kvm.h                 |    4 +
>  linux-headers/linux/kvm.h                     |    1 +
>  linux-headers/linux/psci.h                    |   14 +
>  linux-headers/linux/userfaultfd.h             |    4 +
>  linux-headers/linux/vfio.h                    |  142 ++
>  migration/migration.h                         |   15 +-
>  migration/multifd.h                           |    3 +-
>  migration/postcopy-ram.h                      |    4 +-
>  migration/xbzrle.h                            |    4 +
>  migration/migration.c                         |  138 +-
>  migration/multifd.c                           |   87 +-
>  migration/postcopy-ram.c                      |   31 +-
>  migration/ram.c                               |  148 +-
>  migration/savevm.c                            |   56 +-
>  migration/xbzrle.c                            |  124 ++
>  tests/bench/xbzrle-bench.c                    |  469 ++++++
>  tests/unit/test-xbzrle.c                      |   39 +-
>  util/userfaultfd.c                            |   32 +
>  meson_options.txt                             |    2 +
>  migration/multifd.c.orig                      | 1274 -----------------
>  scripts/meson-buildoptions.sh                 |    3 +
>  tests/bench/meson.build                       |    6 +
>  util/trace-events                             |    1 +
>  34 files changed, 1278 insertions(+), 1506 deletions(-)
>  delete mode 100644 configs/devices/x86_64-softmmu/x86_64-quintela-devices.mak
>  delete mode 100644 configs/devices/x86_64-softmmu/x86_64-quintela2-devices.mak
>  create mode 100644 tests/bench/xbzrle-bench.c
>  delete mode 100644 migration/multifd.c.orig