Commit cfa9bb23 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qmp hmp: Improve error messages when SPICE is not in use 



Commit 7572150c 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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent b25d81ba

include/ui/qemu-spice.h

+2 −2
Original line number Diff line number Diff line
@@ -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;