| Message ID | 20200127223321.2742-1-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 27 Jan 2020 at 22:34, Juan Quintela <quintela@redhat.com> wrote: > > The following changes since commit 105b07f1ba462ec48b27e5cb74ddf81c6a79364c: > > Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200127' into staging (2020-01-27 13:02:36 +0000) > > are available in the Git repository at: > > https://github.com/juanquintela/qemu.git tags/10_next-pull-request > > for you to fetch changes up to 3189f80ee7b44c968796e63f81c92c915fccdb08: > > migration/compress: compress QEMUFile is not writable (2020-01-27 20:47:24 +0100) > > ---------------------------------------------------------------- > Migration pull request > > This pull request include: > - simplify get_qlist (eric) > - fix null in multifd_send_terminate_threads (zhimin) > - small fix for compress (wei) > - migrate multifd + cancel fixes (juan) > - migrate compression: the bits that are reviewed (juan) > Hi -- this passed tests, but half the commits seem to have incorrectly still got the below-the-'---'-line remarks in them: could you strip those out and resend, please? thanks -- PMM
Peter Maydell <peter.maydell@linaro.org> wrote: > On Mon, 27 Jan 2020 at 22:34, Juan Quintela <quintela@redhat.com> wrote: >> >> The following changes since commit 105b07f1ba462ec48b27e5cb74ddf81c6a79364c: >> >> Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200127' >> into staging (2020-01-27 13:02:36 +0000) >> >> are available in the Git repository at: >> >> https://github.com/juanquintela/qemu.git tags/10_next-pull-request >> >> for you to fetch changes up to 3189f80ee7b44c968796e63f81c92c915fccdb08: >> >> migration/compress: compress QEMUFile is not writable (2020-01-27 >> 20:47:24 +0100) >> >> ---------------------------------------------------------------- >> Migration pull request >> >> This pull request include: >> - simplify get_qlist (eric) >> - fix null in multifd_send_terminate_threads (zhimin) >> - small fix for compress (wei) >> - migrate multifd + cancel fixes (juan) >> - migrate compression: the bits that are reviewed (juan) >> > > Hi -- this passed tests, but half the commits seem to > have incorrectly still got the below-the-'---'-line > remarks in them: could you strip those out and resend, > please? ouch Sorry. Later, Juan.
The following changes since commit 105b07f1ba462ec48b27e5cb74ddf81c6a79364c: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200127' into staging (2020-01-27 13:02:36 +0000) are available in the Git repository at: https://github.com/juanquintela/qemu.git tags/10_next-pull-request for you to fetch changes up to 3189f80ee7b44c968796e63f81c92c915fccdb08: migration/compress: compress QEMUFile is not writable (2020-01-27 20:47:24 +0100) ---------------------------------------------------------------- Migration pull request This pull request include: - simplify get_qlist (eric) - fix null in multifd_send_terminate_threads (zhimin) - small fix for compress (wei) - migrate multifd + cancel fixes (juan) - migrate compression: the bits that are reviewed (juan) ---------------------------------------------------------------- Eric Auger (1): migration: Simplify get_qlist Juan Quintela (16): migration-test: Use g_free() instead of free() multifd: Make sure that we don't do any IO after an error qemu-file: Don't do IO after shutdown migration: Don't send data if we have stopped migration-test: Make sure that multifd and cancel works migration: Create migration_is_running() ram_addr: Split RAMBlock definition multifd: multifd_send_pages only needs the qemufile multifd: multifd_queue_page only needs the qemufile multifd: multifd_send_sync_main only needs the qemufile multifd: Use qemu_target_page_size() migration: Make checkpatch happy with comments multifd: Make multifd_save_setup() get an Error parameter multifd: Make multifd_load_setup() get an Error parameter multifd: Add multifd-method parameter multifd: Split multifd code into its own file Wei Yang (1): migration/compress: compress QEMUFile is not writable Zhimin Feng (1): migration/multifd: fix nullptr access in multifd_send_terminate_threads MAINTAINERS | 1 + hw/core/qdev-properties.c | 13 + include/exec/ram_addr.h | 40 +- include/exec/ramblock.h | 64 +++ include/hw/qdev-properties.h | 3 + include/qemu/queue.h | 19 +- migration/Makefile.objs | 1 + migration/migration.c | 82 ++- migration/migration.h | 3 +- migration/multifd.c | 899 ++++++++++++++++++++++++++++++ migration/multifd.h | 139 +++++ migration/qemu-file.c | 38 +- migration/ram.c | 1004 +--------------------------------- migration/ram.h | 7 - migration/rdma.c | 2 +- migration/savevm.c | 4 +- migration/vmstate-types.c | 10 +- monitor/hmp-cmds.c | 13 + qapi/migration.json | 30 +- tests/qtest/migration-test.c | 126 ++++- 20 files changed, 1410 insertions(+), 1088 deletions(-) create mode 100644 include/exec/ramblock.h create mode 100644 migration/multifd.c create mode 100644 migration/multifd.h