Commit 4d45dcfb authored by Halil Pasic's avatar Halil Pasic Committed by Michael S. Tsirkin
Browse files

virtio-net: convert VMSTATE_VIRTIO_DEVICE 



Use the new VMSTATE_VIRTIO_DEVICE macro.

Signed-off-by: default avatarHalil Pasic <pasic@linux.vnet.ibm.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 977a117f

hw/net/virtio-net.c

+21 −21
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 *

 */



#define VMSTATE_VIRTIO_DEVICE_USE_NEW



#include "qemu/osdep.h"

#include "qemu/iov.h"

#include "hw/virtio/virtio.h"
@@ -1514,17 +1516,6 @@ static void virtio_net_set_multiqueue(VirtIONet *n, int multiqueue) 
    virtio_net_set_queues(n);

}



static void virtio_net_save(QEMUFile *f, void *opaque, size_t size)

{

    VirtIONet *n = opaque;

    VirtIODevice *vdev = VIRTIO_DEVICE(n);



    /* At this point, backend must be stopped, otherwise

     * 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);
@@ -1560,14 +1551,6 @@ static void virtio_net_save_device(VirtIODevice *vdev, QEMUFile *f) 
    }

}



static int virtio_net_load(QEMUFile *f, void *opaque, size_t size)

{

    VirtIONet *n = opaque;

    VirtIODevice *vdev = VIRTIO_DEVICE(n);



    return virtio_load(vdev, f, VIRTIO_NET_VM_VERSION);

}



static int virtio_net_load_device(VirtIODevice *vdev, QEMUFile *f,

                                  int version_id)

{
@@ -1870,8 +1853,25 @@ static void virtio_net_instance_init(Object *obj) 
                                  DEVICE(n), NULL);

}



VMSTATE_VIRTIO_DEVICE(net, VIRTIO_NET_VM_VERSION, virtio_net_load,

                      virtio_net_save);

static void virtio_net_pre_save(void *opaque)

{

    VirtIONet *n = opaque;



    /* At this point, backend must be stopped, otherwise

     * it might keep writing to memory. */

    assert(!n->vhost_started);

}



static const VMStateDescription vmstate_virtio_net = {

    .name = "virtio-net",

    .minimum_version_id = VIRTIO_NET_VM_VERSION,

    .version_id = VIRTIO_NET_VM_VERSION,

    .fields = (VMStateField[]) {

        VMSTATE_VIRTIO_DEVICE,

        VMSTATE_END_OF_LIST()

    },

    .pre_save = virtio_net_pre_save,

};



static Property virtio_net_properties[] = {

    DEFINE_PROP_BIT("csum", VirtIONet, host_features, VIRTIO_NET_F_CSUM, true),