Commit b1ca6391 authored by Markus Armbruster's avatar Markus Armbruster Committed by Max Reitz
Browse files

block: Eliminate silly QERR_ macros used for encryption keys 



The QERR_ macros are leftovers from the days of "rich" error objects.
They're used with error_set() and qerror_report(), and expand into the
first *two* arguments.  This trickiness has become pointless.  Clean
up QERR_DEVICE_ENCRYPTED and QERR_DEVICE_NOT_ENCRYPTED.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 1422524221-8566-5-git-send-email-armbru@redhat.com
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 4d2855a3

block.c

+3 −2
Original line number Diff line number Diff line
@@ -3728,14 +3728,15 @@ void bdrv_add_key(BlockDriverState *bs, const char *key, Error **errp) 
{

    if (key) {

        if (!bdrv_is_encrypted(bs)) {

            error_set(errp, QERR_DEVICE_NOT_ENCRYPTED,

            error_setg(errp, "Device '%s' is not encrypted",

                      bdrv_get_device_name(bs));

        } else if (bdrv_set_key(bs, key) < 0) {

            error_set(errp, QERR_INVALID_PASSWORD);

        }

    } else {

        if (bdrv_key_required(bs)) {

            error_set(errp, QERR_DEVICE_ENCRYPTED,

            error_set(errp, ERROR_CLASS_DEVICE_ENCRYPTED,

                      "'%s' (%s) is encrypted",

                      bdrv_get_device_name(bs),

                      bdrv_get_encrypted_filename(bs));

        }

include/qapi/qmp/qerror.h

+0 −6
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ void qerror_report_err(Error *err); 
#define QERR_BUS_NOT_FOUND \

    ERROR_CLASS_GENERIC_ERROR, "Bus '%s' not found"



#define QERR_DEVICE_ENCRYPTED \

    ERROR_CLASS_DEVICE_ENCRYPTED, "'%s' (%s) is encrypted"



#define QERR_DEVICE_HAS_NO_MEDIUM \

    ERROR_CLASS_GENERIC_ERROR, "Device '%s' has no medium"
@@ -67,9 +64,6 @@ void qerror_report_err(Error *err); 
#define QERR_DEVICE_NO_HOTPLUG \

    ERROR_CLASS_GENERIC_ERROR, "Device '%s' does not support hotplugging"



#define QERR_DEVICE_NOT_ENCRYPTED \

    ERROR_CLASS_GENERIC_ERROR, "Device '%s' is not encrypted"



#define QERR_DEVICE_NOT_FOUND \

    ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found"