From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L0OD5-000491-V1
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 17:29:16 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L0OD4-00048F-1Q
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 17:29:15 -0500
Received: from [199.232.76.173] (port=53905 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L0OD3-00048A-S8
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 17:29:13 -0500
Received: from savannah.gnu.org ([199.232.41.3]:59621 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1L0OD3-0003OM-Ky
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 17:29:13 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1L0OD2-0000Sj-NC
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 22:29:12 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1L0OD2-0000Sf-Ea
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 22:29:12 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1L0OD2-0000Sf-Ea@cvs.savannah.gnu.org>
Date: Wed, 12 Nov 2008 22:29:12 +0000
Subject: [Qemu-devel] [5713] Fix brown-paper-bag bugs from live-migration
	patch (Charles Duffy)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 5713
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5713
Author:   aliguori
Date:     2008-11-12 22:29:11 +0000 (Wed, 12 Nov 2008)

Log Message:
-----------
Fix brown-paper-bag bugs from live-migration patch (Charles Duffy)

In TCP migration, prevent an endless loop trying to retrieve error status. In
exec migration, set the close pointer in the FdMigrationState structure.

Color me embarrassed.

Signed-off-by: Charles Duffy <charles_duffy@messageone.com> 
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/migration-exec.c
    trunk/migration-tcp.c

Modified: trunk/migration-exec.c
===================================================================
--- trunk/migration-exec.c	2008-11-12 20:36:27 UTC (rev 5712)
+++ trunk/migration-exec.c	2008-11-12 22:29:11 UTC (rev 5713)
@@ -85,6 +85,7 @@
 
     s->opaque = qemu_popen(f, "w");
 
+    s->close = exec_close;
     s->get_error = file_errno;
     s->write = file_write;
     s->mig_state.cancel = migrate_fd_cancel;

Modified: trunk/migration-tcp.c
===================================================================
--- trunk/migration-tcp.c	2008-11-12 20:36:27 UTC (rev 5712)
+++ trunk/migration-tcp.c	2008-11-12 22:29:11 UTC (rev 5713)
@@ -32,7 +32,7 @@
 
 static int socket_errno(FdMigrationState *s)
 {
-    return (s->get_error(s));
+    return socket_error();
 }
 
 static int socket_write(FdMigrationState *s, const void * buf, size_t size)