From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGlXD-0003TT-1n for qemu-devel@nongnu.org; Thu, 29 Jan 2015 04:37:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGlX6-0007mp-80 for qemu-devel@nongnu.org; Thu, 29 Jan 2015 04:37:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46951) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGlX6-0007mO-0E for qemu-devel@nongnu.org; Thu, 29 Jan 2015 04:37:04 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0T9b3J2006790 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 29 Jan 2015 04:37:03 -0500 From: Markus Armbruster Date: Thu, 29 Jan 2015 10:37:01 +0100 Message-Id: <1422524221-8566-5-git-send-email-armbru@redhat.com> In-Reply-To: <1422524221-8566-1-git-send-email-armbru@redhat.com> References: <1422524221-8566-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/4] block: Eliminate silly QERR_ macros used for encryption keys List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com The QERR_ macros are leftovers from the days of "rich" error objects. They're used with error_set() and qerror_report(), and expand into the first *two* arguments. This trickiness has become pointless. Clean up QERR_DEVICE_ENCRYPTED and QERR_DEVICE_NOT_ENCRYPTED. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- block.c | 5 +++-- include/qapi/qmp/qerror.h | 6 ------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index aa12160..ad6fcef 100644 --- a/block.c +++ b/block.c @@ -3734,14 +3734,15 @@ void bdrv_add_key(BlockDriverState *bs, const char *key, Error **errp) { if (key) { if (!bdrv_is_encrypted(bs)) { - error_set(errp, QERR_DEVICE_NOT_ENCRYPTED, + error_setg(errp, "Device '%s' is not encrypted", bdrv_get_device_name(bs)); } else if (bdrv_set_key(bs, key) < 0) { error_set(errp, QERR_INVALID_PASSWORD); } } else { if (bdrv_key_required(bs)) { - error_set(errp, QERR_DEVICE_ENCRYPTED, + error_set(errp, ERROR_CLASS_DEVICE_ENCRYPTED, + "'%s' (%s) is encrypted", bdrv_get_device_name(bs), bdrv_get_encrypted_filename(bs)); } diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index becdca6..423d8a3 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -52,9 +52,6 @@ void qerror_report_err(Error *err); #define QERR_COMMAND_NOT_FOUND \ ERROR_CLASS_COMMAND_NOT_FOUND, "The command %s has not been found" -#define QERR_DEVICE_ENCRYPTED \ - ERROR_CLASS_DEVICE_ENCRYPTED, "'%s' (%s) is encrypted" - #define QERR_DEVICE_HAS_NO_MEDIUM \ ERROR_CLASS_GENERIC_ERROR, "Device '%s' has no medium" @@ -73,9 +70,6 @@ void qerror_report_err(Error *err); #define QERR_DEVICE_NOT_ACTIVE \ ERROR_CLASS_DEVICE_NOT_ACTIVE, "No %s device has been activated" -#define QERR_DEVICE_NOT_ENCRYPTED \ - ERROR_CLASS_GENERIC_ERROR, "Device '%s' is not encrypted" - #define QERR_DEVICE_NOT_FOUND \ ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found" -- 1.9.3