From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3MS1-0006Hg-1Z for qemu-devel@nongnu.org; Wed, 26 Apr 2017 08:53:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3MRx-0005US-UZ for qemu-devel@nongnu.org; Wed, 26 Apr 2017 08:53:45 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:35896) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d3MRx-0005UK-PN for qemu-devel@nongnu.org; Wed, 26 Apr 2017 08:53:41 -0400 Received: by mail-pg0-x242.google.com with SMTP id v1so10773003pgv.3 for ; Wed, 26 Apr 2017 05:53:41 -0700 (PDT) From: Zihan Yang Date: Wed, 26 Apr 2017 20:53:06 +0800 Message-Id: <1493211188-24086-3-git-send-email-tgnyang@gmail.com> In-Reply-To: <1493211188-24086-1-git-send-email-tgnyang@gmail.com> References: <1493211188-24086-1-git-send-email-tgnyang@gmail.com> Subject: [Qemu-devel] [PATCH 3/5] hw/s390: convert exit to unrealize in virtio_ccw_device_class_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Zihan Yang , "Michael S. Tsirkin" , Cornelia Huck , Christian Borntraeger , Richard Henderson , Alexander Graf Currently the virtio_ccw_device_class_init function sets dc->exit, the exit callback of DeviceClass. It should be converted to dc->unrealize since exit callback of DeviceClass will be removed in the future. Signed-off-by: Zihan Yang --- hw/s390x/virtio-ccw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 91b43ac..5c193a8 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -1621,13 +1621,12 @@ static void virtio_ccw_busdev_realize(DeviceState *dev, Error **errp) virtio_ccw_device_realize(_dev, errp); } -static int virtio_ccw_busdev_exit(DeviceState *dev) +static void virtio_ccw_busdev_unrealize(DeviceState *dev, Error **errp) { VirtioCcwDevice *_dev = (VirtioCcwDevice *)dev; VirtIOCCWDeviceClass *_info = VIRTIO_CCW_DEVICE_GET_CLASS(dev); _info->exit(_dev); - return 0; } static void virtio_ccw_busdev_unplug(HotplugHandler *hotplug_dev, @@ -1645,7 +1644,7 @@ static void virtio_ccw_device_class_init(ObjectClass *klass, void *data) k->unplug = virtio_ccw_busdev_unplug; dc->realize = virtio_ccw_busdev_realize; - dc->exit = virtio_ccw_busdev_exit; + dc->unrealize = virtio_ccw_busdev_unrealize; dc->bus_type = TYPE_VIRTUAL_CSS_BUS; } -- 2.7.4