From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgBcL-0000ps-JH for qemu-devel@nongnu.org; Fri, 02 May 2014 07:27:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgBcC-0007Y6-NG for qemu-devel@nongnu.org; Fri, 02 May 2014 07:27:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47821) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgBcC-0007Xl-EJ for qemu-devel@nongnu.org; Fri, 02 May 2014 07:26:52 -0400 From: Markus Armbruster Date: Fri, 2 May 2014 13:26:42 +0200 Message-Id: <1399030002-27222-15-git-send-email-armbru@redhat.com> In-Reply-To: <1399030002-27222-1-git-send-email-armbru@redhat.com> References: <1399030002-27222-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 14/14] qmp: Don't use error_is_set() to suppress additional errors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com Using error_is_set(errp) that way can sweep programming errors under the carpet when we get called incorrectly with an error set. encrypted_bdrv_it() does it, because there's no way to make bdrv_iterate() break its loop. Actually safe, because qmp_cont() clears the error before the loop. Clean it up anyway: replace bdrv_iterate() by bdrv_next(), break the loop on error. Replace both occurences, for consistency. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- qmp.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/qmp.c b/qmp.c index ee8357f..df10c7f 100644 --- a/qmp.c +++ b/qmp.c @@ -146,24 +146,9 @@ SpiceInfo *qmp_query_spice(Error **errp) }; #endif -static void iostatus_bdrv_it(void *opaque, BlockDriverState *bs) -{ - bdrv_iostatus_reset(bs); -} - -static void encrypted_bdrv_it(void *opaque, BlockDriverState *bs) -{ - Error **errp = opaque; - - if (!error_is_set(errp) && bdrv_key_required(bs)) { - error_set(errp, QERR_DEVICE_ENCRYPTED, bdrv_get_device_name(bs), - bdrv_get_encrypted_filename(bs)); - } -} - void qmp_cont(Error **errp) { - Error *local_err = NULL; + BlockDriverState *bs; if (runstate_needs_reset()) { error_setg(errp, "Resetting the Virtual Machine is required"); @@ -172,11 +157,16 @@ void qmp_cont(Error **errp) return; } - bdrv_iterate(iostatus_bdrv_it, NULL); - bdrv_iterate(encrypted_bdrv_it, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; + for (bs = bdrv_next(NULL); bs; bs = bdrv_next(bs)) { + bdrv_iostatus_reset(bs); + } + for (bs = bdrv_next(NULL); bs; bs = bdrv_next(bs)) { + if (bdrv_key_required(bs)) { + error_set(errp, QERR_DEVICE_ENCRYPTED, + bdrv_get_device_name(bs), + bdrv_get_encrypted_filename(bs)); + return; + } } if (runstate_check(RUN_STATE_INMIGRATE)) { -- 1.8.1.4