Next commit will introduce the QEMUBalloonStats type, which can cause confusion with QEMUBalloonStatus. Also, QEMUBalloonInfo matches better with the BalloonInfo type, where the current balloon information is returned.
Signed-off-by: Luiz Capitulino <[email protected]> --- balloon.c | 18 +++++++++--------- balloon.h | 4 ++-- hw/virtio-balloon.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/balloon.c b/balloon.c index aa354f7..b32b487 100644 --- a/balloon.c +++ b/balloon.c @@ -32,13 +32,13 @@ #include "qmp-commands.h" static QEMUBalloonEvent *balloon_event_fn; -static QEMUBalloonStatus *balloon_stat_fn; +static QEMUBalloonInfo *balloon_info_fn; static void *balloon_opaque; int qemu_add_balloon_handler(QEMUBalloonEvent *event_func, - QEMUBalloonStatus *stat_func, void *opaque) + QEMUBalloonInfo *info_func, void *opaque) { - if (balloon_event_fn || balloon_stat_fn || balloon_opaque) { + if (balloon_event_fn || balloon_info_fn || balloon_opaque) { /* We're already registered one balloon handler. How many can * a guest really have? */ @@ -46,7 +46,7 @@ int qemu_add_balloon_handler(QEMUBalloonEvent *event_func, return -1; } balloon_event_fn = event_func; - balloon_stat_fn = stat_func; + balloon_info_fn = info_func; balloon_opaque = opaque; return 0; } @@ -57,7 +57,7 @@ void qemu_remove_balloon_handler(void *opaque) return; } balloon_event_fn = NULL; - balloon_stat_fn = NULL; + balloon_info_fn = NULL; balloon_opaque = NULL; } @@ -71,12 +71,12 @@ static int qemu_balloon(ram_addr_t target) return 1; } -static int qemu_balloon_status(BalloonInfo *info) +static int qemu_balloon_info(BalloonInfo *info) { - if (!balloon_stat_fn) { + if (!balloon_info_fn) { return 0; } - balloon_stat_fn(balloon_opaque, info); + balloon_info_fn(balloon_opaque, info); return 1; } @@ -91,7 +91,7 @@ BalloonInfo *qmp_query_balloon(Error **errp) info = g_malloc0(sizeof(*info)); - if (qemu_balloon_status(info) == 0) { + if (qemu_balloon_info(info) == 0) { error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon"); qapi_free_BalloonInfo(info); return NULL; diff --git a/balloon.h b/balloon.h index 17fe300..a539354 100644 --- a/balloon.h +++ b/balloon.h @@ -17,10 +17,10 @@ #include "qapi-types.h" typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target); -typedef void (QEMUBalloonStatus)(void *opaque, BalloonInfo *info); +typedef void (QEMUBalloonInfo)(void *opaque, BalloonInfo *info); int qemu_add_balloon_handler(QEMUBalloonEvent *event_func, - QEMUBalloonStatus *stat_func, void *opaque); + QEMUBalloonInfo *info_func, void *opaque); void qemu_remove_balloon_handler(void *opaque); #endif diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index ce9d2c9..4307f4c 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -156,7 +156,7 @@ static uint32_t virtio_balloon_get_features(VirtIODevice *vdev, uint32_t f) return f; } -static void virtio_balloon_stat(void *opaque, BalloonInfo *info) +static void virtio_balloon_info(void *opaque, BalloonInfo *info) { VirtIOBalloon *dev = opaque; @@ -236,7 +236,7 @@ VirtIODevice *virtio_balloon_init(DeviceState *dev) s->vdev.get_features = virtio_balloon_get_features; ret = qemu_add_balloon_handler(virtio_balloon_to_target, - virtio_balloon_stat, s); + virtio_balloon_info, s); if (ret < 0) { virtio_cleanup(&s->vdev); return NULL; -- 1.7.9.rc0.dirty
