From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L0NMX-00058r-Bo
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 16:34:57 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L0NMU-00057g-GQ
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 16:34:56 -0500
Received: from [199.232.76.173] (port=49624 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L0NMU-00057P-AI
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 16:34:54 -0500
Received: from main.gmane.org ([80.91.229.2]:36031 helo=ciao.gmane.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gceq-qemu-devel@m.gmane.org>)
	id 1L0NMT-0006za-L0
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 16:34:53 -0500
Received: from list by ciao.gmane.org with local (Exim 4.43)
	id 1L0NMO-0007jY-Qn
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 21:34:48 +0000
Received: from rrcs-71-41-149-67.sw.biz.rr.com ([71.41.149.67])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <qemu-devel@nongnu.org>; Wed, 12 Nov 2008 21:34:48 +0000
Received: from Charles_Duffy by rrcs-71-41-149-67.sw.biz.rr.com with local
	(Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00
	for <qemu-devel@nongnu.org>; Wed, 12 Nov 2008 21:34:48 +0000
From: Charles Duffy <Charles_Duffy@messageone.com>
Date: Wed, 12 Nov 2008 15:34:39 -0600
Message-ID: <gffi5g$v3n$1@ger.gmane.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------030400040603050109040704"
Sender: news <news@ger.gmane.org>
Subject: [Qemu-devel] [PATCH] Fix brown-paper-bag bugs from live-migration
	patch
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

This is a multi-part message in MIME format.
--------------030400040603050109040704
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

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>

--------------030400040603050109040704
Content-Type: text/x-patch;
 name="migration-brown-paper-bag-fixes.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="migration-brown-paper-bag-fixes.patch"

diff --git a/migration-exec.c b/migration-exec.c
index 5d0b215..caeed4b 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -85,6 +85,7 @@ MigrationState *exec_start_outgoing_migration(const char *command,
 
     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;
diff --git a/migration-tcp.c b/migration-tcp.c
index 100644b..6fc1943 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -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)

--------------030400040603050109040704--