From 93d67ee69d6104976961fbc98654872de28a5c96 Mon Sep 17 00:00:00 2001 From: Adam Litke Date: Mon, 22 Feb 2010 10:51:20 -0600 Subject: Fix hanging user monitor when using balloon command 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 Signed-off-by: Anthony Liguori --- monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'monitor.c') diff --git a/monitor.c b/monitor.c index 19470d1c0f..61a072b1ae 100644 --- a/monitor.c +++ b/monitor.c @@ -2307,7 +2307,6 @@ static int do_info_balloon(Monitor *mon, MonitorCompletion cb, void *opaque) return -1; } - cb(opaque, NULL); return 0; } @@ -2330,6 +2329,7 @@ static int do_balloon(Monitor *mon, const QDict *params, return -1; } + cb(opaque, NULL); return 0; } -- cgit v1.2.3