提交 422e0501 编写于 作者: M Markus Armbruster

balloon: Factor out common "is balloon active" test

Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
上级 6502a147
...@@ -36,6 +36,19 @@ static QEMUBalloonEvent *balloon_event_fn; ...@@ -36,6 +36,19 @@ static QEMUBalloonEvent *balloon_event_fn;
static QEMUBalloonStatus *balloon_stat_fn; static QEMUBalloonStatus *balloon_stat_fn;
static void *balloon_opaque; static void *balloon_opaque;
static bool have_ballon(Error **errp)
{
if (kvm_enabled() && !kvm_has_sync_mmu()) {
error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
return false;
}
if (!balloon_event_fn) {
error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
return false;
}
return true;
}
int qemu_add_balloon_handler(QEMUBalloonEvent *event_func, int qemu_add_balloon_handler(QEMUBalloonEvent *event_func,
QEMUBalloonStatus *stat_func, void *opaque) QEMUBalloonStatus *stat_func, void *opaque)
{ {
...@@ -66,13 +79,7 @@ BalloonInfo *qmp_query_balloon(Error **errp) ...@@ -66,13 +79,7 @@ BalloonInfo *qmp_query_balloon(Error **errp)
{ {
BalloonInfo *info; BalloonInfo *info;
if (kvm_enabled() && !kvm_has_sync_mmu()) { if (!have_ballon(errp)) {
error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
return NULL;
}
if (!balloon_stat_fn) {
error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
return NULL; return NULL;
} }
...@@ -83,8 +90,7 @@ BalloonInfo *qmp_query_balloon(Error **errp) ...@@ -83,8 +90,7 @@ BalloonInfo *qmp_query_balloon(Error **errp)
void qmp_balloon(int64_t target, Error **errp) void qmp_balloon(int64_t target, Error **errp)
{ {
if (kvm_enabled() && !kvm_has_sync_mmu()) { if (!have_ballon(errp)) {
error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
return; return;
} }
...@@ -92,11 +98,6 @@ void qmp_balloon(int64_t target, Error **errp) ...@@ -92,11 +98,6 @@ void qmp_balloon(int64_t target, Error **errp)
error_set(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size"); error_set(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size");
return; return;
} }
if (!balloon_event_fn) {
error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
return;
}
trace_balloon_event(balloon_opaque, target); trace_balloon_event(balloon_opaque, target);
balloon_event_fn(balloon_opaque, target); balloon_event_fn(balloon_opaque, target);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册