Re: [RFC PATCH 03/12] vdpa: Small rename of error labels

[Jason Wang]

On Sat, Jul 16, 2022 at 7:34 PM Eugenio Pérez <eperezma@redhat.com> wrote:
>
> So later patches are cleaner
>
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
> ---
>  hw/virtio/vhost-vdpa.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
> index 4458c8d23e..906c365036 100644
> --- a/hw/virtio/vhost-vdpa.c
> +++ b/hw/virtio/vhost-vdpa.c
> @@ -1039,7 +1039,7 @@ static bool vhost_vdpa_svqs_start(struct vhost_dev *dev)
>          int r;
>          bool ok = vhost_vdpa_svq_setup(dev, svq, i, &err);
>          if (unlikely(!ok)) {
> -            goto err;
> +            goto err_svq_setup;
>          }
>
>          vhost_svq_start(svq, dev->vdev, vq);
> @@ -1064,8 +1064,7 @@ err_set_addr:
>  err_map:
>      vhost_svq_stop(g_ptr_array_index(v->shadow_vqs, i));
>
> -err:
> -    error_reportf_err(err, "Cannot setup SVQ %u: ", i);

This does not look like a simple rename.

Thanks

> +err_svq_setup:
>      for (unsigned j = 0; j < i; ++j) {
>          VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, j);
>          vhost_vdpa_svq_unmap_rings(dev, svq);
> --
> 2.31.1
>