[Qemu-commits] [qemu/qemu] 7d4eaa: migration/ram.c: MultiFDSendParams.sem_sync is not...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7d4eaace468c6c622a815eec04a49152bbcc6b10
      
https://github.com/qemu/qemu/commit/7d4eaace468c6c622a815eec04a49152bbcc6b10
  Author: Wei Yang <address@hidden>
  Date:   2019-06-05 (Wed, 05 Jun 2019)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  migration/ram.c: MultiFDSendParams.sem_sync is not really used

Besides init and destroy, MultiFDSendParams.sem_sync is not really used.

Signed-off-by: Wei Yang <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: f38d7fbc015a3745ecdbf1e0158dbc1d1b061f9f
      
https://github.com/qemu/qemu/commit/f38d7fbc015a3745ecdbf1e0158dbc1d1b061f9f
  Author: Wei Yang <address@hidden>
  Date:   2019-06-05 (Wed, 05 Jun 2019)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  migration/ram.c: multifd_send_state->count is not really used

Signed-off-by: Wei Yang <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 61053d4826a528bdb59872e51f68e540cfad5af0
      
https://github.com/qemu/qemu/commit/61053d4826a528bdb59872e51f68e540cfad5af0
  Author: Yury Kotov <address@hidden>
  Date:   2019-06-05 (Wed, 05 Jun 2019)

  Changed paths:
    M migration/fd.c
    M migration/fd.h

  Log Message:
  -----------
  migration: Fix fd protocol for incoming defer

Currently, incoming migration through fd supports only command-line case:
E.g.
    fork();
    fd = open();
    exec("qemu ... -incoming fd:%d", fd);

It's possible to use add-fd commands to pass fd for migration, but it's
invalid case. add-fd works with fdset but not with particular fds.

To work with getfd in incoming defer it's enough to use monitor_fd_param
instead of strtol. monitor_fd_param supports both cases:
* fd:123
* fd:fd_name (added by getfd).

And also the use of monitor_fd_param improves error messages.

Signed-off-by: Yury Kotov <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 24d5588c86faa245220ea821c9bc7ec685ffa97c
      
https://github.com/qemu/qemu/commit/24d5588c86faa245220ea821c9bc7ec685ffa97c
  Author: Yury Kotov <address@hidden>
  Date:   2019-06-05 (Wed, 05 Jun 2019)

  Changed paths:
    M tests/libqtest.c
    M tests/libqtest.h
    M tests/migration-test.c

  Log Message:
  -----------
  migration-test: Add a test for fd protocol

Signed-off-by: Yury Kotov <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 03158519384f15890d587937bd1b3ea699898e55
      
https://github.com/qemu/qemu/commit/03158519384f15890d587937bd1b3ea699898e55
  Author: Wei Yang <address@hidden>
  Date:   2019-06-05 (Wed, 05 Jun 2019)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  migratioin/ram: leave RAMBlock->bmap blank on allocating

During migration, we would sync bitmap from ram_list.dirty_memory to
RAMBlock.bmap in cpu_physical_memory_sync_dirty_bitmap().

Since we set RAMBlock.bmap and ram_list.dirty_memory both to all 1, this
means at the first round this sync is meaningless and is a duplicated
work.

Leaving RAMBlock->bmap blank on allocating would have a side effect on
migration_dirty_pages, since it is calculated from the result of
cpu_physical_memory_sync_dirty_bitmap(). To keep it right, we need to
set migration_dirty_pages to 0 in ram_state_init().

Signed-off-by: Wei Yang <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 8be2094648f85acbd443ea0b5710e5988fda6741
      
https://github.com/qemu/qemu/commit/8be2094648f85acbd443ea0b5710e5988fda6741
  Author: Peter Maydell <address@hidden>
  Date:   2019-06-06 (Thu, 06 Jun 2019)

  Changed paths:
    M migration/fd.c
    M migration/fd.h
    M migration/ram.c
    M tests/libqtest.c
    M tests/libqtest.h
    M tests/migration-test.c

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

Migration Pull request

# gpg: Signature made Wed 05 Jun 2019 12:52:06 BST
# gpg:                using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723
# gpg: Good signature from "Juan Quintela <address@hidden>" [full]
# gpg:                 aka "Juan Quintela <address@hidden>" [full]
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/migration-pull-request:
  migratioin/ram: leave RAMBlock->bmap blank on allocating
  migration-test: Add a test for fd protocol
  migration: Fix fd protocol for incoming defer
  migration/ram.c: multifd_send_state->count is not really used
  migration/ram.c: MultiFDSendParams.sem_sync is not really used

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/47fbad45d47a...8be2094648f8