[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 1/8] qemu:virtio-net: Save status and add some sa
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PATCH v3 1/8] qemu:virtio-net: Save status and add some save infrastructure |
Date: |
Wed, 04 Feb 2009 17:17:55 -0700 |
User-agent: |
StGIT/0.14.2 |
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>
---
hw/virtio-net.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index 9e40678..2eb52b8 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -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 @@ static void virtio_net_save(QEMUFile *f, void *opaque)
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 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int
version_id)
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 @@ void virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn)
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);
}
- [Qemu-devel] [PATCH v3 0/8] qemu:virtio-net: Add MAC and VLAN filtering, Alex Williamson, 2009/02/04
- [Qemu-devel] [PATCH v3 3/8] qemu:virtio-net: Define ETH_ALEN for use when manipulating MAC addresses, Alex Williamson, 2009/02/04
- [Qemu-devel] [PATCH v3 1/8] qemu:virtio-net: Save status and add some save infrastructure,
Alex Williamson <=
- [Qemu-devel] [PATCH v3 5/8] qemu:virtio-net: Add promiscuous and all-multicast mode bits, Alex Williamson, 2009/02/04
- [Qemu-devel] [PATCH v3 6/8] qemu:virtio-net: Enable filtering based on MAC, promisc, broadcast and allmulti, Alex Williamson, 2009/02/04
- [Qemu-devel] [PATCH v3 4/8] qemu:virtio-net: Add a virtqueue for control commands from the guest, Alex Williamson, 2009/02/04
- [Qemu-devel] [PATCH v3 7/8] qemu:virtio-net: Add additional MACs via a filter table, Alex Williamson, 2009/02/04
- [Qemu-devel] [PATCH v3 8/8] qemu:virtio-net: Add VLAN filtering, Alex Williamson, 2009/02/04
- [Qemu-devel] [PATCH v3 2/8] qemu:virtio-net: Allow setting the MAC address via set_config, Alex Williamson, 2009/02/04