From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z07Qz-0006oh-3J for qemu-devel@nongnu.org; Wed, 03 Jun 2015 08:06:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z07Qq-0003gI-AL for qemu-devel@nongnu.org; Wed, 03 Jun 2015 08:06:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43196) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z07Qq-0003gD-4j for qemu-devel@nongnu.org; Wed, 03 Jun 2015 08:06:04 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id D7256CE0 for ; Wed, 3 Jun 2015 12:06:03 +0000 (UTC) From: Juan Quintela Date: Wed, 3 Jun 2015 14:05:38 +0200 Message-Id: <1433333157-9939-3-git-send-email-quintela@redhat.com> In-Reply-To: <1433333157-9939-1-git-send-email-quintela@redhat.com> References: <1433333157-9939-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PULL 02/21] migration: move savevm.c inside migration/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com Now, everything is in place. Signed-off-by: Juan Quintela Reviewed-by: Eric Blake --- 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 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