From nobody Mon Feb 9 05:40:44 2026 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