[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 3/8] virtio-blk: implement per-device migration
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PATCH RFC 3/8] virtio-blk: implement per-device migration calls |
Date: |
Mon, 19 May 2014 10:38:31 +0200 |
User-agent: |
StGit/0.16 |
Signed-off-by: Greg Kurz <address@hidden>
---
hw/block/virtio-blk.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 63d4ccd..a50be54 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -588,12 +588,16 @@ static void virtio_blk_set_status(VirtIODevice *vdev,
uint8_t status)
static void virtio_blk_save(QEMUFile *f, void *opaque)
{
- VirtIOBlock *s = opaque;
- VirtIODevice *vdev = VIRTIO_DEVICE(s);
- VirtIOBlockReq *req = s->rq;
+ VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
virtio_save(vdev, f);
+}
+static void virtio_blk_save_device(VirtIODevice *vdev, QEMUFile *f)
+{
+ VirtIOBlock *s = VIRTIO_BLK(vdev);
+ VirtIOBlockReq *req = s->rq;
+
while (req) {
qemu_put_sbyte(f, 1);
qemu_put_buffer(f, (unsigned char*)&req->elem, sizeof(req->elem));
@@ -606,15 +610,17 @@ static int virtio_blk_load(QEMUFile *f, void *opaque, int
version_id)
{
VirtIOBlock *s = opaque;
VirtIODevice *vdev = VIRTIO_DEVICE(s);
- int ret;
if (version_id != 2)
return -EINVAL;
- ret = virtio_load(vdev, f, version_id);
- if (ret) {
- return ret;
- }
+ return virtio_load(vdev, f, version_id);
+}
+
+static int virtio_blk_load_device(VirtIODevice *vdev, QEMUFile *f,
+ int version_id)
+{
+ VirtIOBlock *s = VIRTIO_BLK(vdev);
while (qemu_get_sbyte(f)) {
VirtIOBlockReq *req = virtio_blk_alloc_request(s);
@@ -773,6 +779,8 @@ static void virtio_blk_class_init(ObjectClass *klass, void
*data)
vdc->get_features = virtio_blk_get_features;
vdc->set_status = virtio_blk_set_status;
vdc->reset = virtio_blk_reset;
+ vdc->save = virtio_blk_save_device;
+ vdc->load = virtio_blk_load_device;
}
static const TypeInfo virtio_device_info = {
- [Qemu-devel] [PATCH RFC V2 0/8] virtio: migrate new properties, Greg Kurz, 2014/05/19
- [Qemu-devel] [PATCH RFC 1/8] virtio: introduce device specific migration calls, Greg Kurz, 2014/05/19
- [Qemu-devel] [PATCH RFC 2/8] virtio-net: implement per-device migration calls, Greg Kurz, 2014/05/19
- [Qemu-devel] [PATCH RFC 3/8] virtio-blk: implement per-device migration calls,
Greg Kurz <=
- [Qemu-devel] [PATCH RFC 4/8] virtio-serial: implement per-device migration calls, Greg Kurz, 2014/05/19
- [Qemu-devel] [PATCH RFC 5/8] virtio-balloon: implement per-device migration calls, Greg Kurz, 2014/05/19
- [Qemu-devel] [PATCH RFC 6/8] virtio-rng: implement per-device migration calls, Greg Kurz, 2014/05/19
- [Qemu-devel] [PATCH RFC 7/8] virtio: add subsections to the migration stream, Greg Kurz, 2014/05/19
- [Qemu-devel] [PATCH RFC 8/8] virtio: add endian-ambivalent support to VirtIODevice, Greg Kurz, 2014/05/19
- Re: [Qemu-devel] [PATCH RFC V2 0/8] virtio: migrate new properties, Alexander Graf, 2014/05/19