From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NogPW-0000Ec-Tm
	for qemu-devel@nongnu.org; Mon, 08 Mar 2010 12:06:31 -0500
Received: from [199.232.76.173] (port=47313 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NogPW-0000E6-Ci
	for qemu-devel@nongnu.org; Mon, 08 Mar 2010 12:06:30 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <anthony@codemonkey.ws>) id 1NogPU-0001or-QM
	for qemu-devel@nongnu.org; Mon, 08 Mar 2010 12:06:29 -0500
Received: from mx20.gnu.org ([199.232.41.8]:55389)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1NogPR-0001mP-2s
	for qemu-devel@nongnu.org; Mon, 08 Mar 2010 12:06:28 -0500
Received: from mail-ww0-f45.google.com ([74.125.82.45])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1NogOr-0006UA-6O
	for qemu-devel@nongnu.org; Mon, 08 Mar 2010 12:05:49 -0500
Received: by wwb34 with SMTP id 34so3168789wwb.4
	for <qemu-devel@nongnu.org>; Mon, 08 Mar 2010 09:05:34 -0800 (PST)
Message-ID: <4B952E55.5060206@codemonkey.ws>
Date: Mon, 08 Mar 2010 11:05:25 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH] Fix hanging user monitor when using balloon
	command
References: <1266008156.3474.18.camel@aglitke>	
	<4B7F070A.9010100@codemonkey.ws> <1266857480.3174.10.camel@aglitke>
In-Reply-To: <1266857480.3174.10.camel@aglitke>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
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: Adam Litke <agl@us.ibm.com>
Cc: qemu-devel@nongnu.org

On 02/22/2010 10:51 AM, Adam Litke wrote:
> This patch application failed. My patch adds a cb() call in
> do_balloon(), but the change in git has added the cb() call to
> do_info_balloon().  That is causing qemu segfaults.  Applying the
> following should correct the damage.  Thanks.
>
> Fix for commit: 5c366a8a3d7ac71beda8499caa815cb3ea95eb58
>
> The cb() call is needed in do_balloon(), not do_info_balloon().
>
> Signed-off-by: Adam Litke<agl@us.ibm.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori

> diff --git a/monitor.c b/monitor.c
> index b1a6edc..c7d2117 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -2309,7 +2309,6 @@ static int do_info_balloon(Monitor *mon, MonitorCompletion cb, void *opaque)
>           return -1;
>       }
>
> -    cb(opaque, NULL);
>       return 0;
>   }
>
> @@ -2332,6 +2331,7 @@ static int do_balloon(Monitor *mon, const QDict *params,
>           return -1;
>       }
>
> +    cb(opaque, NULL);
>       return 0;
>   }
>
>
>
>
>