[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/12] virtio: remove unused VMSTATE_VIRTIO_DEVICE
From: |
Halil Pasic |
Subject: |
[Qemu-devel] [PATCH 12/12] virtio: remove unused VMSTATE_VIRTIO_DEVICE |
Date: |
Fri, 30 Sep 2016 16:20:03 +0200 |
Previously we mande sure VMSTATE_VIRTIO_DEVICE is not used any more.
Let us remove it along with the associated wrapper function.
Signed-off-by: Halil Pasic <address@hidden>
---
hw/virtio/virtio.c | 6 ------
include/hw/virtio/virtio.h | 20 --------------------
2 files changed, 26 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index ca0a780..6d23ba7 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -1617,12 +1617,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 */
void virtio_save_as_vmsi_put(QEMUFile *f, void *opaque, size_t size)
{
virtio_save(VIRTIO_DEVICE(opaque), f);
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 01de49b..85b0e2f 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -175,7 +175,6 @@ 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);
void virtio_save_as_vmsi_put(QEMUFile *f, void *opaque, size_t size);
int virtio_load_as_vmsi_get(QEMUFile *f, void *opaque, size_t size);
@@ -202,25 +201,6 @@ int virtio_load_as_vmsi_get(QEMUFile *f, void *opaque,
size_t size);
__VA_ARGS__ \
};
-#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() \
- } \
- }
-
int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id);
void virtio_notify_config(VirtIODevice *vdev);
--
2.8.4
- [Qemu-devel] [PATCH 00/11] virtio migration: simplify vmstate helper, Halil Pasic, 2016/09/30
- [Qemu-devel] [PATCH 01/12] virtio: add VIRTIO_DEF_DEVICE_VMSD macro, Halil Pasic, 2016/09/30
- [Qemu-devel] [PATCH 05/12] virtio-serial: convert to VIRTIO_DEF_DEVICE_VMSD, Halil Pasic, 2016/09/30
- [Qemu-devel] [PATCH 03/12] virtio-net: convert to VIRTIO_DEF_DEVICE_VMSD, Halil Pasic, 2016/09/30
- [Qemu-devel] [PATCH 02/12] virtio-blk: convert to VIRTIO_DEF_DEVICE_VMSD, Halil Pasic, 2016/09/30
- [Qemu-devel] [PATCH 07/12] virtio-input: convert to VIRTIO_DEF_DEVICE_VMSD, Halil Pasic, 2016/09/30
- [Qemu-devel] [PATCH 12/12] virtio: remove unused VMSTATE_VIRTIO_DEVICE,
Halil Pasic <=
- [Qemu-devel] [PATCH 10/12] virtio-rng: convert to VIRTIO_DEF_DEVICE_VMSD, Halil Pasic, 2016/09/30
- [Qemu-devel] [PATCH 11/12] vhost-vsock: convert to VIRTIO_DEF_DEVICE_VMSD, Halil Pasic, 2016/09/30
- [Qemu-devel] [PATCH 04/12] virtio-9p: convert to VIRTIO_DEF_DEVICE_VMSD, Halil Pasic, 2016/09/30
- [Qemu-devel] [PATCH 06/12] virtio-gpu: do not use VMSTATE_VIRTIO_DEVICE, Halil Pasic, 2016/09/30
- [Qemu-devel] [PATCH 08/12] virtio-scsi: convert to VIRTIO_DEF_DEVICE_VMSD, Halil Pasic, 2016/09/30
- [Qemu-devel] [PATCH 09/12] virtio-balloon: convert to VIRTIO_DEF_DEVICE_VMSD, Halil Pasic, 2016/09/30
- Re: [Qemu-devel] [PATCH 00/11] virtio migration: simplify vmstate helper, Paolo Bonzini, 2016/09/30