From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XN274-0003Hn-SL for qemu-devel@nongnu.org; Thu, 28 Aug 2014 11:59:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XN26y-0002jS-9D for qemu-devel@nongnu.org; Thu, 28 Aug 2014 11:59:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XN26x-0002jM-Mu for qemu-devel@nongnu.org; Thu, 28 Aug 2014 11:59:44 -0400 From: "Dr. David Alan Gilbert (git)" Date: Thu, 28 Aug 2014 16:03:47 +0100 Message-Id: <1409238244-31720-31-git-send-email-dgilbert@redhat.com> In-Reply-To: <1409238244-31720-1-git-send-email-dgilbert@redhat.com> References: <1409238244-31720-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v3 30/47] postcopy: Incoming initialisation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aarcange@redhat.com, yamahata@private.email.ne.jp, amit.shah@redhat.com, lilei@linux.vnet.ibm.com, quintela@redhat.com From: "Dr. David Alan Gilbert" Signed-off-by: Dr. David Alan Gilbert --- arch_init.c | 11 +++++++++++ include/migration/migration.h | 1 + migration.c | 1 + 3 files changed, 13 insertions(+) diff --git a/arch_init.c b/arch_init.c index 2c587aa..d4144e4 100644 --- a/arch_init.c +++ b/arch_init.c @@ -1234,6 +1234,17 @@ void ram_handle_compressed(void *host, uint8_t ch, uint64_t size) } } +/* + * Allocate data structures etc needed by incoming migration with postcopy-ram + * postcopy-ram's similarly names postcopy_ram_incoming_init does the work + */ +int ram_postcopy_incoming_init(MigrationIncomingState *mis) +{ + size_t ram_pages = last_ram_offset() >> TARGET_PAGE_BITS; + + return postcopy_ram_incoming_init(mis, ram_pages); +} + static int ram_load(QEMUFile *f, void *opaque, int version_id) { ram_addr_t addr; diff --git a/include/migration/migration.h b/include/migration/migration.h index b6e8cda..91269c8 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -195,6 +195,7 @@ int ram_postcopy_each_ram_discard(MigrationState *ms); int ram_discard_range(MigrationIncomingState *mis, const char *block_name, int source_target_page_bits, uint64_t start, uint64_t end); +int ram_postcopy_incoming_init(MigrationIncomingState *mis); /** * @migrate_add_blocker - prevent migration from proceeding diff --git a/migration.c b/migration.c index 7a80e7c..f5d9d02 100644 --- a/migration.c +++ b/migration.c @@ -99,6 +99,7 @@ MigrationIncomingState *migration_incoming_state_init(QEMUFile* f) void migration_incoming_state_destroy(void) { + postcopy_pmi_destroy(mis_current); g_free(mis_current); mis_current = NULL; } -- 1.9.3