From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpyfw-0006XN-Bc for qemu-devel@nongnu.org; Fri, 30 Sep 2016 10:20:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpyfq-0003In-8k for qemu-devel@nongnu.org; Fri, 30 Sep 2016 10:20:31 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:51803) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpyfp-0003IX-Vb for qemu-devel@nongnu.org; Fri, 30 Sep 2016 10:20:26 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8UEIQNv020676 for ; Fri, 30 Sep 2016 10:20:25 -0400 Received: from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 25srm1bd62-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 30 Sep 2016 10:20:24 -0400 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 30 Sep 2016 15:20:22 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id BECD917D8056 for ; Fri, 30 Sep 2016 15:22:22 +0100 (BST) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u8UEKJAb12648828 for ; Fri, 30 Sep 2016 14:20:19 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 u8UEKICG022149 for ; Fri, 30 Sep 2016 08:20:19 -0600 From: Halil Pasic Date: Fri, 30 Sep 2016 16:19:55 +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-5-pasic@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 04/12] virtio-9p: convert to VIRTIO_DEF_DEVICE_VMSD 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 Refactor so the previously introduced VIRTIO_DEF_DEVICE_VMSD replaces VMSTATE_VIRTIO_DEVICE. Signed-off-by: Halil Pasic --- hw/9pfs/virtio-9p-device.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 009b43f..f854ac7 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -97,11 +97,6 @@ static void virtio_9p_get_config(VirtIODevice *vdev, uint8_t *config) g_free(cfg); } -static int virtio_9p_load(QEMUFile *f, void *opaque, size_t size) -{ - return virtio_load(VIRTIO_DEVICE(opaque), f, 1); -} - static void virtio_9p_device_realize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); @@ -168,7 +163,7 @@ void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, /* virtio-9p device */ -VMSTATE_VIRTIO_DEVICE(9p, 1, virtio_9p_load, virtio_vmstate_save); +VIRTIO_DEF_DEVICE_VMSD(9p, 1) static Property virtio_9p_properties[] = { DEFINE_PROP_STRING("mount_tag", V9fsVirtioState, state.fsconf.tag), -- 2.8.4