[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH for 9.0 05/12] vdpa: factor out stop path of vhost_vdpa_dev_s
From: |
Jason Wang |
Subject: |
Re: [PATCH for 9.0 05/12] vdpa: factor out stop path of vhost_vdpa_dev_start |
Date: |
Wed, 20 Dec 2023 12:31:43 +0800 |
On Sat, Dec 16, 2023 at 1:28 AM Eugenio Pérez <eperezma@redhat.com> wrote:
>
> This makes easier to build an error path in next patches. No functional
> change.
>
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Thanks
> ---
> hw/virtio/vhost-vdpa.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
> index 57a8043cd4..449c3794b2 100644
> --- a/hw/virtio/vhost-vdpa.c
> +++ b/hw/virtio/vhost-vdpa.c
> @@ -1302,7 +1302,7 @@ static void vhost_vdpa_suspend(struct vhost_dev *dev)
> static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
> {
> struct vhost_vdpa *v = dev->opaque;
> - bool ok;
> + bool ok = true;
> trace_vhost_vdpa_dev_start(dev, started);
>
> if (started) {
> @@ -1313,8 +1313,7 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev,
> bool started)
> }
> } else {
> vhost_vdpa_suspend(dev);
> - vhost_vdpa_svqs_stop(dev);
> - vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs);
> + goto out_stop;
> }
>
> if (dev->vq_index + dev->nvqs != dev->vq_index_end) {
> @@ -1333,6 +1332,11 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev,
> bool started)
> }
>
> return 0;
> +
> +out_stop:
> + vhost_vdpa_svqs_stop(dev);
> + vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs);
> + return ok ? 0 : -1;
> }
>
> static void vhost_vdpa_reset_status(struct vhost_dev *dev)
> --
> 2.39.3
>
- [PATCH for 9.0 00/12] Map memory at destination .load_setup in vDPA-net migration, Eugenio Pérez, 2023/12/15
- [PATCH for 9.0 01/12] vdpa: do not set virtio status bits if unneeded, Eugenio Pérez, 2023/12/15
- [PATCH for 9.0 02/12] vdpa: make batch_begin_once early return, Eugenio Pérez, 2023/12/15
- [PATCH for 9.0 04/12] vdpa: extract out _dma_end_batch from _listener_commit, Eugenio Pérez, 2023/12/15
- [PATCH for 9.0 06/12] vdpa: check for iova tree initialized at net_client_start, Eugenio Pérez, 2023/12/15
- [PATCH for 9.0 05/12] vdpa: factor out stop path of vhost_vdpa_dev_start, Eugenio Pérez, 2023/12/15
- Re: [PATCH for 9.0 05/12] vdpa: factor out stop path of vhost_vdpa_dev_start,
Jason Wang <=
- [PATCH for 9.0 07/12] vdpa: set backend capabilities at vhost_vdpa_init, Eugenio Pérez, 2023/12/15
- [PATCH for 9.0 08/12] vdpa: add vhost_vdpa_load_setup, Eugenio Pérez, 2023/12/15
[PATCH for 9.0 09/12] vdpa: approve switchover after memory map in the migration destination, Eugenio Pérez, 2023/12/15