Re: [Qemu-devel] [PATCH v2 02/12] block: update error reporting for bdrv_snapshot_delete() and related functions

[Kevin Wolf]

Am 24.04.2013 um 17:32 hat Pavel Hrdina geschrieben:
> @@ -2528,15 +2530,13 @@ void do_delvm(Monitor *mon, const QDict *qdict)
>      bs1 = NULL;
>      while ((bs1 = bdrv_next(bs1))) {
>          if (bdrv_can_snapshot(bs1)) {
> -            ret = bdrv_snapshot_delete(bs1, name);
> -            if (ret < 0) {
> -                if (ret == -ENOTSUP)
> -                    monitor_printf(mon,
> -                                   "Snapshots not supported on device 
> '%s'\n",
> -                                   bdrv_get_device_name(bs1));
> -                else
> -                    monitor_printf(mon, "Error %d while deleting snapshot on 
> "
> -                                   "'%s'\n", ret, bdrv_get_device_name(bs1));
> +            bdrv_snapshot_delete(bs1, name, &local_err);
> +            if (error_is_set(&local_err)) {
> +                qerror_report(ERROR_CLASS_GENERIC_ERROR, "Failed to delete "
> +                              "old snapshot on device '%s': %s",

Here in do_delvm() it doesn't make sense to talk about an "old" snapshot.
Probably some unchanged copy & paste from above?

> +                              bdrv_get_device_name(bs),
> +                              error_get_pretty(local_err));
> +                error_free(local_err);
>              }
>          }
>      }

Kevin