[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 2/8] virtio-net: implement per-device migration
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PATCH RFC 2/8] virtio-net: implement per-device migration calls |
Date: |
Mon, 19 May 2014 10:38:23 +0200 |
User-agent: |
StGit/0.16 |
Signed-off-by: Greg Kurz <address@hidden>
---
hw/net/virtio-net.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index e0dc544..d319ac2 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1263,7 +1263,6 @@ static void virtio_net_set_multiqueue(VirtIONet *n, int
multiqueue)
static void virtio_net_save(QEMUFile *f, void *opaque)
{
- int i;
VirtIONet *n = opaque;
VirtIODevice *vdev = VIRTIO_DEVICE(n);
@@ -1271,6 +1270,12 @@ static void virtio_net_save(QEMUFile *f, void *opaque)
* it might keep writing to memory. */
assert(!n->vhost_started);
virtio_save(vdev, f);
+}
+
+static void virtio_net_save_device(VirtIODevice *vdev, QEMUFile *f)
+{
+ VirtIONet *n = VIRTIO_NET(vdev);
+ int i;
qemu_put_buffer(f, n->mac, ETH_ALEN);
qemu_put_be32(f, n->vqs[0].tx_waiting);
@@ -1306,15 +1311,18 @@ static int virtio_net_load(QEMUFile *f, void *opaque,
int version_id)
{
VirtIONet *n = opaque;
VirtIODevice *vdev = VIRTIO_DEVICE(n);
- int ret, i, link_down;
if (version_id < 2 || version_id > VIRTIO_NET_VM_VERSION)
return -EINVAL;
- ret = virtio_load(vdev, f, version_id);
- if (ret) {
- return ret;
- }
+ return virtio_load(vdev, f, version_id);
+}
+
+static int virtio_net_load_device(VirtIODevice *vdev, QEMUFile *f,
+ int version_id)
+{
+ VirtIONet *n = VIRTIO_NET(vdev);
+ int i, link_down;
qemu_get_buffer(f, n->mac, ETH_ALEN);
n->vqs[0].tx_waiting = qemu_get_be32(f);
@@ -1651,6 +1659,8 @@ static void virtio_net_class_init(ObjectClass *klass,
void *data)
vdc->set_status = virtio_net_set_status;
vdc->guest_notifier_mask = virtio_net_guest_notifier_mask;
vdc->guest_notifier_pending = virtio_net_guest_notifier_pending;
+ vdc->load = virtio_net_load_device;
+ vdc->save = virtio_net_save_device;
}
static const TypeInfo virtio_net_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 <=
- [Qemu-devel] [PATCH RFC 3/8] virtio-blk: implement per-device migration calls, Greg Kurz, 2014/05/19
- [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