diff options
| author | Juan Quintela <quintela@redhat.com> | 2015-05-08 12:49:01 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2015-06-12 06:42:30 +0200 |
| commit | c3049a56d69f1ee7e85b5100ba5d0e3dc69a14f1 (patch) | |
| tree | d23d1a816403b88692e8064c1120d3dfa103b791 | |
| parent | 56e93d26b85bac76b93211393163c2ebcdee9481 (diff) | |
migration: move savevm.c inside migration/
Now, everything is in place.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | Makefile.target | 4 | ||||
| -rw-r--r-- | migration/savevm.c (renamed from savevm.c) | 0 | ||||
| -rw-r--r-- | trace-events | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b1833959d6..e728d3a1d2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1014,7 +1014,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 27209a7f0a..3e7aafd72d 100644 --- a/Makefile.target +++ b/Makefile.target @@ -132,10 +132,10 @@ obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o obj-y += qtest.o bootdevice.o obj-y += hw/ 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 index 3b0e222cb3..3b0e222cb3 100644 --- a/savevm.c +++ b/migration/savevm.c diff --git a/trace-events b/trace-events index dc1ef1f8e6..b64e1252ce 100644 --- a/trace-events +++ b/trace-events @@ -1179,7 +1179,7 @@ virtio_gpu_cmd_res_flush(uint32_t res, uint32_t w, uint32_t h, uint32_t x, uint3 virtio_gpu_fence_ctrl(uint64_t fence, uint32_t type) "fence 0x%" PRIx64 ", type 0x%x" virtio_gpu_fence_resp(uint64_t fence) "fence 0x%" PRIx64 -# 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" |