From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52074) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0CpP-0005yO-Jj for qemu-devel@nongnu.org; Mon, 17 Apr 2017 16:00:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0CpN-0004Mb-Gs for qemu-devel@nongnu.org; Mon, 17 Apr 2017 16:00:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39298) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0CpN-0004LO-Au for qemu-devel@nongnu.org; Mon, 17 Apr 2017 16:00:49 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BAE7C8047E for ; Mon, 17 Apr 2017 20:00:46 +0000 (UTC) From: Juan Quintela Date: Mon, 17 Apr 2017 22:00:24 +0200 Message-Id: <20170417200041.2451-3-quintela@redhat.com> In-Reply-To: <20170417200041.2451-1-quintela@redhat.com> References: <20170417200041.2451-1-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 02/19] migration: They are called vmstate_foo, move them to vmstate.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com Signed-off-by: Juan Quintela --- migration/savevm.c | 17 ----------------- migration/vmstate.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index cc9c086..c47b209 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -45,7 +45,6 @@ #include "qemu/sockets.h" #include "qemu/queue.h" #include "sysemu/cpus.h" -#include "exec/memory.h" #include "qmp-commands.h" #include "trace.h" #include "qemu/bitops.h" @@ -2465,19 +2464,3 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict) g_free(global_snapshots); } - -void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev) -{ - qemu_ram_set_idstr(mr->ram_block, - memory_region_name(mr), dev); -} - -void vmstate_unregister_ram(MemoryRegion *mr, DeviceState *dev) -{ - qemu_ram_unset_idstr(mr->ram_block); -} - -void vmstate_register_ram_global(MemoryRegion *mr) -{ - vmstate_register_ram(mr, NULL); -} diff --git a/migration/vmstate.c b/migration/vmstate.c index 8a71349..174c490 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" +#include "exec/memory.h" #include "migration/migration.h" #include "migration/qemu-file.h" #include "migration/vmstate.h" @@ -1127,3 +1128,18 @@ bool vmstate_device_is_migratable(const VMStateDescription *vmsd) return true; } +void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev) +{ + qemu_ram_set_idstr(mr->ram_block, + memory_region_name(mr), dev); +} + +void vmstate_unregister_ram(MemoryRegion *mr, DeviceState *dev) +{ + qemu_ram_unset_idstr(mr->ram_block); +} + +void vmstate_register_ram_global(MemoryRegion *mr) +{ + vmstate_register_ram(mr, NULL); +} -- 2.9.3