From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55222) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xefss-0007Ne-Qo for qemu-devel@nongnu.org; Thu, 16 Oct 2014 03:54:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xefsl-0000C6-BJ for qemu-devel@nongnu.org; Thu, 16 Oct 2014 03:54:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xefsl-0000By-4O for qemu-devel@nongnu.org; Thu, 16 Oct 2014 03:53:59 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9G7rw3e027968 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 16 Oct 2014 03:53:58 -0400 From: "Dr. David Alan Gilbert (git)" Date: Thu, 16 Oct 2014 08:53:52 +0100 Message-Id: <1413446034-25167-2-git-send-email-dgilbert@redhat.com> In-Reply-To: <1413446034-25167-1-git-send-email-dgilbert@redhat.com> References: <1413446034-25167-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] Start moving migration code into a migration directory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, quintela@redhat.com From: "Dr. David Alan Gilbert" The migration code now occupies a fair chunk of the top level .c files, it seems time to give it it's own directory. I've not touched: arch_init.c - that's mostly RAM migration but has a few random other bits savevm.c - because it's built target specific block-migration.c - should that go in block/ or migration/ ? This is purely a code move; no code has changed. Signed-off-by: Dr. David Alan Gilbert --- Makefile.objs | 9 ++------- migration/Makefile.objs | 7 +++++++ migration-exec.c => migration/migration-exec.c | 0 migration-fd.c => migration/migration-fd.c | 0 migration-rdma.c => migration/migration-rdma.c | 0 migration-tcp.c => migration/migration-tcp.c | 0 migration-unix.c => migration/migration-unix.c | 0 migration.c => migration/migration.c | 0 qemu-file-stdio.c => migration/qemu-file-stdio.c | 0 qemu-file-unix.c => migration/qemu-file-unix.c | 0 qemu-file.c => migration/qemu-file.c | 0 vmstate.c => migration/vmstate.c | 0 xbzrle.c => migration/xbzrle.c | 0 tests/Makefile | 6 +++--- 14 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 migration/Makefile.objs rename migration-exec.c => migration/migration-exec.c (100%) rename migration-fd.c => migration/migration-fd.c (100%) rename migration-rdma.c => migration/migration-rdma.c (100%) rename migration-tcp.c => migration/migration-tcp.c (100%) rename migration-unix.c => migration/migration-unix.c (100%) rename migration.c => migration/migration.c (100%) rename qemu-file-stdio.c => migration/qemu-file-stdio.c (100%) rename qemu-file-unix.c => migration/qemu-file-unix.c (100%) rename qemu-file.c => migration/qemu-file.c (100%) rename vmstate.c => migration/vmstate.c (100%) rename xbzrle.c => migration/xbzrle.c (100%) diff --git a/Makefile.objs b/Makefile.objs index 18fd35c..71b4b79 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -48,15 +48,10 @@ common-obj-$(CONFIG_POSIX) += os-posix.o common-obj-$(CONFIG_LINUX) += fsdev/ -common-obj-y += migration.o migration-tcp.o -common-obj-y += vmstate.o -common-obj-y += qemu-file.o qemu-file-unix.o qemu-file-stdio.o -common-obj-$(CONFIG_RDMA) += migration-rdma.o +common-obj-y += migration/ common-obj-y += qemu-char.o #aio.o common-obj-y += block-migration.o -common-obj-y += page_cache.o xbzrle.o - -common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o +common-obj-y += page_cache.o common-obj-$(CONFIG_SPICE) += spice-qemu-char.o diff --git a/migration/Makefile.objs b/migration/Makefile.objs new file mode 100644 index 0000000..681bae9 --- /dev/null +++ b/migration/Makefile.objs @@ -0,0 +1,7 @@ +common-obj-y += migration.o migration-tcp.o +common-obj-y += vmstate.o +common-obj-y += qemu-file.o qemu-file-unix.o qemu-file-stdio.o +common-obj-$(CONFIG_RDMA) += migration-rdma.o +common-obj-y += xbzrle.o + +common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o diff --git a/migration-exec.c b/migration/migration-exec.c similarity index 100% rename from migration-exec.c rename to migration/migration-exec.c diff --git a/migration-fd.c b/migration/migration-fd.c similarity index 100% rename from migration-fd.c rename to migration/migration-fd.c diff --git a/migration-rdma.c b/migration/migration-rdma.c similarity index 100% rename from migration-rdma.c rename to migration/migration-rdma.c diff --git a/migration-tcp.c b/migration/migration-tcp.c similarity index 100% rename from migration-tcp.c rename to migration/migration-tcp.c diff --git a/migration-unix.c b/migration/migration-unix.c similarity index 100% rename from migration-unix.c rename to migration/migration-unix.c diff --git a/migration.c b/migration/migration.c similarity index 100% rename from migration.c rename to migration/migration.c diff --git a/qemu-file-stdio.c b/migration/qemu-file-stdio.c similarity index 100% rename from qemu-file-stdio.c rename to migration/qemu-file-stdio.c diff --git a/qemu-file-unix.c b/migration/qemu-file-unix.c similarity index 100% rename from qemu-file-unix.c rename to migration/qemu-file-unix.c diff --git a/qemu-file.c b/migration/qemu-file.c similarity index 100% rename from qemu-file.c rename to migration/qemu-file.c diff --git a/vmstate.c b/migration/vmstate.c similarity index 100% rename from vmstate.c rename to migration/vmstate.c diff --git a/xbzrle.c b/migration/xbzrle.c similarity index 100% rename from xbzrle.c rename to migration/xbzrle.c diff --git a/tests/Makefile b/tests/Makefile index 16f0e4c..3a03979 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -49,7 +49,7 @@ check-unit-y += tests/test-x86-cpuid$(EXESUF) # all code tested by test-x86-cpuid is inside topology.h gcov-files-test-x86-cpuid-y = check-unit-y += tests/test-xbzrle$(EXESUF) -gcov-files-test-xbzrle-y = xbzrle.c +gcov-files-test-xbzrle-y = migration/xbzrle.c check-unit-y += tests/test-cutils$(EXESUF) gcov-files-test-cutils-y += util/cutils.c check-unit-y += tests/test-mul64$(EXESUF) @@ -247,7 +247,7 @@ tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(block-obj-y) libqemu tests/test-iov$(EXESUF): tests/test-iov.o libqemuutil.a tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o libqemuutil.a libqemustub.a tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o -tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o xbzrle.o page_cache.o libqemuutil.a +tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/xbzrle.o page_cache.o libqemuutil.a tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o tests/test-int128$(EXESUF): tests/test-int128.o tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ @@ -258,7 +258,7 @@ tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ $(test-qapi-obj-y) \ libqemuutil.a libqemustub.a tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ - vmstate.o qemu-file.o qemu-file-unix.o \ + migration/vmstate.o migration/qemu-file.o migration/qemu-file-unix.o \ libqemuutil.a libqemustub.a tests/test-qapi-types.c tests/test-qapi-types.h :\ -- 1.9.3