From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpyfz-0006an-T9 for qemu-devel@nongnu.org; Fri, 30 Sep 2016 10:20:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpyft-0003L1-SU for qemu-devel@nongnu.org; Fri, 30 Sep 2016 10:20:34 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:42001) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpyft-0003Ka-It for qemu-devel@nongnu.org; Fri, 30 Sep 2016 10:20:29 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8UEISV3049102 for ; Fri, 30 Sep 2016 10:20:29 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 25ss7eshar-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 30 Sep 2016 10:20:28 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 30 Sep 2016 15:20:26 +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 91FA61B0804B for ; Fri, 30 Sep 2016 15:22:18 +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 u8UEKMUw14156276 for ; Fri, 30 Sep 2016 14:20:22 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 u8UEKMKO022331 for ; Fri, 30 Sep 2016 08:20:22 -0600 From: Halil Pasic Date: Fri, 30 Sep 2016 16:20:00 +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-10-pasic@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 09/12] virtio-balloon: 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/virtio/virtio-balloon.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 49a2f4a..09688b6 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -404,11 +404,6 @@ static void virtio_balloon_save_device(VirtIODevice *vdev, QEMUFile *f) qemu_put_be32(f, s->actual); } -static int virtio_balloon_load(QEMUFile *f, void *opaque, size_t size) -{ - return virtio_load(VIRTIO_DEVICE(opaque), f, 1); -} - static int virtio_balloon_load_device(VirtIODevice *vdev, QEMUFile *f, int version_id) { @@ -494,7 +489,7 @@ static void virtio_balloon_instance_init(Object *obj) NULL, s, NULL); } -VMSTATE_VIRTIO_DEVICE(balloon, 1, virtio_balloon_load, virtio_vmstate_save); +VIRTIO_DEF_DEVICE_VMSD(balloon, 1) static Property virtio_balloon_properties[] = { DEFINE_PROP_BIT("deflate-on-oom", VirtIOBalloon, host_features, -- 2.8.4