From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bs8Dc-0007WL-QM for qemu-devel@nongnu.org; Thu, 06 Oct 2016 08:56:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bs8Da-0007HX-85 for qemu-devel@nongnu.org; Thu, 06 Oct 2016 08:56:11 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:49399 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bs8Da-0007HT-1j for qemu-devel@nongnu.org; Thu, 06 Oct 2016 08:56:10 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u96Cu8XS020278 for ; Thu, 6 Oct 2016 08:56:09 -0400 Received: from e06smtp12.uk.ibm.com (e06smtp12.uk.ibm.com [195.75.94.108]) by mx0b-001b2d01.pphosted.com with ESMTP id 25wjfewwfq-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 06 Oct 2016 08:56:09 -0400 Received: from localhost by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 6 Oct 2016 13:56:03 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 237D11B08069 for ; Thu, 6 Oct 2016 13:57:59 +0100 (BST) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u96Cu1fY14614908 for ; Thu, 6 Oct 2016 12:56:01 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 u96Cu0aX002388 for ; Thu, 6 Oct 2016 06:56:00 -0600 From: Halil Pasic Date: Thu, 6 Oct 2016 14:55:38 +0200 Message-Id: <20161006125550.17099-1-pasic@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 00/12] virtio migration: simplify vmstate helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , "Dr . David Alan Gilbert" Cc: "Michael S . Tsirkin" , qemu-devel@nongnu.org, Halil Pasic As a part of the long term effort to convert migration to vmstate the migration of virtio devices was recently partially switched to vmstate starting with the outer layer (commit 5943124cc "virtio: Migration helper function and macro" and the subsequent "virtio-*: Wrap in vmstate" commits). This was done by introducing a vmstate based wrapper driving the well know virtio migration process. As this transition is still in progress, some synergies were left unexploited, and some things can be expressed in a more vmstatish way. Let us simplify a couple of things and get rid of some code duplication. NOTE: This series is exploring the suggestions of Paolo (I did my best to do everything as requested). I still think that we are better of with a macro that with spelling out the VMStateDescription for each device separately and redundantly. The LOC balance of the previous version was -41, this version is at +14 because of the expanded macros. IMHO the readability benefit of spelling out the vmsd definitions is questionabe (but it is beneficial if using ctags or grep). I hope for a good discussion, but I can live with this version too. v1 --> v2: * export VMStateInfo instead of helpers * change semantic of VMSTATE_VIRTIO_DEVICE * drop VIRTIO_DEF_DEVICE_VMSD macro, use its expansion instead Halil Pasic (12): virtio: prepare change VMSTATE_VIRTIO_DEVICE macro virtio-blk: convert VMSTATE_VIRTIO_DEVICE virtio-net: convert VMSTATE_VIRTIO_DEVICE virtio-9p: convert VMSTATE_VIRTIO_DEVICE virtio-serial: convert VMSTATE_VIRTIO_DEVICE virtio-gpu: convert VMSTATE_VIRTIO_DEVICE virtio-input: convert VMSTATE_VIRTIO_DEVICE virtio-scsi: convert VMSTATE_VIRTIO_DEVICE virtio-balloon: convert VMSTATE_VIRTIO_DEVICE virtio-rng: convert VMSTATE_VIRTIO_DEVICE vhost-vsock: convert VMSTATE_VIRTIO_DEVICE virtio: cleanup VMSTATE_VIRTIO_DEVICE hw/9pfs/virtio-9p-device.c | 15 +++++++++------ hw/block/virtio-blk.c | 25 +++++++++---------------- hw/char/virtio-serial-bus.c | 16 +++++++++------- hw/display/virtio-gpu.c | 39 +++++++++++++++++++++++++++------------ hw/input/virtio-input.c | 21 +++++++++++---------- hw/net/virtio-net.c | 40 +++++++++++++++++++--------------------- hw/scsi/virtio-scsi.c | 26 +++++++++----------------- hw/virtio/vhost-vsock.c | 42 +++++++++++++++++++++--------------------- hw/virtio/virtio-balloon.c | 15 +++++++++------ hw/virtio/virtio-rng.c | 19 +++++++++++-------- hw/virtio/virtio.c | 17 ++++++++++++++++- include/hw/virtio/virtio.h | 27 ++++++++------------------- 12 files changed, 158 insertions(+), 144 deletions(-) -- 2.8.4