From d8b6895f7a8e5bcc5be1557e8048db43882f3b33 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Mon, 10 Jun 2013 11:29:27 -0400 Subject: [PATCH] block: bdrv_reopen_prepare(): don't use QERR_OPEN_FILE_FAILED 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 79ad33d0f9..b88ad2fa04 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; } -- GitLab