From nobody Fri Mar 29 06:11:14 2024 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.zoho.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 1493384443831831.8821657020255; Fri, 28 Apr 2017 06:00:43 -0700 (PDT) Received: from localhost ([::1]:36985 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d45Vq-0007b3-Lx for importer@patchew.org; Fri, 28 Apr 2017 09:00:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d45Un-0006yY-0d for qemu-devel@nongnu.org; Fri, 28 Apr 2017 08:59:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d45Ui-0002AX-4O for qemu-devel@nongnu.org; Fri, 28 Apr 2017 08:59:37 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:35561) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d45Uh-0002A3-VX for qemu-devel@nongnu.org; Fri, 28 Apr 2017 08:59:32 -0400 Received: by mail-pg0-x241.google.com with SMTP id s1so2827421pgc.2 for ; Fri, 28 Apr 2017 05:59:31 -0700 (PDT) Received: from fma-dfsg.ipads-lab.se.sjtu.edu.cn ([69.85.85.101]) by smtp.gmail.com with ESMTPSA id i189sm10621181pgd.61.2017.04.28.05.58.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Apr 2017 05:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0im094fr1rZdQgQX/cXw6ru4d7mQOD3mwquXyLe/JcY=; b=l1+tvum2M0uYznK4yOk+mBpkxo+V09OCBN+wDsW4WzoG19DdKWZmQYLWt1W3wgIlI7 sSa9lEdC49IC9HnQjIrFzIE+JwDANKoTKeFFK9lbmjXybcJOBFSHGjjPeRd/SHbqhF/L xtyT116MUGECsWthSSVKIFhVieccjp9P8enK7PqOA7YgCzNqx8SNy70aifrIztiTPtv4 tQ11u80D/YHjd254X2DoMYBQ9OpYWZcKeREIsRPS7SkvILhVgfnYMQm1+lnK6VUa0SR+ P6nmy8k6JSYpjANdADx0BUbSBQ4dYFtLL+AYWJv2pnMsw72UPYI24f6L/W3aHFuHUVMv /cOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0im094fr1rZdQgQX/cXw6ru4d7mQOD3mwquXyLe/JcY=; b=h0ahj++rVhgbqO/15mTxtAqJby+aARG/0LPPiRgH/7U/eTYMfEB4UYgLtikMPXe9FT T+CmxWGbqSPXaMgmIKEPWA3Ms9bDI/HM+awwsyDIlUQowZZbzgg1cpv+LA/lVzlEsBDk xF+0sZ2tPxIgbj0L6gHbV8AqquSpkt0eDnTD4rVDcUmi3gatiyL5ukYgvX31JpvS8nIe 0OWqRSJSunOOsx9LMMt+W6zWwscF8EVVv0kEZteJVcXb3cjG1gvnicrTdajbZhEXwTKd SzT1MoWEmi08Db90u3GabdFYxDQY+ii1pbYodklrxRxz2xHvwT6H8UFwO3e8A4aFniBB wY6g== X-Gm-Message-State: AN3rC/63mLfEzi2YcxDNa0GfLfZxbLgj2p+7EFItMXEi0eon+BPOc5hG syjO7Nie9c56Mg== X-Received: by 10.99.104.6 with SMTP id d6mr12048078pgc.185.1493384370980; Fri, 28 Apr 2017 05:59:30 -0700 (PDT) From: Zihan Yang To: qemu-devel@nongnu.org Date: Fri, 28 Apr 2017 20:55:08 +0800 Message-Id: <1493384110-32060-2-git-send-email-tgnyang@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493384110-32060-1-git-send-email-tgnyang@gmail.com> References: <1493384110-32060-1-git-send-email-tgnyang@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH 1/3] hw/char/sclp*: remove console_exit function in sclp 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: Alexander Graf , Christian Borntraeger , Cornelia Huck , Paolo Bonzini , Zihan Yang , 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently the console_exit function in sclpconsole-lm.c and sclpconsole.c does nothing, so remove them and convert the callback in SCLPEventClass to void. Since there is a NULL check on the DeviceClass exit callback, it should be ok to simply remove them. Signed-off-by: Zihan Yang --- hw/char/sclpconsole-lm.c | 6 ------ hw/char/sclpconsole.c | 6 ------ hw/s390x/event-facility.c | 6 +----- include/hw/s390x/event-facility.h | 2 +- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c index 07d6ebd..86ddda6 100644 --- a/hw/char/sclpconsole-lm.c +++ b/hw/char/sclpconsole-lm.c @@ -318,11 +318,6 @@ static int console_init(SCLPEvent *event) return 0; } =20 -static int console_exit(SCLPEvent *event) -{ - return 0; -} - static void console_reset(DeviceState *dev) { SCLPEvent *event =3D SCLP_EVENT(dev); @@ -349,7 +344,6 @@ static void console_class_init(ObjectClass *klass, void= *data) dc->reset =3D console_reset; dc->vmsd =3D &vmstate_sclplmconsole; ec->init =3D console_init; - ec->exit =3D console_exit; ec->get_send_mask =3D send_mask; ec->get_receive_mask =3D receive_mask; ec->can_handle_event =3D can_handle_event; diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index b78f240..e916cac 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -246,11 +246,6 @@ static void console_reset(DeviceState *dev) scon->notify =3D false; } =20 -static int console_exit(SCLPEvent *event) -{ - return 0; -} - static Property console_properties[] =3D { DEFINE_PROP_CHR("chardev", SCLPConsole, chr), DEFINE_PROP_END_OF_LIST(), @@ -265,7 +260,6 @@ static void console_class_init(ObjectClass *klass, void= *data) dc->reset =3D console_reset; dc->vmsd =3D &vmstate_sclpconsole; ec->init =3D console_init; - ec->exit =3D console_exit; ec->get_send_mask =3D send_mask; ec->get_receive_mask =3D receive_mask; ec->can_handle_event =3D can_handle_event; diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 34b2faf..f7c509c 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -413,11 +413,7 @@ static void event_unrealize(DeviceState *qdev, Error *= *errp) SCLPEvent *event =3D SCLP_EVENT(qdev); SCLPEventClass *child =3D SCLP_EVENT_GET_CLASS(event); if (child->exit) { - int rc =3D child->exit(event); - if (rc < 0) { - error_setg(errp, "SCLP event exit failed."); - return; - } + child->exit(event); } } =20 diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-fac= ility.h index def1bb0..1a32f3a 100644 --- a/include/hw/s390x/event-facility.h +++ b/include/hw/s390x/event-facility.h @@ -162,7 +162,7 @@ typedef struct SCLPEvent { typedef struct SCLPEventClass { DeviceClass parent_class; int (*init)(SCLPEvent *event); - int (*exit)(SCLPEvent *event); + void (*exit)(SCLPEvent *event); =20 /* get SCLP's send mask */ unsigned int (*get_send_mask)(void); --=20 2.7.4 From nobody Fri Mar 29 06:11:14 2024 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.zoho.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 149338451632254.32682576245202; Fri, 28 Apr 2017 06:01:56 -0700 (PDT) Received: from localhost ([::1]:37002 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d45X0-0008Pe-Sn for importer@patchew.org; Fri, 28 Apr 2017 09:01:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d45Vc-0007Zy-SE for qemu-devel@nongnu.org; Fri, 28 Apr 2017 09:00:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d45VY-0002d5-1N for qemu-devel@nongnu.org; Fri, 28 Apr 2017 09:00:28 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:34580) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d45VX-0002cD-R6 for qemu-devel@nongnu.org; Fri, 28 Apr 2017 09:00:23 -0400 Received: by mail-pf0-x243.google.com with SMTP id g23so17395348pfj.1 for ; Fri, 28 Apr 2017 06:00:23 -0700 (PDT) Received: from fma-dfsg.ipads-lab.se.sjtu.edu.cn ([69.85.85.101]) by smtp.gmail.com with ESMTPSA id i189sm10621181pgd.61.2017.04.28.05.59.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Apr 2017 06:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=g6USeit7dMy0gUS9opMmBpGwNc6n0GyiIfUuIXc5w2o=; b=KGBLdu8GTw7M5TeA8XIDi89ogA0Dq4bVDz808SYmRz6ihrBco87hGtSfBxga7yQ9zX YcOQD7mH2Y5oSs8uONtArJuJ0LS1rT+V66fitkVubeWj6uWoCUOsbYMhCyaZyGASQirW cK0EBeFGjHyjGMlEne8x7nIYDtJOI9M0jbrzcOc+ZqJSBw42Gy0BgLaQqSvm7koSieYg CmrweKCGN+WpYwbKYbl4F79PAIWxDQ7nVUCEyWWW0GHbKCND+GrbrdReUhtKEF2qdcPZ CVT+Q3KYauq5qFTAOme1/R6uT6ZbcLNW2x47r5Bz5opPp3e4zWUvJQ68sLgbGHqs3n7P wCXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=g6USeit7dMy0gUS9opMmBpGwNc6n0GyiIfUuIXc5w2o=; b=MV9I6ZuFUgub8xq+Qw2ek/EmnPFbiOEPPqqEKnwHdBwADqK7sht/Iu1D/Ofq4Q3deH NDf9RpxrwYFMYfMAM+O1iRcUb3HPel6Tu73+iBozjxj69sR8XvORFzgk+o7PIzbuDNxY ZoIMHR+dtRPZ6ppCxIe4I/OMe+31+jwVpPfBevIr//e1wU1xBMmkYrkYa6LtEbKhbWEX xQaPeV3T4mHWQWomal78VmC06NDhic/gJlZG6KUxLsoxA1qTtYZdbx66OspmKwVruGtL ti6OxOYP/sgWF2QjM4CbffrFwSRZEuz4J7RCiYPMfUZeO699MEmniSWmCpYmj533Z9Ap mlqw== X-Gm-Message-State: AN3rC/6ycym++uXOvZbdBtnikZiqstxDqDOjEz0VkEIY5b9uzE4Dw1Xw wsHWSTMRTDocnA== X-Received: by 10.99.50.3 with SMTP id y3mr4220598pgy.18.1493384422815; Fri, 28 Apr 2017 06:00:22 -0700 (PDT) From: Zihan Yang To: qemu-devel@nongnu.org Date: Fri, 28 Apr 2017 20:55:09 +0800 Message-Id: <1493384110-32060-3-git-send-email-tgnyang@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493384110-32060-1-git-send-email-tgnyang@gmail.com> References: <1493384110-32060-1-git-send-email-tgnyang@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH 2/3] hw/s390x: make virtio_ccw_exit function in virtio-ccw return void 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" , Alexander Graf , Christian Borntraeger , Cornelia Huck , Zihan Yang , 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Only virtio_ccw_exit and the exit callback in VirtIOCCWDeviceClass are converted to void in this patch. 'virtio_ccw_busdev_exit' belongs to DeviceClass so it still returns int, DeviceClass::exit will return void in future patches. Signed-off-by: Zihan Yang --- hw/s390x/virtio-ccw.c | 6 +++--- hw/s390x/virtio-ccw.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index e7167e3..91b43ac 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -731,7 +731,7 @@ out_err: g_free(sch); } =20 -static int virtio_ccw_exit(VirtioCcwDevice *dev) +static void virtio_ccw_exit(VirtioCcwDevice *dev) { CcwDevice *ccw_dev =3D CCW_DEVICE(dev); SubchDev *sch =3D ccw_dev->sch; @@ -744,7 +744,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) @@ -1627,7 +1626,8 @@ static int virtio_ccw_busdev_exit(DeviceState *dev) VirtioCcwDevice *_dev =3D (VirtioCcwDevice *)dev; VirtIOCCWDeviceClass *_info =3D VIRTIO_CCW_DEVICE_GET_CLASS(dev); =20 - return _info->exit(_dev); + _info->exit(_dev); + return 0; } =20 static void virtio_ccw_busdev_unplug(HotplugHandler *hotplug_dev, diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 41d4010..ce8baa3 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -74,7 +74,7 @@ typedef struct VirtioCcwDevice VirtioCcwDevice; typedef struct VirtIOCCWDeviceClass { CCWDeviceClass parent_class; void (*realize)(VirtioCcwDevice *dev, Error **errp); - int (*exit)(VirtioCcwDevice *dev); + void (*exit)(VirtioCcwDevice *dev); } VirtIOCCWDeviceClass; =20 /* Performance improves when virtqueue kick processing is decoupled from t= he --=20 2.7.4 From nobody Fri Mar 29 06:11:14 2024 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.zoho.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 1493384553126408.303014301531; Fri, 28 Apr 2017 06:02:33 -0700 (PDT) Received: from localhost ([::1]:37003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d45Xb-0000UK-SK for importer@patchew.org; Fri, 28 Apr 2017 09:02:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d45Vj-0007df-9Q for qemu-devel@nongnu.org; Fri, 28 Apr 2017 09:00:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d45Vd-0002h8-Oy for qemu-devel@nongnu.org; Fri, 28 Apr 2017 09:00:35 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:33751) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d45Vd-0002gD-Is for qemu-devel@nongnu.org; Fri, 28 Apr 2017 09:00:29 -0400 Received: by mail-pf0-x243.google.com with SMTP id b23so1473187pfc.0 for ; Fri, 28 Apr 2017 06:00:29 -0700 (PDT) Received: from fma-dfsg.ipads-lab.se.sjtu.edu.cn ([69.85.85.101]) by smtp.gmail.com with ESMTPSA id i189sm10621181pgd.61.2017.04.28.06.00.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Apr 2017 06:00:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w080vkhPct8FjD9At21chm1NZQov1YFJUNZXM8EDnQM=; b=NzjUk0OZFKYsayRk/Yh3SKUh9NICrZbiVegq+aMQqrHqL7GhmG9BizDwT9SCnfnUGs N2IXPwsPvQdMScSvIYJqSZMPQ28WgJbmxMs4OpmPehKNPvaciEBR/1xYQwwYog+rDz9I xpLL+eWkmAB2yUhgXpJABPEUkvuZL9pHPgLSxU8V/HttR/FfY7QC+xVP5SdaaG4kUZZg rdzk2hu44zg1JLxlmA9wawbkO9COeNha95bkAIr0T6nRktcai94C4yQqRGlwWk8UMPV0 4Za9NAFwQFpkK+BFin3lvhKgkTCQ6t6DXh1y80wa5G6CC+oIb99JZ5n9RuyAQhkARQoO 3Tcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=w080vkhPct8FjD9At21chm1NZQov1YFJUNZXM8EDnQM=; b=pi48mFNzRmojX+3NepL0iK5EtU0vKdX3yHVewvPI4Ru4fqzSC6xuzCC+05EWlgIloH 5M1k23DC/XXtwDs5y2gC75V9R7lK4dO8FMm2pffiyWVG+NrtcFP/qnsGZEZxpU+UWJCB lj8xXCQtESjGGoEE4tzocg6anh4DQqS4VynXQgw3fD8xe/d3I4sznHGpyDx/T1cH18mG S+VxmnVHeALg6BKK9L2YtZg7rU6zsCiUdSx1OLiLht0iL+JbYMxYUMgLY5au9Ev2ajNV brKCJuE7V04dPf00ywh3zlcx9qi4LeRm321yGz61E/4bntaGtUnj30VHvH1HHbDOGBpD QSzQ== X-Gm-Message-State: AN3rC/5r2i2IAWY+4sphrXVrmFosBI+5MVm/yMgIMhPZed34G9LautWV DURzcXkaKV+CPg== X-Received: by 10.84.143.36 with SMTP id 33mr5629328ply.142.1493384428692; Fri, 28 Apr 2017 06:00:28 -0700 (PDT) From: Zihan Yang To: qemu-devel@nongnu.org Date: Fri, 28 Apr 2017 20:55:10 +0800 Message-Id: <1493384110-32060-4-git-send-email-tgnyang@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493384110-32060-1-git-send-email-tgnyang@gmail.com> References: <1493384110-32060-1-git-send-email-tgnyang@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH 3/3] hw/s390: replace exit with unrealize during class init of virtio-ccw 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" , Alexander Graf , Christian Borntraeger , Cornelia Huck , Zihan Yang , 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently the virtio_ccw_device_class_init function sets dc->exit, which is 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); } =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); =20 _info->exit(_dev); - return 0; } =20 static void virtio_ccw_busdev_unplug(HotplugHandler *hotplug_dev, @@ -1645,7 +1644,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 --=20 2.7.4