From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzXeD-0000tH-RK for qemu-devel@nongnu.org; Fri, 02 Sep 2011 13:35:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzXeC-00022n-R1 for qemu-devel@nongnu.org; Fri, 02 Sep 2011 13:35:21 -0400 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:35511 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzXeC-00022i-Lf for qemu-devel@nongnu.org; Fri, 02 Sep 2011 13:35:20 -0400 From: Anthony Liguori Date: Fri, 2 Sep 2011 12:34:51 -0500 Message-Id: <1314984898-19141-9-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1314984898-19141-1-git-send-email-aliguori@us.ibm.com> References: <1314984898-19141-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 08/15] qerror: add additional parameter to QERR_DEVICE_ENCRYPTED List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Anthony Liguori , Michael Roth , Luiz Capitulino Changing an encrypted block device requires a flow of: 1) change device 2) receive error from change 3) block_passwd DeviceEncrypted receives the device name but with a block backend with multiple backing files, any one of the backing files could be encrypted. From a UI perspective, you have no way of knowing which file is encrypted without parsing the qcow2 files :-/ Add the actual encrypted filename to the error message so that a UI can display that information to the user. Signed-off-by: Anthony Liguori --- monitor.c | 3 ++- qerror.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index fa93239..c6da388 100644 --- a/monitor.c +++ b/monitor.c @@ -5321,7 +5321,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 4fe24aa..3bbff5c 100644 --- a/qerror.h +++ b/qerror.h @@ -64,7 +64,7 @@ QError *qobject_to_qerror(const QObject *obj); "{ 'class': 'CommandNotFound', '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 } }" -- 1.7.4.1