[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/9] qmp hmp: Factor out common "using spice" test
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 1/9] qmp hmp: Factor out common "using spice" test |
Date: |
Thu, 5 Feb 2015 08:36:15 +0100 |
Into qemu_using_spice(). For want of a better place, put it next the
existing monitor command handler dummies in qemu-spice.h.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
---
include/ui/qemu-spice.h | 10 ++++++++++
monitor.c | 5 +++--
qmp.c | 11 +++--------
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index a93b4b2..db7926d 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -88,4 +88,14 @@ static inline int qemu_spice_display_add_client(int csock,
int skipauth,
#endif /* CONFIG_SPICE */
+static inline bool qemu_using_spice(Error **errp)
+{
+ if (!using_spice) {
+ /* correct one? spice isn't a device ,,, */
+ error_set(errp, QERR_DEVICE_NOT_ACTIVE, "spice");
+ return false;
+ }
+ return true;
+}
+
#endif /* QEMU_SPICE_H */
diff --git a/monitor.c b/monitor.c
index 7e4f605..8323de3 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1095,11 +1095,12 @@ static int client_migrate_info(Monitor *mon, const
QDict *qdict,
const char *subject = qdict_get_try_str(qdict, "cert-subject");
int port = qdict_get_try_int(qdict, "port", -1);
int tls_port = qdict_get_try_int(qdict, "tls-port", -1);
+ Error *err;
int ret;
if (strcmp(protocol, "spice") == 0) {
- if (!using_spice) {
- qerror_report(QERR_DEVICE_NOT_ACTIVE, "spice");
+ if (!qemu_using_spice(&err)) {
+ qerror_report_err(err);
return -1;
}
diff --git a/qmp.c b/qmp.c
index 963305c..ef155ff 100644
--- a/qmp.c
+++ b/qmp.c
@@ -287,9 +287,7 @@ void qmp_set_password(const char *protocol, const char
*password,
}
if (strcmp(protocol, "spice") == 0) {
- if (!using_spice) {
- /* correct one? spice isn't a device ,,, */
- error_set(errp, QERR_DEVICE_NOT_ACTIVE, "spice");
+ if (!qemu_using_spice(errp)) {
return;
}
rc = qemu_spice_set_passwd(password, fail_if_connected,
@@ -335,9 +333,7 @@ void qmp_expire_password(const char *protocol, const char
*whenstr,
}
if (strcmp(protocol, "spice") == 0) {
- if (!using_spice) {
- /* correct one? spice isn't a device ,,, */
- error_set(errp, QERR_DEVICE_NOT_ACTIVE, "spice");
+ if (!qemu_using_spice(errp)) {
return;
}
rc = qemu_spice_set_pw_expire(when);
@@ -575,8 +571,7 @@ void qmp_add_client(const char *protocol, const char
*fdname,
}
if (strcmp(protocol, "spice") == 0) {
- if (!using_spice) {
- error_set(errp, QERR_DEVICE_NOT_ACTIVE, "spice");
+ if (!qemu_using_spice(errp)) {
close(fd);
return;
}
--
1.9.3
- [Qemu-devel] [PULL 0/9] qmp hmp balloon: Cleanups around error reporting, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 3/9] hmp: Compile hmp_info_spice() only with CONFIG_SPICE, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 2/9] qmp hmp: Improve error messages when SPICE is not in use, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 1/9] qmp hmp: Factor out common "using spice" test,
Markus Armbruster <=
- [Qemu-devel] [PULL 9/9] balloon: Eliminate silly QERR_ macros, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 7/9] balloon: Inline qemu_balloon(), qemu_balloon_status(), Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 6/9] qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 5/9] qmp: Simplify recognition of capability negotiation command, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 8/9] balloon: Factor out common "is balloon active" test, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 4/9] qmp: Clean up qmp_query_spice() #ifndef !CONFIG_SPICE dummy, Markus Armbruster, 2015/02/05
- Re: [Qemu-devel] [PULL 0/9] qmp hmp balloon: Cleanups around error reporting, Peter Maydell, 2015/02/05