From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4yGB-0001QD-OD for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:33:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S4yFe-000557-SH for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:33:15 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:57026) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4yFe-00053f-JH for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:32:42 -0500 Received: by mail-ww0-f53.google.com with SMTP id fm10so3536275wgb.10 for ; Tue, 06 Mar 2012 09:32:41 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 6 Mar 2012 18:32:24 +0100 Message-Id: <1331055149-10982-6-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1331055149-10982-1-git-send-email-benoit.canet@gmail.com> References: <1331055149-10982-1-git-send-email-benoit.canet@gmail.com> Subject: [Qemu-devel] [RFC PATCH 05/10] migration: inform the block layer of incoming live status List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@linux.vnet.ibm.com, wolf@redhat.com Signed-off-by: Benoit Canet --- migration.c | 2 ++ vl.c | 5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/migration.c b/migration.c index 45af364..5ac31a3 100644 --- a/migration.c +++ b/migration.c @@ -76,6 +76,7 @@ int qemu_start_incoming_migration(const char *uri) ret = fd_start_incoming_migration(p); #endif else { + bdrv_clear_incoming_migration_all(); fprintf(stderr, "unknown migration protocol: %s\n", uri); ret = -EPROTONOSUPPORT; } @@ -91,6 +92,7 @@ void process_incoming_migration(QEMUFile *f) qemu_announce_self(); DPRINTF("successfully loaded vm state\n"); + bdrv_clear_incoming_migration_all(); /* Execute post incoming migration operations : * for qcow2 make sure to flush mutable metadata **/ diff --git a/vl.c b/vl.c index 97ab2b9..b1d3dd2 100644 --- a/vl.c +++ b/vl.c @@ -3389,6 +3389,11 @@ int main(int argc, char **argv, char **envp) blk_mig_init(); + /* make the block layer ready for incoming live migration */ + if (incoming) { + bdrv_set_incoming_migration(); + } + /* open the virtual block devices */ if (snapshot) qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot, NULL, 0); -- 1.7.7.6