ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-serial: convert VMSTATE_VIRTIO_DEVICE 

Use the new VMSTATE_VIRTIO_DEVICE macro.

Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Halil Pasic 2016-10-06 14:55:43 +02:00 committed by Michael S. Tsirkin
parent dcaf8dda4b
commit 97eed24ff1
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/char/virtio-serial-bus.c
View File

@ -18,6 +18,8 @@
* GNU GPL, version 2 or (at your option) any later version. * GNU GPL, version 2 or (at your option) any later version.
*/ */
#define VMSTATE_VIRTIO_DEVICE_USE_NEW
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/iov.h" #include "qemu/iov.h"
@ -778,12 +780,6 @@ static int fetch_active_ports_list(QEMUFile *f,
return 0; return 0;
} }
static int virtio_serial_load(QEMUFile *f, void *opaque, size_t size)
{
/* The virtio device */
return virtio_load(VIRTIO_DEVICE(opaque), f, 3);
}
static int virtio_serial_load_device(VirtIODevice *vdev, QEMUFile *f, static int virtio_serial_load_device(VirtIODevice *vdev, QEMUFile *f,
int version_id) int version_id)
{ {
@ -1129,7 +1125,15 @@ static void virtio_serial_device_unrealize(DeviceState *dev, Error **errp)
} }
/* Note: 'console' is used for backwards compatibility */ /* Note: 'console' is used for backwards compatibility */
VMSTATE_VIRTIO_DEVICE(console, 3, virtio_serial_load, virtio_vmstate_save); static const VMStateDescription vmstate_virtio_console = {
.name = "virtio-console",
.minimum_version_id = 3,
.version_id = 3,
.fields = (VMStateField[]) {
VMSTATE_VIRTIO_DEVICE,
VMSTATE_END_OF_LIST()
},
};
static Property virtio_serial_properties[] = { static Property virtio_serial_properties[] = {
DEFINE_PROP_UINT32("max_ports", VirtIOSerial, serial.max_virtserial_ports, DEFINE_PROP_UINT32("max_ports", VirtIOSerial, serial.max_virtserial_ports,