aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-01-13 17:21:45 +0100
committerMarkus Armbruster <armbru@redhat.com>2015-01-29 10:01:31 +0100
commitcfa9bb236911eaa30ac58072105881a65cbbb612 (patch)
treee81cbcc04191681d11acd3ae1c12db1e09bd823c /include
parentb25d81ba332dc06757d40ffe64944ba27082de0a (diff)
qmp hmp: Improve error messages when SPICE is not in use
Commit 7572150 adopted QERR_DEVICE_NOT_ACTIVE for the purpose, probably because adding another error seemed cumbersome overkill. Produces "No spice device has been activated", which is awkward. We've since abandoned our quest for "rich" error objects. Time to undo the damage to this error message. Replace it by "SPICE is not in use". Keep the stupid DeviceNotActive ErrorClass for compatibility, even though Libvirt doesn't use it. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/ui/qemu-spice.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index db7926d50b..762e063125 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -91,8 +91,8 @@ static inline int qemu_spice_display_add_client(int csock, int skipauth,
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");
+ error_set(errp, ERROR_CLASS_DEVICE_NOT_ACTIVE,
+ "SPICE is not in use");
return false;
}
return true;