[Qemu-commits] [qemu/qemu] adc903: docs: fix 'sample-pages' option tag

[Richard Henderson]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: adc903a6c00531022114ffc4efe99ffbe92a22c6
      
https://github.com/qemu/qemu/commit/adc903a6c00531022114ffc4efe99ffbe92a22c6
  Author: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
  Date:   2021-11-09 (Tue, 09 Nov 2021)

  Changed paths:
    M qapi/migration.json

  Log Message:
  -----------
  docs: fix 'sample-pages' option tag

commit f78d4ed701 has fixed qemu tag, making 'sample-pages' option tag
involved by accident, which introduced since 6.1 in commit 7afa08cd8fd.
revert this line.

Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: a6a83cef9c581d210fd965fc7ac17e388db840dc
      
https://github.com/qemu/qemu/commit/a6a83cef9c581d210fd965fc7ac17e388db840dc
  Author: Rao, Lei <lei.rao@intel.com>
  Date:   2021-11-09 (Tue, 09 Nov 2021)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  Reduce the PVM stop time during Checkpoint

When flushing memory from ram cache to ram during every checkpoint
on secondary VM, we can copy continuous chunks of memory instead of
4096 bytes per time to reduce the time of VM stop during checkpoint.

Signed-off-by: Lei Rao <lei.rao@intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Tested-by: Lukas Straub <lukasstraub2@web.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 91fe9a8dbd449a2f333aefb82ec8adb1f6424408
      
https://github.com/qemu/qemu/commit/91fe9a8dbd449a2f333aefb82ec8adb1f6424408
  Author: Rao, Lei <lei.rao@intel.com>
  Date:   2021-11-09 (Tue, 09 Nov 2021)

  Changed paths:
    M migration/colo.c
    M migration/ram.c
    M migration/ram.h

  Log Message:
  -----------
  Reset the auto-converge counter at every checkpoint.

if we don't reset the auto-converge counter,
it will continue to run with COLO running,
and eventually the system will hang due to the
CPU throttle reaching DEFAULT_MIGRATE_MAX_CPU_THROTTLE.

Signed-off-by: Lei Rao <lei.rao@intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Tested-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 85549204552b624fe254831537e7a0f6450228b8
      
https://github.com/qemu/qemu/commit/85549204552b624fe254831537e7a0f6450228b8
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2021-11-09 (Tue, 09 Nov 2021)

  Changed paths:
    M migration/colo.c
    M migration/ram.c
    M migration/ram.h
    M qapi/migration.json

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

Migration Pull request

Hi

This pull request includes:
- fix sample-pages doc by hyman
- cleanup colo pages by contiguous blocks by Rao
- reset auto-converge by checkpoint by Rao.

Please, apply.

# gpg: Signature made Tue 09 Nov 2021 09:02:37 AM CET
# gpg:                using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>" [full]
# gpg:                 aka "Juan Quintela <quintela@trasno.org>" [full]

* remotes/juanquintela/tags/migration-20211109-pull-request:
  Reset the auto-converge counter at every checkpoint.
  Reduce the PVM stop time during Checkpoint
  docs: fix 'sample-pages' option tag

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/f10e7b9f6fc1...85549204552b