diff mbox

[1/2] balloon: Disassociate handlers from balloon device on unplug

Message ID 7d472e560b452ffba3f75ae364c2db709f7fab2d.1315558826.git.amit.shah@redhat.com
State New
Headers show

Commit Message

Amit Shah Sept. 9, 2011, 9 a.m. UTC
When a balloon device gets unplugged, allow the balloon handlers to be
freed.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 balloon.c |   10 ++++++++++
 balloon.h |    1 +
 2 files changed, 11 insertions(+), 0 deletions(-)

Comments

Anthony Liguori Sept. 9, 2011, 6:35 p.m. UTC | #1
On 09/09/2011 04:00 AM, Amit Shah wrote:
> When a balloon device gets unplugged, allow the balloon handlers to be
> freed.
>
> Signed-off-by: Amit Shah<amit.shah@redhat.com>

Applied all.  Thanks.

Regards,

Anthony Liguori

> ---
>   balloon.c |   10 ++++++++++
>   balloon.h |    1 +
>   2 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/balloon.c b/balloon.c
> index f56fdc1..a2133db 100644
> --- a/balloon.c
> +++ b/balloon.c
> @@ -52,6 +52,16 @@ int qemu_add_balloon_handler(QEMUBalloonEvent *event_func,
>       return 0;
>   }
>
> +void qemu_remove_balloon_handler(void *opaque)
> +{
> +    if (balloon_opaque != opaque) {
> +        return;
> +    }
> +    balloon_event_fn = NULL;
> +    balloon_stat_fn = NULL;
> +    balloon_opaque = NULL;
> +}
> +
>   static int qemu_balloon(ram_addr_t target)
>   {
>       if (!balloon_event_fn) {
> diff --git a/balloon.h b/balloon.h
> index 3df14e6..f59e288 100644
> --- a/balloon.h
> +++ b/balloon.h
> @@ -22,6 +22,7 @@ typedef void (QEMUBalloonStatus)(void *opaque, MonitorCompletion cb,
>
>   int qemu_add_balloon_handler(QEMUBalloonEvent *event_func,
>   			     QEMUBalloonStatus *stat_func, void *opaque);
> +void qemu_remove_balloon_handler(void *opaque);
>
>   void monitor_print_balloon(Monitor *mon, const QObject *data);
>   int do_info_balloon(Monitor *mon, MonitorCompletion cb, void *opaque);
diff mbox

Patch

diff --git a/balloon.c b/balloon.c
index f56fdc1..a2133db 100644
--- a/balloon.c
+++ b/balloon.c
@@ -52,6 +52,16 @@  int qemu_add_balloon_handler(QEMUBalloonEvent *event_func,
     return 0;
 }
 
+void qemu_remove_balloon_handler(void *opaque)
+{
+    if (balloon_opaque != opaque) {
+        return;
+    }
+    balloon_event_fn = NULL;
+    balloon_stat_fn = NULL;
+    balloon_opaque = NULL;
+}
+
 static int qemu_balloon(ram_addr_t target)
 {
     if (!balloon_event_fn) {
diff --git a/balloon.h b/balloon.h
index 3df14e6..f59e288 100644
--- a/balloon.h
+++ b/balloon.h
@@ -22,6 +22,7 @@  typedef void (QEMUBalloonStatus)(void *opaque, MonitorCompletion cb,
 
 int qemu_add_balloon_handler(QEMUBalloonEvent *event_func,
 			     QEMUBalloonStatus *stat_func, void *opaque);
+void qemu_remove_balloon_handler(void *opaque);
 
 void monitor_print_balloon(Monitor *mon, const QObject *data);
 int do_info_balloon(Monitor *mon, MonitorCompletion cb, void *opaque);