[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/9] balloon: Factor out common "is balloon active"
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 8/9] balloon: Factor out common "is balloon active" test |
Date: |
Tue, 13 Jan 2015 18:50:31 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
balloon.c | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/balloon.c b/balloon.c
index 2884c2d..aa30617 100644
--- a/balloon.c
+++ b/balloon.c
@@ -36,6 +36,19 @@ static QEMUBalloonEvent *balloon_event_fn;
static QEMUBalloonStatus *balloon_stat_fn;
static void *balloon_opaque;
+static int have_ballon(Error **errp)
+{
+ if (kvm_enabled() && !kvm_has_sync_mmu()) {
+ error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
+ return 0;
+ }
+ if (!balloon_event_fn) {
+ error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
+ return 0;
+ }
+ return 1;
+}
+
int qemu_add_balloon_handler(QEMUBalloonEvent *event_func,
QEMUBalloonStatus *stat_func, void *opaque)
{
@@ -66,13 +79,7 @@ BalloonInfo *qmp_query_balloon(Error **errp)
{
BalloonInfo *info;
- if (kvm_enabled() && !kvm_has_sync_mmu()) {
- error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
- return NULL;
- }
-
- if (!balloon_stat_fn) {
- error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
+ if (!have_ballon(errp)) {
return NULL;
}
@@ -83,8 +90,7 @@ BalloonInfo *qmp_query_balloon(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");
+ if (!have_ballon(errp)) {
return;
}
@@ -92,11 +98,6 @@ void qmp_balloon(int64_t target, Error **errp)
error_set(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size");
return;
}
-
- 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
- Re: [Qemu-devel] [PATCH 1/9] qmp hmp: Factor out common "using spice" test, (continued)
- [Qemu-devel] [PATCH 4/9] qmp: Clean up qmp_query_spice() #ifndef !CONFIG_SPICE dummy, Markus Armbruster, 2015/01/13
- [Qemu-devel] [PATCH 3/9] hmp: Compile hmp_info_spice() only with CONFIG_SPICE, Markus Armbruster, 2015/01/13
- [Qemu-devel] [PATCH 6/9] qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro, Markus Armbruster, 2015/01/13
- [Qemu-devel] [PATCH 2/9] qmp hmp: Improve error messages when SPICE is not in use, Markus Armbruster, 2015/01/13
- [Qemu-devel] [PATCH 7/9] balloon: Inline qemu_balloon(), qemu_balloon_status(), Markus Armbruster, 2015/01/13
- [Qemu-devel] [PATCH 8/9] balloon: Factor out common "is balloon active" test,
Markus Armbruster <=
- [Qemu-devel] [PATCH 9/9] balloon: Eliminate silly QERR_ macros, Markus Armbruster, 2015/01/13
- [Qemu-devel] [PATCH 5/9] qmp: Simplify recognition of capability negotiation command, Markus Armbruster, 2015/01/13
- Re: [Qemu-devel] [PATCH 0/9] qmp hmp balloon: Cleanups around error reporting, Gerd Hoffmann, 2015/01/14