From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpyfr-0006U4-Bd for qemu-devel@nongnu.org; Fri, 30 Sep 2016 10:20:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpyfm-0003GM-9h for qemu-devel@nongnu.org; Fri, 30 Sep 2016 10:20:27 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:50807 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpyfm-0003G8-41 for qemu-devel@nongnu.org; Fri, 30 Sep 2016 10:20:22 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8UEIQPT089345 for ; Fri, 30 Sep 2016 10:20:22 -0400 Received: from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111]) by mx0b-001b2d01.pphosted.com with ESMTP id 25squunha6-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 30 Sep 2016 10:20:21 -0400 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 30 Sep 2016 15:20:20 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 4AE6417D8067 for ; Fri, 30 Sep 2016 15:22:20 +0100 (BST) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u8UEKHH020840620 for ; Fri, 30 Sep 2016 14:20:17 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u8UEKGnr022011 for ; Fri, 30 Sep 2016 08:20:16 -0600 From: Halil Pasic Date: Fri, 30 Sep 2016 16:19:52 +0200 In-Reply-To: <20160930142003.53232-1-pasic@linux.vnet.ibm.com> References: <20160930142003.53232-1-pasic@linux.vnet.ibm.com> Message-Id: <20160930142003.53232-2-pasic@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 01/12] virtio: add VIRTIO_DEF_DEVICE_VMSD macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S . Tsirkin" , "Aneesh Kumar K . V" , Stefan Hajnoczi , Amit Shah , Gerd Hoffmann , "Dr . David Alan Gilbert" , Halil Pasic In most cases the functions passed to VMSTATE_VIRTIO_DEVICE only call the virtio_load and virtio_save wrappers. Some include some pre- and post- massaging too. The massaging is better expressed as such in the VMStateDescription. Let us introduce a new macro called VIRTIO_DEF_DEVICE_VMSD and replace VMSTATE_VIRTIO_DEVICE with it gradually. Signed-off-by: Halil Pasic --- hw/virtio/virtio.c | 15 +++++++++++++++ include/hw/virtio/virtio.h | 25 +++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 18ce333..ca0a780 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1622,6 +1622,21 @@ 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); +} + +/* A wrapper for use as a VMState .get function */ +int virtio_load_as_vmsi_get(QEMUFile *f, void *opaque, size_t size) +{ + VirtIODevice *vdev = VIRTIO_DEVICE(opaque); + DeviceClass *dc = DEVICE_CLASS(VIRTIO_DEVICE_GET_CLASS(vdev)); + + return virtio_load(vdev, f, dc->vmsd->version_id); +} + static int virtio_set_features_nocheck(VirtIODevice *vdev, uint64_t val) { VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 888c8de..01de49b 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -176,6 +176,31 @@ 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); + +#define VMSTATE_VIRTIO_FIELD \ + { \ + .name = "virtio", \ + .info = &(const VMStateInfo) { \ + .name = "virtio", \ + .get = virtio_load_as_vmsi_get, \ + .put = virtio_save_as_vmsi_put, \ + }, \ + .flags = VMS_SINGLE, \ + } + +#define VIRTIO_DEF_DEVICE_VMSD(devname, v, ...) \ + static const VMStateDescription vmstate_virtio_ ## devname = { \ + .name = "virtio-" #devname , \ + .minimum_version_id = v, \ + .version_id = v, \ + .fields = (VMStateField[]) { \ + VMSTATE_VIRTIO_FIELD, \ + VMSTATE_END_OF_LIST() \ + }, \ + __VA_ARGS__ \ + }; #define VMSTATE_VIRTIO_DEVICE(devname, v, getf, putf) \ static const VMStateDescription vmstate_virtio_ ## devname = { \ -- 2.8.4