[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/14] qerror: Extend QERR_DEVICE_ENCRYPTED
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 08/14] qerror: Extend QERR_DEVICE_ENCRYPTED |
Date: |
Wed, 18 Jan 2012 15:41:18 -0200 |
Include the name of the encrypted file.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 3 ++-
qerror.h | 2 +-
qmp.c | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index bd4bc4f..f85a9d2 100644
--- a/monitor.c
+++ b/monitor.c
@@ -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;
}
diff --git a/qerror.h b/qerror.h
index efda232..27800fe 100644
--- a/qerror.h
+++ b/qerror.h
@@ -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 } }"
diff --git a/qmp.c b/qmp.c
index f218485..9c9ea62 100644
--- a/qmp.c
+++ b/qmp.c
@@ -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));
}
}
--
1.7.9.rc0.dirty
- [Qemu-devel] [PULL 00/14]: QMP queue, Luiz Capitulino, 2012/01/18
- [Qemu-devel] [PATCH 02/14] qapi: Convert set_password, Luiz Capitulino, 2012/01/18
- [Qemu-devel] [PATCH 01/14] vnc: Simplify vnc_display_password(), Luiz Capitulino, 2012/01/18
- [Qemu-devel] [PATCH 03/14] qapi: Convert expire_password, Luiz Capitulino, 2012/01/18
- [Qemu-devel] [PATCH 05/14] qapi: Convert eject, Luiz Capitulino, 2012/01/18
- [Qemu-devel] [PATCH 04/14] block: eject_device(): Use error_set(), Luiz Capitulino, 2012/01/18
- [Qemu-devel] [PATCH 06/14] monitor: expose readline state, Luiz Capitulino, 2012/01/18
- [Qemu-devel] [PATCH 07/14] qapi: Introduce change-vnc-password, Luiz Capitulino, 2012/01/18
- [Qemu-devel] [PATCH 08/14] qerror: Extend QERR_DEVICE_ENCRYPTED,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 09/14] qapi: Convert change, Luiz Capitulino, 2012/01/18
- [Qemu-devel] [PATCH 10/14] qapi: Convert block_set_io_throttle, Luiz Capitulino, 2012/01/18
- [Qemu-devel] [PATCH 13/14] qerror: restore alphabetical order over qerrors, Luiz Capitulino, 2012/01/18
- [Qemu-devel] [PATCH 14/14] block: use proper qerrors in qmp_block_resize, Luiz Capitulino, 2012/01/18
- [Qemu-devel] [PATCH 12/14] qerror: add check-qerror.sh to verify alphabetical order, Luiz Capitulino, 2012/01/18
- [Qemu-devel] [PATCH 11/14] qmp: Add missing gcc format attribute and fix format string, Luiz Capitulino, 2012/01/18
- Re: [Qemu-devel] [PULL 00/14]: QMP queue, Anthony Liguori, 2012/01/19