OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qerror: Extend QERR_DEVICE_ENCRYPTED

Browse Source 
Include the name of the encrypted file.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Luiz Capitulino 2011-12-13 17:18:30 -02:00
parent 270b243f91
commit 903a881481
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monitor.c
View File

@ -4682,7 +4682,8 @@ int monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs,
} }
if (monitor_ctrl_mode(mon)) { 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; return -1;
} }

2
qerror.h
View File

@ -70,7 +70,7 @@ QError *qobject_to_qerror(const QObject *obj);
"{ 'class': 'CommandDisabled', 'data': { 'name': %s } }" "{ 'class': 'CommandDisabled', 'data': { 'name': %s } }"
#define QERR_DEVICE_ENCRYPTED \ #define QERR_DEVICE_ENCRYPTED \
"{ 'class': 'DeviceEncrypted', 'data': { 'device': %s } }" "{ 'class': 'DeviceEncrypted', 'data': { 'device': %s, 'filename': %s } }"
#define QERR_DEVICE_INIT_FAILED \ #define QERR_DEVICE_INIT_FAILED \
"{ 'class': 'DeviceInitFailed', 'data': { 'device': %s } }" "{ 'class': 'DeviceInitFailed', 'data': { 'device': %s } }"

3
qmp.c
View File

@ -135,7 +135,8 @@ static void encrypted_bdrv_it(void *opaque, BlockDriverState *bs)
Error **err = opaque; Error **err = opaque;
if (!error_is_set(err) && bdrv_key_required(bs)) { 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));
} }
} }