falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dataplane: sync virtio.c and vring.c virtqueue state 

Load the virtio.c state into vring.c when we start dataplane mode and
vice versa when stopping dataplane mode.  This patch makes it possible
to start and stop dataplane any time while the guest is running.

This will eventually allow us to go back to QEMU main loop for
bdrv_drain_all() and live migration.  In the meantime, this patch makes
the dataplane lifecycle more robust but should make no visible
difference.  It may be useful in the virtio-net dataplane effort.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit 9154b02c53)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Stefan Hajnoczi 2013-07-01 13:29:17 +02:00 committed by Michael Roth
parent ccf279824c
commit 6bf6fcd181
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/block/dataplane/virtio-blk.c
View File

@ -545,7 +545,7 @@ void virtio_blk_data_plane_stop(VirtIOBlockDataPlane *s)
/* Clean up guest notifier (irq) */ /* Clean up guest notifier (irq) */
k->set_guest_notifiers(qbus->parent, 1, false); k->set_guest_notifiers(qbus->parent, 1, false);
vring_teardown(&s->vring); vring_teardown(&s->vring, s->vdev, 0);
s->started = false; s->started = false;
s->stopping = false; s->stopping = false;
} }

8
hw/virtio/dataplane/vring.c
View File

@ -39,8 +39,8 @@ bool vring_setup(Vring *vring, VirtIODevice *vdev, int n)
vring_init(&vring->vr, virtio_queue_get_num(vdev, n), vring_ptr, 4096); vring_init(&vring->vr, virtio_queue_get_num(vdev, n), vring_ptr, 4096);
vring->last_avail_idx = 0; vring->last_avail_idx = virtio_queue_get_last_avail_idx(vdev, n);
vring->last_used_idx = 0; vring->last_used_idx = vring->vr.used->idx;
vring->signalled_used = 0; vring->signalled_used = 0;
vring->signalled_used_valid = false; vring->signalled_used_valid = false;
@ -49,8 +49,10 @@ bool vring_setup(Vring *vring, VirtIODevice *vdev, int n)
return true; return true;
} }
void vring_teardown(Vring *vring) void vring_teardown(Vring *vring, VirtIODevice *vdev, int n)
{ {
virtio_queue_set_last_avail_idx(vdev, n, vring->last_avail_idx);
hostmem_finalize(&vring->hostmem); hostmem_finalize(&vring->hostmem);
} }

2
include/hw/virtio/dataplane/vring.h
View File

@ -50,7 +50,7 @@ static inline void vring_set_broken(Vring *vring)
} }
bool vring_setup(Vring *vring, VirtIODevice *vdev, int n); bool vring_setup(Vring *vring, VirtIODevice *vdev, int n);
void vring_teardown(Vring *vring); void vring_teardown(Vring *vring, VirtIODevice *vdev, int n);
void vring_disable_notification(VirtIODevice *vdev, Vring *vring); void vring_disable_notification(VirtIODevice *vdev, Vring *vring);
bool vring_enable_notification(VirtIODevice *vdev, Vring *vring); bool vring_enable_notification(VirtIODevice *vdev, Vring *vring);
bool vring_should_notify(VirtIODevice *vdev, Vring *vring); bool vring_should_notify(VirtIODevice *vdev, Vring *vring);