[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6533] qemu:virtio-net: Save status and add some save infra
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6533] qemu:virtio-net: Save status and add some save infrastructure ( Alex Williamson) |
Date: |
Thu, 05 Feb 2009 22:36:05 +0000 |
Revision: 6533
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6533
Author: aliguori
Date: 2009-02-05 22:36:04 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
qemu:virtio-net: Save status and add some save infrastructure (Alex Williamson)
The status register should probably be saved since its guest visible.
Also add a little bit if infrastructure for handling various save
revisions.
Signed-off-by: Alex Williamson <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/hw/virtio-net.c
Modified: trunk/hw/virtio-net.c
===================================================================
--- trunk/hw/virtio-net.c 2009-02-05 22:33:36 UTC (rev 6532)
+++ trunk/hw/virtio-net.c 2009-02-05 22:36:04 UTC (rev 6533)
@@ -16,6 +16,8 @@
#include "qemu-timer.h"
#include "virtio-net.h"
+#define VIRTIO_NET_VM_VERSION 3
+
typedef struct VirtIONet
{
VirtIODevice vdev;
@@ -292,13 +294,14 @@
qemu_put_buffer(f, n->mac, 6);
qemu_put_be32(f, n->tx_timer_active);
qemu_put_be32(f, n->mergeable_rx_bufs);
+ qemu_put_be16(f, n->status);
}
static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)
{
VirtIONet *n = opaque;
- if (version_id != 2)
+ if (version_id < 2 || version_id > VIRTIO_NET_VM_VERSION)
return -EINVAL;
virtio_load(&n->vdev, f);
@@ -307,6 +310,9 @@
n->tx_timer_active = qemu_get_be32(f);
n->mergeable_rx_bufs = qemu_get_be32(f);
+ if (version_id >= 3)
+ n->status = qemu_get_be16(f);
+
if (n->tx_timer_active) {
qemu_mod_timer(n->tx_timer,
qemu_get_clock(vm_clock) + TX_TIMER_INTERVAL);
@@ -348,6 +354,6 @@
n->tx_timer_active = 0;
n->mergeable_rx_bufs = 0;
- register_savevm("virtio-net", virtio_net_id++, 2,
+ register_savevm("virtio-net", virtio_net_id++, VIRTIO_NET_VM_VERSION,
virtio_net_save, virtio_net_load, n);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6533] qemu:virtio-net: Save status and add some save infrastructure ( Alex Williamson),
Anthony Liguori <=