[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/19] virtio: decrement last_avail_idx with inuse b
From: |
Yoshiaki Tamura |
Subject: |
[Qemu-devel] [PATCH 06/19] virtio: decrement last_avail_idx with inuse before saving. |
Date: |
Mon, 27 Dec 2010 17:25:24 +0900 |
For regular migration inuse == 0 always as requests are flushed before
save. However, event-tap log when enabled introduces an extra queue
for requests which is not being flushed, thus the last inuse requests
are left in the event-tap queue. Move the last_avail_idx value sent
to the remote back to make it repeat the last inuse requests.
Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Yoshiaki Tamura <address@hidden>
---
hw/virtio.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/hw/virtio.c b/hw/virtio.c
index 07dbf86..408fad5 100644
--- a/hw/virtio.c
+++ b/hw/virtio.c
@@ -665,12 +665,20 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f)
qemu_put_be32(f, i);
for (i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) {
+ /* For regular migration inuse == 0 always as
+ * requests are flushed before save. However,
+ * event-tap log when enabled introduces an extra
+ * queue for requests which is not being flushed,
+ * thus the last inuse requests are left in the event-tap queue.
+ * Move the last_avail_idx value sent to the remote back
+ * to make it repeat the last inuse requests. */
+ uint16_t last_avail = vdev->vq[i].last_avail_idx - vdev->vq[i].inuse;
if (vdev->vq[i].vring.num == 0)
break;
qemu_put_be32(f, vdev->vq[i].vring.num);
qemu_put_be64(f, vdev->vq[i].pa);
- qemu_put_be16s(f, &vdev->vq[i].last_avail_idx);
+ qemu_put_be16s(f, &last_avail);
if (vdev->binding->save_queue)
vdev->binding->save_queue(vdev->binding_opaque, i, f);
}
--
1.7.1.2
- [Qemu-devel] [PATCH 00/19] Kemari for KVM v0.2.2, Yoshiaki Tamura, 2010/12/27
- [Qemu-devel] [PATCH 17/19] migration-tcp: modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled., Yoshiaki Tamura, 2010/12/27
- [Qemu-devel] [PATCH 05/19] vl.c: add deleted flag for deleting the handler., Yoshiaki Tamura, 2010/12/27
- [Qemu-devel] [PATCH 08/19] savevm: introduce util functions to control ft_trans_file from savevm layer., Yoshiaki Tamura, 2010/12/27
- [Qemu-devel] [PATCH 11/19] ioport: insert event_tap_ioport() to ioport_write()., Yoshiaki Tamura, 2010/12/27
- [Qemu-devel] [PATCH 02/19] Introduce read() to FdMigrationState., Yoshiaki Tamura, 2010/12/27
- [Qemu-devel] [PATCH 06/19] virtio: decrement last_avail_idx with inuse before saving.,
Yoshiaki Tamura <=
- [Qemu-devel] [PATCH 04/19] qemu-char: export socket_set_nodelay()., Yoshiaki Tamura, 2010/12/27
- [Qemu-devel] [PATCH 12/19] Insert event_tap_mmio() to cpu_physical_memory_rw() in exec.c., Yoshiaki Tamura, 2010/12/27
- [Qemu-devel] [PATCH 14/19] block: insert event-tap to bdrv_aio_writev() and bdrv_aio_flush()., Yoshiaki Tamura, 2010/12/27
- [Qemu-devel] [PATCH 03/19] Introduce skip_header parameter to qemu_loadvm_state()., Yoshiaki Tamura, 2010/12/27
- [Qemu-devel] [PATCH 15/19] savevm: introduce qemu_savevm_trans_{begin, commit}., Yoshiaki Tamura, 2010/12/27
- [Qemu-devel] [PATCH 18/19] Introduce -k option to enable FT migration mode (Kemari)., Yoshiaki Tamura, 2010/12/27