[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/7] balloon: Make functions, local vars static
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PATCH 1/7] balloon: Make functions, local vars static |
Date: |
Tue, 26 Jul 2011 14:38:11 +0530 |
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 <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
balloon.c | 22 +++++++++++-----------
balloon.h | 4 ----
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/balloon.c b/balloon.c
index 248c1b5..f9bcf07 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 d478e28..06a8a46 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,
--
1.7.6
- [Qemu-devel] [PULL 0/7] virtio-balloon: cleanups, fix segfault from use-after-free, Amit Shah, 2011/07/26
- [Qemu-devel] [PATCH 1/7] balloon: Make functions, local vars static,
Amit Shah <=
- [Qemu-devel] [PATCH 2/7] balloon: Add braces around if statements, Amit Shah, 2011/07/26
- [Qemu-devel] [PATCH 3/7] balloon: Simplify code flow, Amit Shah, 2011/07/26
- [Qemu-devel] [PATCH 4/7] virtio-balloon: Separate status handling into separate function, Amit Shah, 2011/07/26
- [Qemu-devel] [PATCH 5/7] balloon: Separate out stat and balloon handling, Amit Shah, 2011/07/26
- [Qemu-devel] [PATCH 6/7] balloon: Fix header comment; add Copyright, Amit Shah, 2011/07/26
- [Qemu-devel] [PATCH 7/7] virtio-balloon: Fix header comment; add Copyright, Amit Shah, 2011/07/26