diff options
| author | Amit Shah <amit.shah@redhat.com> | 2011-07-20 13:08:46 +0530 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-04 16:43:08 -0500 |
| commit | 0a2a30d5add5100d0c6cd4b466b227f7d76d19cf (patch) | |
| tree | 6b908d478fd1d3342d27f65b8f14b435de94ffe7 | |
| parent | a6f4e09d90cef88be07cd597c2f2a9f0b3ed0763 (diff) | |
| download | focaccia-qemu-0a2a30d5add5100d0c6cd4b466b227f7d76d19cf.tar.gz focaccia-qemu-0a2a30d5add5100d0c6cd4b466b227f7d76d19cf.zip | |
balloon: Make functions, local vars static
balloon.h had function declarations for a couple of functions that are local to balloon.c. Make them static. Drop the 'qemu_' prefix for balloon.c-local variables, and make them static. Signed-off-by: Amit Shah <amit.shah@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com>
| -rw-r--r-- | balloon.c | 22 | ||||
| -rw-r--r-- | balloon.h | 4 |
2 files changed, 11 insertions, 15 deletions
diff --git a/balloon.c b/balloon.c index 248c1b50a9..f9bcf07b19 100644 --- a/balloon.c +++ b/balloon.c @@ -31,30 +31,30 @@ #include "trace.h" -static QEMUBalloonEvent *qemu_balloon_event; -void *qemu_balloon_event_opaque; +static QEMUBalloonEvent *balloon_event_fn; +static void *balloon_opaque; void qemu_add_balloon_handler(QEMUBalloonEvent *func, void *opaque) { - qemu_balloon_event = func; - qemu_balloon_event_opaque = opaque; + balloon_event_fn = func; + balloon_opaque = opaque; } -int qemu_balloon(ram_addr_t target, MonitorCompletion cb, void *opaque) +static int qemu_balloon(ram_addr_t target, MonitorCompletion cb, void *opaque) { - if (qemu_balloon_event) { - trace_balloon_event(qemu_balloon_event_opaque, target); - qemu_balloon_event(qemu_balloon_event_opaque, target, cb, opaque); + if (balloon_event_fn) { + trace_balloon_event(balloon_opaque, target); + balloon_event_fn(balloon_opaque, target, cb, opaque); return 1; } else { return 0; } } -int qemu_balloon_status(MonitorCompletion cb, void *opaque) +static int qemu_balloon_status(MonitorCompletion cb, void *opaque) { - if (qemu_balloon_event) { - qemu_balloon_event(qemu_balloon_event_opaque, 0, cb, opaque); + if (balloon_event_fn) { + balloon_event_fn(balloon_opaque, 0, cb, opaque); return 1; } else { return 0; diff --git a/balloon.h b/balloon.h index d478e28475..06a8a46b50 100644 --- a/balloon.h +++ b/balloon.h @@ -21,10 +21,6 @@ typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target, void qemu_add_balloon_handler(QEMUBalloonEvent *func, void *opaque); -int qemu_balloon(ram_addr_t target, MonitorCompletion cb, void *opaque); - -int qemu_balloon_status(MonitorCompletion cb, void *opaque); - void monitor_print_balloon(Monitor *mon, const QObject *data); int do_info_balloon(Monitor *mon, MonitorCompletion cb, void *opaque); int do_balloon(Monitor *mon, const QDict *params, |