[Qemu-devel] [PULL 02/21] migration: move savevm.c inside migration/

[Juan Quintela <quintela@redhat.com>]

Now, everything is in place.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 MAINTAINERS                    | 1 -
 Makefile.target                | 4 ++--
 savevm.c => migration/savevm.c | 0
 trace-events                   | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename savevm.c => migration/savevm.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 93c0d94..e5222d3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1013,7 +1013,6 @@ M: Amit Shah <amit.shah@redhat.com>
 S: Maintained
 F: include/migration/
 F: migration/
-F: savevm.c
 F: scripts/vmstate-static-checker.py
 F: tests/vmstate-static-checker-data/

diff --git a/Makefile.target b/Makefile.target
index 9d9462c..383dcc3 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -131,10 +131,10 @@ obj-y += qtest.o bootdevice.o
 obj-y += hw/
 obj-$(CONFIG_FDT) += device_tree.o
 obj-$(CONFIG_KVM) += kvm-all.o
-obj-y += memory.o savevm.o cputlb.o
+obj-y += memory.o cputlb.o
 obj-y += memory_mapping.o
 obj-y += dump.o
-obj-y += migration/ram.o
+obj-y += migration/ram.o migration/savevm.o
 LIBS := $(libs_softmmu) $(LIBS)

 # xen support
diff --git a/savevm.c b/migration/savevm.c
similarity index 100%
rename from savevm.c
rename to migration/savevm.c
diff --git a/trace-events b/trace-events
index 6996683..a7580f4 100644
--- a/trace-events
+++ b/trace-events
@@ -1167,7 +1167,7 @@ vmware_scratch_read(uint32_t index, uint32_t value) "index %d, value 0x%x"
 vmware_scratch_write(uint32_t index, uint32_t value) "index %d, value 0x%x"
 vmware_setmode(uint32_t w, uint32_t h, uint32_t bpp) "%dx%d @ %d bpp"

-# savevm.c
+# migration/savevm.c
 qemu_loadvm_state_section(unsigned int section_type) "%d"
 qemu_loadvm_state_section_partend(uint32_t section_id) "%u"
 qemu_loadvm_state_section_startfull(uint32_t section_id, const char *idstr, uint32_t instance_id, uint32_t version_id) "%u(%s) %u %u"
-- 
2.4.1