[Qemu-devel] [PATCH] Revert "virtio: sync the dataplane vring state to the virtqueue before virtio_save"

[Qemu-devel] [PATCH] Revert "virtio: sync the dataplane vring state to the virtqueue before virtio_save"

[Stefan Hajnoczi]

This reverts commit 10a06fd65f667a972848ebbbcac11bdba931b544.

Dataplane has used the same virtqueue code as non-dataplane since
commits e24a47c5b73e04f94030e2daa356c7582aebfca2 ("virtio-scsi: do not
use vring in dataplane") and 03de2f527499ae0c6d16a379665d072345254f2c
("virtio-blk: do not use vring in dataplane").  It is no longer
necessary to stop dataplane in order to sync state since there is no
duplicated virtqueue state.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/block/virtio-blk.c | 5 -----
 hw/scsi/virtio-scsi.c | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 284e646..beb4e12 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -795,11 +795,6 @@ static void virtio_blk_set_status(VirtIODevice *vdev, uint8_t status)
 static void virtio_blk_save(QEMUFile *f, void *opaque)
 {
     VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
-    VirtIOBlock *s = VIRTIO_BLK(vdev);
-
-    if (s->dataplane) {
-        virtio_blk_data_plane_stop(s->dataplane);
-    }
 
     virtio_save(vdev, f);
 }
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 71d09d3..e8179d6 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -666,11 +666,6 @@ static void virtio_scsi_reset(VirtIODevice *vdev)
 static void virtio_scsi_save(QEMUFile *f, void *opaque)
 {
     VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
-    VirtIOSCSI *s = VIRTIO_SCSI(vdev);
-
-    if (s->dataplane_started) {
-        virtio_scsi_dataplane_stop(s);
-    }
     virtio_save(vdev, f);
 }
 
-- 
2.5.5

Re: [Qemu-devel] [PATCH] Revert "virtio: sync the dataplane vring state to the virtqueue before virtio_save"

[Cornelia Huck]

On Tue, 21 Jun 2016 11:02:11 +0100
Stefan Hajnoczi <stefanha@redhat.com> wrote:

> This reverts commit 10a06fd65f667a972848ebbbcac11bdba931b544.
> 
> Dataplane has used the same virtqueue code as non-dataplane since
> commits e24a47c5b73e04f94030e2daa356c7582aebfca2 ("virtio-scsi: do not
> use vring in dataplane") and 03de2f527499ae0c6d16a379665d072345254f2c
> ("virtio-blk: do not use vring in dataplane").  It is no longer
> necessary to stop dataplane in order to sync state since there is no
> duplicated virtqueue state.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  hw/block/virtio-blk.c | 5 -----
>  hw/scsi/virtio-scsi.c | 5 -----
>  2 files changed, 10 deletions(-)

Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Re: [Qemu-devel] [PATCH] Revert "virtio: sync the dataplane vring state to the virtqueue before virtio_save"

[Pavel Butsykin]

On 21.06.2016 13:02, Stefan Hajnoczi wrote:
> This reverts commit 10a06fd65f667a972848ebbbcac11bdba931b544.
>
> Dataplane has used the same virtqueue code as non-dataplane since
> commits e24a47c5b73e04f94030e2daa356c7582aebfca2 ("virtio-scsi: do not
> use vring in dataplane") and 03de2f527499ae0c6d16a379665d072345254f2c
> ("virtio-blk: do not use vring in dataplane").  It is no longer
> necessary to stop dataplane in order to sync state since there is no
> duplicated virtqueue state.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>   hw/block/virtio-blk.c | 5 -----
>   hw/scsi/virtio-scsi.c | 5 -----
>   2 files changed, 10 deletions(-)

Reviewed-by: Pavel Butsykin <pbutsykin@virtuozzo.com>

Re: [Qemu-devel] [PATCH] Revert "virtio: sync the dataplane vring state to the virtqueue before virtio_save"

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 792 bytes --]

On Tue, Jun 21, 2016 at 11:02:11AM +0100, Stefan Hajnoczi wrote:
> This reverts commit 10a06fd65f667a972848ebbbcac11bdba931b544.
> 
> Dataplane has used the same virtqueue code as non-dataplane since
> commits e24a47c5b73e04f94030e2daa356c7582aebfca2 ("virtio-scsi: do not
> use vring in dataplane") and 03de2f527499ae0c6d16a379665d072345254f2c
> ("virtio-blk: do not use vring in dataplane").  It is no longer
> necessary to stop dataplane in order to sync state since there is no
> duplicated virtqueue state.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  hw/block/virtio-blk.c | 5 -----
>  hw/scsi/virtio-scsi.c | 5 -----
>  2 files changed, 10 deletions(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]