diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2018-08-17 09:27:15 -0600 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2018-08-17 09:27:15 -0600 |
| commit | 01ccbec7bdf6f89f1b7d46dda05e4c1fd2dd5ade (patch) | |
| tree | 0340db7ce0187aff3b3fde1a9d220568dc8cc163 | |
| parent | 0abaa41d936becd914a16ee1fe2a981d96d19428 (diff) | |
| download | focaccia-qemu-01ccbec7bdf6f89f1b7d46dda05e4c1fd2dd5ade.tar.gz focaccia-qemu-01ccbec7bdf6f89f1b7d46dda05e4c1fd2dd5ade.zip | |
balloon: Allow multiple inhibit users
A simple true/false internal state does not allow multiple users. Fix this within the existing interface by converting to a counter, so long as the counter is elevated, ballooning is inhibited. Reviewed-by: David Hildenbrand <david@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
| -rw-r--r-- | balloon.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/balloon.c b/balloon.c index 6bf0a96813..9319879838 100644 --- a/balloon.c +++ b/balloon.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" +#include "qemu/atomic.h" #include "exec/cpu-common.h" #include "sysemu/kvm.h" #include "sysemu/balloon.h" @@ -37,16 +38,22 @@ static QEMUBalloonEvent *balloon_event_fn; static QEMUBalloonStatus *balloon_stat_fn; static void *balloon_opaque; -static bool balloon_inhibited; +static int balloon_inhibit_count; bool qemu_balloon_is_inhibited(void) { - return balloon_inhibited; + return atomic_read(&balloon_inhibit_count) > 0; } void qemu_balloon_inhibit(bool state) { - balloon_inhibited = state; + if (state) { + atomic_inc(&balloon_inhibit_count); + } else { + atomic_dec(&balloon_inhibit_count); + } + + assert(atomic_read(&balloon_inhibit_count) >= 0); } static bool have_balloon(Error **errp) |