From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UocYs-0001eg-Gf for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:45:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UocYr-0000nE-4b for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:45:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UocYq-0000mn-QH for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:45:44 -0400 From: Luiz Capitulino Date: Mon, 17 Jun 2013 11:57:10 -0400 Message-Id: <1371484631-29510-9-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1371484631-29510-1-git-send-email-lcapitulino@redhat.com> References: <1371484631-29510-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PULL 8/9] block: bdrv_reopen_prepare(): don't use QERR_OPEN_FILE_FAILED List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com The call to drv->bdrv_reopen_prepare() can fail due to reasons other than an open failure. Unfortunately, we can't use errno nor -ret, cause they are not always set. Stick to a generic error message then. Signed-off-by: Luiz Capitulino Reviewed-by: Stefan Hajnoczi Acked-by: Kevin Wolf --- block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 79ad33d..b88ad2f 100644 --- a/block.c +++ b/block.c @@ -1291,8 +1291,8 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, if (local_err != NULL) { error_propagate(errp, local_err); } else { - error_set(errp, QERR_OPEN_FILE_FAILED, - reopen_state->bs->filename); + error_setg(errp, "failed while preparing to reopen image '%s'", + reopen_state->bs->filename); } goto error; } -- 1.8.1.4