[Qemu-devel] [PATCH v2 2/4] Remove migration- pre/post fixes off files in migration/ dir

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <address@hidden>

The general feeling is that having migration/migration-blah
is overkill.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
 migration/Makefile.objs                  | 8 ++++----
 migration/{block-migration.c => block.c} | 0
 migration/{migration-exec.c => exec.c}   | 0
 migration/{migration-fd.c => fd.c}       | 0
 migration/{migration-rdma.c => rdma.c}   | 0
 migration/{migration-tcp.c => tcp.c}     | 0
 migration/{migration-unix.c => unix.c}   | 0
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename migration/{block-migration.c => block.c} (100%)
 rename migration/{migration-exec.c => exec.c} (100%)
 rename migration/{migration-fd.c => fd.c} (100%)
 rename migration/{migration-rdma.c => rdma.c} (100%)
 rename migration/{migration-tcp.c => tcp.c} (100%)
 rename migration/{migration-unix.c => unix.c} (100%)

diff --git a/migration/Makefile.objs b/migration/Makefile.objs
index 63dbe93..ce1e3c7 100644
--- a/migration/Makefile.objs
+++ b/migration/Makefile.objs
@@ -1,10 +1,10 @@
-common-obj-y += migration.o migration-tcp.o
+common-obj-y += migration.o 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
+common-obj-$(CONFIG_RDMA) += rdma.o
+common-obj-$(CONFIG_POSIX) += exec.o unix.o fd.o
 
-common-obj-y += block-migration.o
+common-obj-y += block.o
 
diff --git a/migration/block-migration.c b/migration/block.c
similarity index 100%
rename from migration/block-migration.c
rename to migration/block.c
diff --git a/migration/migration-exec.c b/migration/exec.c
similarity index 100%
rename from migration/migration-exec.c
rename to migration/exec.c
diff --git a/migration/migration-fd.c b/migration/fd.c
similarity index 100%
rename from migration/migration-fd.c
rename to migration/fd.c
diff --git a/migration/migration-rdma.c b/migration/rdma.c
similarity index 100%
rename from migration/migration-rdma.c
rename to migration/rdma.c
diff --git a/migration/migration-tcp.c b/migration/tcp.c
similarity index 100%
rename from migration/migration-tcp.c
rename to migration/tcp.c
diff --git a/migration/migration-unix.c b/migration/unix.c
similarity index 100%
rename from migration/migration-unix.c
rename to migration/unix.c
-- 
2.1.0