[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 7/9] balloon: Inline qemu_balloon(), qemu_balloon
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 7/9] balloon: Inline qemu_balloon(), qemu_balloon_status() |
Date: |
Thu, 29 Jan 2015 10:27:36 +0100 |
... and simplify a bit. Permits factoring out common error checks in
the next commit.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
balloon.c | 42 +++++++++++++-----------------------------
1 file changed, 13 insertions(+), 29 deletions(-)
diff --git a/balloon.c b/balloon.c
index b70da4f..2884c2d 100644
--- a/balloon.c
+++ b/balloon.c
@@ -62,25 +62,6 @@ void qemu_remove_balloon_handler(void *opaque)
balloon_opaque = NULL;
}
-static int qemu_balloon(ram_addr_t target)
-{
- if (!balloon_event_fn) {
- return 0;
- }
- trace_balloon_event(balloon_opaque, target);
- balloon_event_fn(balloon_opaque, target);
- return 1;
-}
-
-static int qemu_balloon_status(BalloonInfo *info)
-{
- if (!balloon_stat_fn) {
- return 0;
- }
- balloon_stat_fn(balloon_opaque, info);
- return 1;
-}
-
BalloonInfo *qmp_query_balloon(Error **errp)
{
BalloonInfo *info;
@@ -90,30 +71,33 @@ BalloonInfo *qmp_query_balloon(Error **errp)
return NULL;
}
+ if (!balloon_stat_fn) {
+ error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
+ return NULL;
+ }
+
info = g_malloc0(sizeof(*info));
-
- if (qemu_balloon_status(info) == 0) {
- error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
- qapi_free_BalloonInfo(info);
- return NULL;
- }
-
+ balloon_stat_fn(balloon_opaque, info);
return info;
}
-void qmp_balloon(int64_t value, Error **errp)
+void qmp_balloon(int64_t target, Error **errp)
{
if (kvm_enabled() && !kvm_has_sync_mmu()) {
error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
return;
}
- if (value <= 0) {
+ if (target <= 0) {
error_set(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size");
return;
}
- if (qemu_balloon(value) == 0) {
+ if (!balloon_event_fn) {
error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
+ return;
}
+
+ trace_balloon_event(balloon_opaque, target);
+ balloon_event_fn(balloon_opaque, target);
}
--
1.9.3
- [Qemu-devel] [PATCH v2 0/9] qmp hmp balloon: Cleanups around error reporting, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 2/9] qmp hmp: Improve error messages when SPICE is not in use, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 9/9] balloon: Eliminate silly QERR_ macros, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 5/9] qmp: Simplify recognition of capability negotiation command, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 7/9] balloon: Inline qemu_balloon(), qemu_balloon_status(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 4/9] qmp: Clean up qmp_query_spice() #ifndef !CONFIG_SPICE dummy, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 6/9] qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 8/9] balloon: Factor out common "is balloon active" test, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 3/9] hmp: Compile hmp_info_spice() only with CONFIG_SPICE, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 1/9] qmp hmp: Factor out common "using spice" test, Markus Armbruster, 2015/01/29