[Qemu-devel] [PATCH v4 0/9] Migration mini-cleanup

Juan Quintela posted 9 patches 6 years, 10 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
block/qed.c                              |   1 -
hw/i386/pc_q35.c                         |   1 -
hw/virtio/vhost-user.c                   |   1 -
hw/virtio/vhost-vsock.c                  |   1 -
hw/virtio/virtio.c                       |   1 -
include/hw/hw.h                          |   1 +
include/migration/colo.h                 |   1 -
include/migration/migration.h            |  13 +-
include/migration/qemu-file.h            |   4 -
include/migration/vmstate.h              |   3 -
migration/Makefile.objs                  |   4 +-
migration/block.c                        |   2 +
migration/channel.c                      |  70 ++++
migration/channel.h                      |  25 ++
migration/colo-comm.c                    |   4 +-
migration/colo.c                         |   3 +
migration/exec.c                         |   1 +
migration/fd.c                           |   1 +
migration/migration.c                    |  52 +--
migration/postcopy-ram.c                 |   1 +
migration/qemu-file-channel.c            |   1 +
migration/qemu-file-channel.h            |  21 +
migration/qjson.c                        |   2 +-
{include/migration => migration}/qjson.h |   0
migration/ram.c                          |   3 +
migration/rdma.c                         |   1 +
migration/savevm.c                       |   1 +
migration/socket.c                       |   1 +
migration/tls.c                          |   1 +
migration/vmstate-types.c                | 661 +++++++++++++++++++++++++++++++
migration/vmstate.c                      | 656 +-----------------------------
migration/xbzrle.c                       |   2 +-
migration/xbzrle.h                       |  21 +
monitor.c                                |   1 -
tests/Makefile.include                   |   2 +-
tests/test-vmstate.c                     |   2 +
tests/test-xbzrle.c                      |   2 +-
37 files changed, 842 insertions(+), 726 deletions(-)
create mode 100644 migration/channel.c
create mode 100644 migration/channel.h
create mode 100644 migration/qemu-file-channel.h
rename {include/migration => migration}/qjson.h (100%)
create mode 100644 migration/vmstate-types.c
create mode 100644 migration/xbzrle.h
[Qemu-devel] [PATCH v4 0/9] Migration mini-cleanup
Posted by Juan Quintela 6 years, 10 months ago
Hi

Changes from v3

- dropped movement of colo*h headers
  they are used in other palaces in patches outside the tree
- Change the license of vmstate*c files to GPL v2+
  Dave noted that I was using the wrong text
- page_cache.c movement was already reviewd and it has no conflicts,
  moved to pull request.

Please, review

Thanks, Juan.


[v3]
Due to popular demand, and to make reviews easier, I just split the
big cleanup series (41 patches) in small chunks.  This chunk just
include the easy patches:

- create several include files foo.h for functcions exported from foo.c
- split channel operations in channel.c
- move colo headers to migration/
- split vmstate-types.c from vmstate.c (now it only contains the interpreter)
- untangle qemu-file.h, vmstate.h and migration.h.  Now none include the other
  fix all callers.
- Remove uses of migration.h that are not needed


Juan Quintela (9):
  migration: Create migration/xbzrle.h
  migration: Split migration/channel.c for channel operations
  migration: Export qemu-file-channel.c functions in its own file
  migration: Remove migration.h from colo.h
  migration: Move qjson.h to migration/
  migration: Split vmstate-types.c from vmstate.c
  migration: Remove qemu-file.h from vmstate.h
  migration: Remove vmstate.h from migration.h
  migration: migration.h was not needed

 block/qed.c                              |   1 -
 hw/i386/pc_q35.c                         |   1 -
 hw/virtio/vhost-user.c                   |   1 -
 hw/virtio/vhost-vsock.c                  |   1 -
 hw/virtio/virtio.c                       |   1 -
 include/hw/hw.h                          |   1 +
 include/migration/colo.h                 |   1 -
 include/migration/migration.h            |  13 +-
 include/migration/qemu-file.h            |   4 -
 include/migration/vmstate.h              |   3 -
 migration/Makefile.objs                  |   4 +-
 migration/block.c                        |   2 +
 migration/channel.c                      |  70 ++++
 migration/channel.h                      |  25 ++
 migration/colo-comm.c                    |   4 +-
 migration/colo.c                         |   3 +
 migration/exec.c                         |   1 +
 migration/fd.c                           |   1 +
 migration/migration.c                    |  52 +--
 migration/postcopy-ram.c                 |   1 +
 migration/qemu-file-channel.c            |   1 +
 migration/qemu-file-channel.h            |  21 +
 migration/qjson.c                        |   2 +-
 {include/migration => migration}/qjson.h |   0
 migration/ram.c                          |   3 +
 migration/rdma.c                         |   1 +
 migration/savevm.c                       |   1 +
 migration/socket.c                       |   1 +
 migration/tls.c                          |   1 +
 migration/vmstate-types.c                | 661 +++++++++++++++++++++++++++++++
 migration/vmstate.c                      | 656 +-----------------------------
 migration/xbzrle.c                       |   2 +-
 migration/xbzrle.h                       |  21 +
 monitor.c                                |   1 -
 tests/Makefile.include                   |   2 +-
 tests/test-vmstate.c                     |   2 +
 tests/test-xbzrle.c                      |   2 +-
 37 files changed, 842 insertions(+), 726 deletions(-)
 create mode 100644 migration/channel.c
 create mode 100644 migration/channel.h
 create mode 100644 migration/qemu-file-channel.h
 rename {include/migration => migration}/qjson.h (100%)
 create mode 100644 migration/vmstate-types.c
 create mode 100644 migration/xbzrle.h

-- 
2.9.3