Re: [Qemu-devel] [PATCH 8/9] block: bdrv_reopen_prepare(): don't use QERR_OPEN_FILE_FAILED

[Kevin Wolf <kwolf@redhat.com>]

Am 10.06.2013 um 19:02 hat Luiz Capitulino geschrieben:
> 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 <lcapitulino@redhat.com>
> ---
>  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'",

Please start the message with an uppercase letter like before.

Also, maybe "Failed to prepare for reopening '%s'" is better?

> +                           reopen_state->bs->filename);
>              }
>              goto error;
>          }

Kevin