[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/21] migration: move savevm.c inside migration/
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 02/21] migration: move savevm.c inside migration/ |
Date: |
Wed, 3 Jun 2015 14:05:38 +0200 |
Now, everything is in place.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
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 <address@hidden>
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
- [Qemu-devel] [PULL 00/21] Migration pull request, Juan Quintela, 2015/06/03
- [Qemu-devel] [PULL 04/21] migration: reduce include files, Juan Quintela, 2015/06/03
- [Qemu-devel] [PULL 02/21] migration: move savevm.c inside migration/,
Juan Quintela <=
- [Qemu-devel] [PULL 03/21] migration: Add myself to the copyright list of both files, Juan Quintela, 2015/06/03
- [Qemu-devel] [PULL 05/21] arch_init: Clean up the duplicate variable 'len' defining in ram_load(), Juan Quintela, 2015/06/03
- [Qemu-devel] [PULL 07/21] migration: Remove duplicated assignment of SETUP status, Juan Quintela, 2015/06/03
- [Qemu-devel] [PULL 06/21] rdma: Fix qemu crash when IPv6 address is used for migration, Juan Quintela, 2015/06/03
- [Qemu-devel] [PULL 01/21] migration: move ram stuff to migration/ram, Juan Quintela, 2015/06/03
- [Qemu-devel] [PULL 08/21] migration: create savevm_state, Juan Quintela, 2015/06/03
- [Qemu-devel] [PULL 11/21] Split header writing out of qemu_savevm_state_begin, Juan Quintela, 2015/06/03
- [Qemu-devel] [PULL 09/21] migration: Use normal VMStateDescriptions for Subsections, Juan Quintela, 2015/06/03
- [Qemu-devel] [PULL 12/21] qemu_ram_foreach_block: pass up error value, and down the ramblock name, Juan Quintela, 2015/06/03
- [Qemu-devel] [PULL 14/21] Move copy out of qemu_peek_buffer, Juan Quintela, 2015/06/03