[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 32/33] virtio: cleanup VMSTATE_VIRTIO_DEVICE
|
From: |
Michael S. Tsirkin |
|
Subject: |
[Qemu-block] [PULL 32/33] virtio: cleanup VMSTATE_VIRTIO_DEVICE |
|
Date: |
Mon, 10 Oct 2016 05:58:16 +0300 |
From: Halil Pasic <address@hidden>
Now all the usages of the old version of VMSTATE_VIRTIO_DEVICE are gone,
so we can get rid of the conditionals, and the old macro.
Signed-off-by: Halil Pasic <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/virtio/virtio.h | 27 ---------------------------
hw/9pfs/virtio-9p-device.c | 2 --
hw/block/virtio-blk.c | 2 --
hw/char/virtio-serial-bus.c | 2 --
hw/display/virtio-gpu.c | 2 --
hw/input/virtio-input.c | 2 --
hw/net/virtio-net.c | 2 --
hw/scsi/virtio-scsi.c | 2 --
hw/virtio/vhost-vsock.c | 2 --
hw/virtio/virtio-balloon.c | 2 --
hw/virtio/virtio-rng.c | 2 --
hw/virtio/virtio.c | 6 ------
12 files changed, 53 deletions(-)
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 929fa92..b913aac 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -177,12 +177,9 @@ bool virtio_should_notify(VirtIODevice *vdev, VirtQueue
*vq);
void virtio_notify(VirtIODevice *vdev, VirtQueue *vq);
void virtio_save(VirtIODevice *vdev, QEMUFile *f);
-void virtio_vmstate_save(QEMUFile *f, void *opaque, size_t size);
extern const VMStateInfo virtio_vmstate_info;
-#ifdef VMSTATE_VIRTIO_DEVICE_USE_NEW
-
#define VMSTATE_VIRTIO_DEVICE \
{ \
.name = "virtio", \
@@ -190,30 +187,6 @@ extern const VMStateInfo virtio_vmstate_info;
.flags = VMS_SINGLE, \
}
-#else
-/* TODO remove conditional as soon as all users are converted */
-
-#define VMSTATE_VIRTIO_DEVICE(devname, v, getf, putf) \
- static const VMStateDescription vmstate_virtio_ ## devname = { \
- .name = "virtio-" #devname , \
- .minimum_version_id = v, \
- .version_id = v, \
- .fields = (VMStateField[]) { \
- { \
- .name = "virtio", \
- .info = &(const VMStateInfo) {\
- .name = "virtio", \
- .get = getf, \
- .put = putf, \
- }, \
- .flags = VMS_SINGLE, \
- }, \
- VMSTATE_END_OF_LIST() \
- } \
- }
-
-#endif
-
int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id);
void virtio_notify_config(VirtIODevice *vdev);
diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 526ec7d..e98dd0c 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -11,8 +11,6 @@
*
*/
-#define VMSTATE_VIRTIO_DEVICE_USE_NEW
-
#include "qemu/osdep.h"
#include "hw/virtio/virtio.h"
#include "qemu/sockets.h"
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 10c5794..37fe72b 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -11,8 +11,6 @@
*
*/
-#define VMSTATE_VIRTIO_DEVICE_USE_NEW
-
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu-common.h"
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index c9b0fc8..7975c2c 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -18,8 +18,6 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#define VMSTATE_VIRTIO_DEVICE_USE_NEW
-
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/iov.h"
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 4fcd63c..fa6fd0e 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -11,8 +11,6 @@
* See the COPYING file in the top-level directory.
*/
-#define VMSTATE_VIRTIO_DEVICE_USE_NEW
-
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/iov.h"
diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c
index 5e31033..b678ee9 100644
--- a/hw/input/virtio-input.c
+++ b/hw/input/virtio-input.c
@@ -4,8 +4,6 @@
* top-level directory.
*/
-#define VMSTATE_VIRTIO_DEVICE_USE_NEW
-
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/iov.h"
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index b2198a5..06bfe4b 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -11,8 +11,6 @@
*
*/
-#define VMSTATE_VIRTIO_DEVICE_USE_NEW
-
#include "qemu/osdep.h"
#include "qemu/iov.h"
#include "hw/virtio/virtio.h"
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 9473e10..4762f05 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -13,8 +13,6 @@
*
*/
-#define VMSTATE_VIRTIO_DEVICE_USE_NEW
-
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "standard-headers/linux/virtio_ids.h"
diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c
index 99cb216..b481562 100644
--- a/hw/virtio/vhost-vsock.c
+++ b/hw/virtio/vhost-vsock.c
@@ -11,8 +11,6 @@
* top-level directory.
*/
-#define VMSTATE_VIRTIO_DEVICE_USE_NEW
-
#include <sys/ioctl.h>
#include "qemu/osdep.h"
#include "standard-headers/linux/virtio_vsock.h"
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 2c68d3d..1d77028 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -13,8 +13,6 @@
*
*/
-#define VMSTATE_VIRTIO_DEVICE_USE_NEW
-
#include "qemu/osdep.h"
#include "qemu/iov.h"
#include "qemu/timer.h"
diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c
index 62867d1..9639f4e 100644
--- a/hw/virtio/virtio-rng.c
+++ b/hw/virtio/virtio-rng.c
@@ -9,8 +9,6 @@
* top-level directory.
*/
-#define VMSTATE_VIRTIO_DEVICE_USE_NEW
-
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/iov.h"
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 62b9c00..d48d1a9 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -1640,12 +1640,6 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f)
}
/* A wrapper for use as a VMState .put function */
-void virtio_vmstate_save(QEMUFile *f, void *opaque, size_t size)
-{
- virtio_save(VIRTIO_DEVICE(opaque), f);
-}
-
-/* A wrapper for use as a VMState .put function */
static void virtio_device_put(QEMUFile *f, void *opaque, size_t size)
{
virtio_save(VIRTIO_DEVICE(opaque), f);
--
MST
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-block] [PULL 32/33] virtio: cleanup VMSTATE_VIRTIO_DEVICE,
Michael S. Tsirkin <=