From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzOAV-0002eM-Ba for qemu-devel@nongnu.org; Fri, 12 Dec 2014 06:14:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzOAN-0004pT-Vi for qemu-devel@nongnu.org; Fri, 12 Dec 2014 06:13:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38713) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzOAN-0004oA-Nd for qemu-devel@nongnu.org; Fri, 12 Dec 2014 06:13:47 -0500 From: "Dr. David Alan Gilbert (git)" Date: Fri, 12 Dec 2014 11:13:37 +0000 Message-Id: <1418382822-25151-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v3 0/5] More migration file cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, peter.maydell@linaro.org, quintela@redhat.com From: "Dr. David Alan Gilbert" This is a small set of patches that shuffle migration code around, but doesn't change the behaviour: 1) Move a lot of the migration source into a separate 'migration' directory Note this moves a lot of files around, git format-patch -M -B spots the renames 2) Now they're in a migration directory, rename them to remove the migration- 3) Split the 'struct QEMUFile' out into a private header Because the QEMU Buffered file code wants to access fields, and it's about to be in a separate file from QEMUFile. 4) Split the QEMU buffered file code out in the same way as the stdio and unix/socket code has been split out. 5) Update the MAINTAINERS file to fixup locations. Dave v3: xbzrle and vmstate tests now only run if configured for softmmu, since migration directory is only built if configured for softmmu. Pull the MAINTAINERS update into this set, and remove the vmstate line. v2: Also move block-migration.c Shorten file names now they're all in the migration/ directory -- 2.1.0 Dr. David Alan Gilbert (5): Start migrating migration code into a migration directory Remove migration- pre/post fixes off files in migration/ dir Split struct QEMUFile out Split the QEMU buffered file code out MAINTAINERS: Update for migrated migration code MAINTAINERS | 3 +- Makefile.objs | 10 +- migration/Makefile.objs | 10 + block-migration.c => migration/block.c | 0 migration-exec.c => migration/exec.c | 0 migration-fd.c => migration/fd.c | 0 migration.c => migration/migration.c | 0 qemu-file.c => migration/qemu-file-buf.c | 511 +--------------------- migration/qemu-file-internal.h | 53 +++ qemu-file-stdio.c => migration/qemu-file-stdio.c | 0 qemu-file-unix.c => migration/qemu-file-unix.c | 0 migration/qemu-file.c | 519 +++++++++++++++++++++++ migration-rdma.c => migration/rdma.c | 0 migration-tcp.c => migration/tcp.c | 0 migration-unix.c => migration/unix.c | 0 vmstate.c => migration/vmstate.c | 0 xbzrle.c => migration/xbzrle.c | 0 tests/Makefile | 11 +- 18 files changed, 593 insertions(+), 524 deletions(-) create mode 100644 migration/Makefile.objs rename block-migration.c => migration/block.c (100%) rename migration-exec.c => migration/exec.c (100%) rename migration-fd.c => migration/fd.c (100%) rename migration.c => migration/migration.c (100%) rename qemu-file.c => migration/qemu-file-buf.c (51%) create mode 100644 migration/qemu-file-internal.h rename qemu-file-stdio.c => migration/qemu-file-stdio.c (100%) rename qemu-file-unix.c => migration/qemu-file-unix.c (100%) create mode 100644 migration/qemu-file.c rename migration-rdma.c => migration/rdma.c (100%) rename migration-tcp.c => migration/tcp.c (100%) rename migration-unix.c => migration/unix.c (100%) rename vmstate.c => migration/vmstate.c (100%) rename xbzrle.c => migration/xbzrle.c (100%) -- 2.1.0