[2/5,RFC] virtio-net: Add load/save for status bits
diff mbox

Message ID 1231349858.7109.81.camel@lappy
State Accepted, archived
Headers show

Commit Message

Alex Williamson Jan. 7, 2009, 5:37 p.m. UTC
virtio-net: Add load/save for status bits

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

 hw/virtio-net.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Anthony Liguori Jan. 7, 2009, 6:12 p.m. UTC | #1
Alex Williamson wrote:
> virtio-net: Add load/save for status bits
>
> Signed-off-by: Alex Williamson <alex.williamson@hp.com>
> ---
>
>  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 bfb7510..77e3077 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_VM_VERSION	2
> +
>   

virtio-net is now at 2 already because of the mergable buffers fix but 
this is definitely needed for Mark's set_link changes.

Regards,

Anthony Liguori

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index bfb7510..77e3077 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_VM_VERSION	2
+
 typedef struct VirtIONet
 {
     VirtIODevice vdev;
@@ -307,13 +309,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_be16(f, n->status);
 }
 
 static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)
 {
     VirtIONet *n = opaque;
 
-    if (version_id != 1)
+    if (version_id < 1 || version_id > VIRTIO_VM_VERSION)
         return -EINVAL;
 
     virtio_load(&n->vdev, f);
@@ -321,6 +324,9 @@  static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)
     qemu_get_buffer(f, n->mac, 6);
     n->tx_timer_active = qemu_get_be32(f);
 
+    if (version_id >= 2)
+        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);
@@ -363,7 +369,7 @@  PCIDevice *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++, 1,
+    register_savevm("virtio-net", virtio_net_id++, VIRTIO_VM_VERSION,
                     virtio_net_save, virtio_net_load, n);
 
     return (PCIDevice *)n;