Commit 903a8814 authored by Luiz Capitulino's avatar Luiz Capitulino
Browse files

qerror: Extend QERR_DEVICE_ENCRYPTED 



Include the name of the encrypted file.

Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 270b243f

monitor.c

+2 −1
Original line number Diff line number Diff line
@@ -4682,7 +4682,8 @@ int monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs, 
    }



    if (monitor_ctrl_mode(mon)) {

        qerror_report(QERR_DEVICE_ENCRYPTED, bdrv_get_device_name(bs));

        qerror_report(QERR_DEVICE_ENCRYPTED, bdrv_get_device_name(bs),

                      bdrv_get_encrypted_filename(bs));

        return -1;

    }

qerror.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ QError *qobject_to_qerror(const QObject *obj); 
    "{ 'class': 'CommandDisabled', 'data': { 'name': %s } }"



#define QERR_DEVICE_ENCRYPTED \

    "{ 'class': 'DeviceEncrypted', 'data': { 'device': %s } }"

    "{ 'class': 'DeviceEncrypted', 'data': { 'device': %s, 'filename': %s } }"



#define QERR_DEVICE_INIT_FAILED \

    "{ 'class': 'DeviceInitFailed', 'data': { 'device': %s } }"

qmp.c

+2 −1
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ static void encrypted_bdrv_it(void *opaque, BlockDriverState *bs) 
    Error **err = opaque;



    if (!error_is_set(err) && bdrv_key_required(bs)) {

        error_set(err, QERR_DEVICE_ENCRYPTED, bdrv_get_device_name(bs));

        error_set(err, QERR_DEVICE_ENCRYPTED, bdrv_get_device_name(bs),

                  bdrv_get_encrypted_filename(bs));

    }

}