From patchwork Fri Jul 27 21:31:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 173805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6DB6D2C03CC for ; Sat, 28 Jul 2012 08:21:18 +1000 (EST) Received: from localhost ([::1]:34277 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sus8x-00078z-H3 for incoming@patchwork.ozlabs.org; Fri, 27 Jul 2012 17:32:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sus8W-0006ea-Mi for qemu-devel@nongnu.org; Fri, 27 Jul 2012 17:31:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sus8V-0008AN-Fq for qemu-devel@nongnu.org; Fri, 27 Jul 2012 17:31:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sus8V-0008AA-86 for qemu-devel@nongnu.org; Fri, 27 Jul 2012 17:31:51 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6RLVoqE031472 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 27 Jul 2012 17:31:50 -0400 Received: from localhost (ovpn-113-90.phx2.redhat.com [10.3.113.90]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q6RLVnxK007370; Fri, 27 Jul 2012 17:31:50 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 27 Jul 2012 18:31:52 -0300 Message-Id: <1343424728-22461-12-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1343424728-22461-1-git-send-email-lcapitulino@redhat.com> References: <1343424728-22461-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, pbonzini@redhat.com, aliguori@us.ibm.com, eblake@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 11/27] hmp: hmp_cont(): don't rely on QERR_DEVICE_ENCRYPTED X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Today, hmp_cont() checks for QERR_DEVICE_ENCRYPTED in order to know if qmp_cont() failed due to an encrypted device. If it did, hmp_cont() accesses QERR_DEVICE_ENCRYPTED's data member 'device' to precisely know for which device an encryption key must be set. However, all errors data members are going to be dropped by a later commit, so hmp_cont() can't do this anymore. This commit changes hmp_cont() to loop through all block devices and proactively set an encryption key for any encrypted device without a valid one. Signed-off-by: Luiz Capitulino --- hmp.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/hmp.c b/hmp.c index 6b72a64..a906f8a 100644 --- a/hmp.c +++ b/hmp.c @@ -610,34 +610,41 @@ void hmp_pmemsave(Monitor *mon, const QDict *qdict) static void hmp_cont_cb(void *opaque, int err) { - Monitor *mon = opaque; - if (!err) { - hmp_cont(mon, NULL); + qmp_cont(NULL); } } -void hmp_cont(Monitor *mon, const QDict *qdict) +static bool block_dev_is_encrypted(const BlockInfo *bdev) { - Error *errp = NULL; - - qmp_cont(&errp); - if (error_is_set(&errp)) { - if (error_is_type(errp, QERR_DEVICE_ENCRYPTED)) { - const char *device; + return (bdev->inserted && bdev->inserted->encrypted); +} - /* The device is encrypted. Ask the user for the password - and retry */ +static bool block_dev_key_is_set(const BlockInfo *bdev) +{ + return (bdev->inserted && bdev->inserted->valid_encryption_key); +} - device = error_get_field(errp, "device"); - assert(device != NULL); +void hmp_cont(Monitor *mon, const QDict *qdict) +{ + BlockInfoList *bdev_list, *bdev; + Error *errp = NULL; - monitor_read_block_device_key(mon, device, hmp_cont_cb, mon); - error_free(errp); - return; + bdev_list = qmp_query_block(NULL); + for (bdev = bdev_list; bdev; bdev = bdev->next) { + if (block_dev_is_encrypted(bdev->value) && + !block_dev_key_is_set(bdev->value)) { + monitor_read_block_device_key(mon, bdev->value->device, + hmp_cont_cb, NULL); + goto out; } - hmp_handle_error(mon, &errp); } + + qmp_cont(&errp); + hmp_handle_error(mon, &errp); + +out: + qapi_free_BlockInfoList(bdev_list); } void hmp_system_wakeup(Monitor *mon, const QDict *qdict)