diff options
author | Adam Litke <agl@us.ibm.com> | 2010-02-22 10:51:20 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-08 11:29:17 -0600 |
commit | 93d67ee69d6104976961fbc98654872de28a5c96 (patch) | |
tree | 74ec259a0b674411e68fdaa0886551e246f2e080 | |
parent | 4e75b342b60bfc2c347fdc458c653fce83ddfaca (diff) |
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 <agl@us.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | monitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; } |