From nobody Tue Oct 28 01:56:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516109198698332.67769979941943; Tue, 16 Jan 2018 05:26:38 -0800 (PST) Received: from localhost ([::1]:35924 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebRG9-0002zr-AQ for importer@patchew.org; Tue, 16 Jan 2018 08:26:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebR6P-0003ID-Vl for qemu-devel@nongnu.org; Tue, 16 Jan 2018 08:16:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebR6O-0007Qo-Fc for qemu-devel@nongnu.org; Tue, 16 Jan 2018 08:16:33 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:39543) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebR6O-0007Ps-9w; Tue, 16 Jan 2018 08:16:32 -0500 Received: by mail-qt0-x241.google.com with SMTP id k19so18148714qtj.6; Tue, 16 Jan 2018 05:16:32 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id k29sm1436180qtc.87.2018.01.16.05.16.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 05:16:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1aiERWbC8jMlsLURLkN1RQBFStAZmNWkcH5oA5lNoAk=; b=G8yWEqzDhOZa8tJGwZj/S6z6//XYK1QqTbe3pHzbUoteG+cftTdO+paUy/lZAXWRbx 6Pk7KddPCjmuhPj9NhbtR2/PqmQkclkZG+OJDwwf7VzZmxoSTKXh4VJ+LMRFMHIVfg1m Gm9h4oAJdChAVqnPH1ZZEByHqHEhwtxtxZRL5s71FToRp2Cu4jalVyO/N/KVNMIUgUI2 4GUq0psdjaQSdLUCnwxU9pQYKBUMhD+oWWOegT6gU4phXZ/aLxo5TEU5UpQWSTPFVwPW JcKCC2ZW8ELCCE8vd0EGZRnOWxlME67ENv6EjuJcIGopzVyTjKOiX74AOxJ2iRzqKL0a NSYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1aiERWbC8jMlsLURLkN1RQBFStAZmNWkcH5oA5lNoAk=; b=LFjrW9LFAt8YZu/tDE4CVVos+lj8LbLzmf4DO0cGidBNpfxkYXNuhF5LWJwC90LcAh LmZuRmQ29imNpiCJGwZ8YQmSWLmGPISwZRZDwF6oBR2MaimDFXv9MqlYA6tVBuWhyynw uaRGC+AWPJFP7pPHzVzR5UYasIwdZzCxOe4rKVlrwuOeG1YVLoZM52UqJuWi6geesKPU z8BEaomAoOnqW9K+29TQDgIsJpRe5myxHZazmWI56iVWOAYl/1TbTKdg5zPRpRoIumsv ovfQLbXm/hQf+AwzYRGfluJRx19CbwXC4WNPZrRlEP4btmyFuh95W+bT6kdjgyYXz+bX qmlQ== X-Gm-Message-State: AKwxytfijk6XQ6FwPQ96pyzr4MaRyIkih/ijnjadczn26bbnwbDCqfo8 jlwL8/9iXMXkcpXQ0p+1T6dLPhX3 X-Google-Smtp-Source: ACJfBovnwnlF6l4GynT+9fx8xwtzN4Ps9eA63N8YkinQQnFoTvfr3nCbpN52TBxv3xlZVwlGWK1YLA== X-Received: by 10.237.54.132 with SMTP id f4mr27217266qtb.139.1516108591820; Tue, 16 Jan 2018 05:16:31 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Eduardo Habkost , Markus Armbruster , Peter Maydell , Paolo Bonzini , Eric Blake , Marcel Apfelbaum Date: Tue, 16 Jan 2018 10:15:49 -0300 Message-Id: <20180116131555.14242-6-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180116131555.14242-1-f4bug@amsat.org> References: <20180116131555.14242-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH 05/11] virtio-ccw: convert VirtIOCCWDeviceClass::init -> realize X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , qemu-devel@nongnu.org, Cornelia Huck , Alexander Graf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Christian Borntraeger , "open list:virtio-ccw" , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Cornelia Huck Reviewed-by: Farhan Ali --- hw/s390x/virtio-ccw.h | 2 +- hw/s390x/virtio-ccw.c | 35 +++++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 3905f3a3d6..2fc513001e 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -76,7 +76,7 @@ typedef struct VirtioCcwDevice VirtioCcwDevice; typedef struct VirtIOCCWDeviceClass { CCWDeviceClass parent_class; void (*realize)(VirtioCcwDevice *dev, Error **errp); - int (*exit)(VirtioCcwDevice *dev); + void (*unrealize)(VirtioCcwDevice *dev, Error **errp); } VirtIOCCWDeviceClass; =20 /* Performance improves when virtqueue kick processing is decoupled from t= he diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 38f6a8afc9..a71c3feeb5 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -751,7 +751,7 @@ out_err: g_free(sch); } =20 -static int virtio_ccw_exit(VirtioCcwDevice *dev) +static void virtio_ccw_unrealize(VirtioCcwDevice *dev, Error **errp) { CcwDevice *ccw_dev =3D CCW_DEVICE(dev); SubchDev *sch =3D ccw_dev->sch; @@ -764,7 +764,6 @@ static int virtio_ccw_exit(VirtioCcwDevice *dev) release_indicator(&dev->routes.adapter, dev->indicators); dev->indicators =3D NULL; } - return 0; } =20 static void virtio_ccw_net_realize(VirtioCcwDevice *ccw_dev, Error **errp) @@ -1343,7 +1342,7 @@ static void virtio_ccw_net_class_init(ObjectClass *kl= ass, void *data) VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_CLASS(klass); =20 k->realize =3D virtio_ccw_net_realize; - k->exit =3D virtio_ccw_exit; + k->unrealize =3D virtio_ccw_unrealize; dc->reset =3D virtio_ccw_reset; dc->props =3D virtio_ccw_net_properties; set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); @@ -1371,7 +1370,7 @@ static void virtio_ccw_blk_class_init(ObjectClass *kl= ass, void *data) VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_CLASS(klass); =20 k->realize =3D virtio_ccw_blk_realize; - k->exit =3D virtio_ccw_exit; + k->unrealize =3D virtio_ccw_unrealize; dc->reset =3D virtio_ccw_reset; dc->props =3D virtio_ccw_blk_properties; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); @@ -1399,7 +1398,7 @@ static void virtio_ccw_serial_class_init(ObjectClass = *klass, void *data) VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_CLASS(klass); =20 k->realize =3D virtio_ccw_serial_realize; - k->exit =3D virtio_ccw_exit; + k->unrealize =3D virtio_ccw_unrealize; dc->reset =3D virtio_ccw_reset; dc->props =3D virtio_ccw_serial_properties; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); @@ -1427,7 +1426,7 @@ static void virtio_ccw_balloon_class_init(ObjectClass= *klass, void *data) VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_CLASS(klass); =20 k->realize =3D virtio_ccw_balloon_realize; - k->exit =3D virtio_ccw_exit; + k->unrealize =3D virtio_ccw_unrealize; dc->reset =3D virtio_ccw_reset; dc->props =3D virtio_ccw_balloon_properties; set_bit(DEVICE_CATEGORY_MISC, dc->categories); @@ -1455,7 +1454,7 @@ static void virtio_ccw_scsi_class_init(ObjectClass *k= lass, void *data) VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_CLASS(klass); =20 k->realize =3D virtio_ccw_scsi_realize; - k->exit =3D virtio_ccw_exit; + k->unrealize =3D virtio_ccw_unrealize; dc->reset =3D virtio_ccw_reset; dc->props =3D virtio_ccw_scsi_properties; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); @@ -1482,7 +1481,7 @@ static void vhost_ccw_scsi_class_init(ObjectClass *kl= ass, void *data) VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_CLASS(klass); =20 k->realize =3D vhost_ccw_scsi_realize; - k->exit =3D virtio_ccw_exit; + k->unrealize =3D virtio_ccw_unrealize; dc->reset =3D virtio_ccw_reset; dc->props =3D vhost_ccw_scsi_properties; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); @@ -1519,7 +1518,7 @@ static void virtio_ccw_rng_class_init(ObjectClass *kl= ass, void *data) VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_CLASS(klass); =20 k->realize =3D virtio_ccw_rng_realize; - k->exit =3D virtio_ccw_exit; + k->unrealize =3D virtio_ccw_unrealize; dc->reset =3D virtio_ccw_reset; dc->props =3D virtio_ccw_rng_properties; set_bit(DEVICE_CATEGORY_MISC, dc->categories); @@ -1557,7 +1556,7 @@ static void virtio_ccw_crypto_class_init(ObjectClass = *klass, void *data) VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_CLASS(klass); =20 k->realize =3D virtio_ccw_crypto_realize; - k->exit =3D virtio_ccw_exit; + k->unrealize =3D virtio_ccw_unrealize; dc->reset =3D virtio_ccw_reset; dc->props =3D virtio_ccw_crypto_properties; set_bit(DEVICE_CATEGORY_MISC, dc->categories); @@ -1595,7 +1594,7 @@ static void virtio_ccw_gpu_class_init(ObjectClass *kl= ass, void *data) VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_CLASS(klass); =20 k->realize =3D virtio_ccw_gpu_realize; - k->exit =3D virtio_ccw_exit; + k->unrealize =3D virtio_ccw_unrealize; dc->reset =3D virtio_ccw_reset; dc->props =3D virtio_ccw_gpu_properties; dc->hotpluggable =3D false; @@ -1624,7 +1623,7 @@ static void virtio_ccw_input_class_init(ObjectClass *= klass, void *data) VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_CLASS(klass); =20 k->realize =3D virtio_ccw_input_realize; - k->exit =3D virtio_ccw_exit; + k->unrealize =3D virtio_ccw_unrealize; dc->reset =3D virtio_ccw_reset; dc->props =3D virtio_ccw_input_properties; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); @@ -1704,12 +1703,12 @@ static void virtio_ccw_busdev_realize(DeviceState *= dev, Error **errp) virtio_ccw_device_realize(_dev, errp); } =20 -static int virtio_ccw_busdev_exit(DeviceState *dev) +static void virtio_ccw_busdev_unrealize(DeviceState *dev, Error **errp) { VirtioCcwDevice *_dev =3D (VirtioCcwDevice *)dev; - VirtIOCCWDeviceClass *_info =3D VIRTIO_CCW_DEVICE_GET_CLASS(dev); + VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_GET_CLASS(dev); =20 - return _info->exit(_dev); + k->unrealize(_dev, errp); } =20 static void virtio_ccw_busdev_unplug(HotplugHandler *hotplug_dev, @@ -1727,7 +1726,7 @@ static void virtio_ccw_device_class_init(ObjectClass = *klass, void *data) =20 k->unplug =3D virtio_ccw_busdev_unplug; dc->realize =3D virtio_ccw_busdev_realize; - dc->exit =3D virtio_ccw_busdev_exit; + dc->unrealize =3D virtio_ccw_busdev_unrealize; dc->bus_type =3D TYPE_VIRTUAL_CSS_BUS; } =20 @@ -1803,7 +1802,7 @@ static void virtio_ccw_9p_class_init(ObjectClass *kla= ss, void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_CLASS(klass); =20 - k->exit =3D virtio_ccw_exit; + k->unrealize =3D virtio_ccw_unrealize; k->realize =3D virtio_ccw_9p_realize; dc->reset =3D virtio_ccw_reset; dc->props =3D virtio_ccw_9p_properties; @@ -1852,7 +1851,7 @@ static void vhost_vsock_ccw_class_init(ObjectClass *k= lass, void *data) VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_CLASS(klass); =20 k->realize =3D vhost_vsock_ccw_realize; - k->exit =3D virtio_ccw_exit; + k->unrealize =3D virtio_ccw_unrealize; set_bit(DEVICE_CATEGORY_MISC, dc->categories); dc->props =3D vhost_vsock_ccw_properties; dc->reset =3D virtio_ccw_reset; --=20 2.15.1