From nobody Mon Feb 9 23:01:05 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.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 1529378394198535.118695478723; Mon, 18 Jun 2018 20:19:54 -0700 (PDT) Received: from localhost ([::1]:38976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fV7BR-0000ms-CK for importer@patchew.org; Mon, 18 Jun 2018 23:19:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fV5jk-0003DB-0J for qemu-devel@nongnu.org; Mon, 18 Jun 2018 21:47:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fV5ji-0000uA-F3 for qemu-devel@nongnu.org; Mon, 18 Jun 2018 21:47:12 -0400 Received: from mail-oi0-x22f.google.com ([2607:f8b0:4003:c06::22f]:35628) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fV5ji-0000tn-8J; Mon, 18 Jun 2018 21:47:10 -0400 Received: by mail-oi0-x22f.google.com with SMTP id e8-v6so16716020oii.2; Mon, 18 Jun 2018 18:47:10 -0700 (PDT) Received: from localhost ([2600:1700:70:e488:b0ee:9bda:ee6f:91be]) by smtp.gmail.com with ESMTPSA id l7-v6sm6625163oii.29.2018.06.18.18.47.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 18:47:08 -0700 (PDT) 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; bh=2sv0RtVZTt50sXylQZf9RQAUeeIB7zRRdlsTCZ0G5Ak=; b=B0WUhYUaoBohlJJ0ukWrx8vXGUefLiMZdYJQ77PAUOvpyTASgNm7WQ5VOwSpeGSHW7 qPoVqLiuKZYTJNiSV7K5VJKjqIqY/yXsQ639VykKoqnzxH+OP+avXQ/8bElmd5FFaQIt WFBqnkB1HHS2OVkfFKVpTFdFeU5s8KZ8j0UuKx0nDRJThTei/fd9zo68ojBoLI+Bxc+a zbbI2fdx5uXtQoGhif3tY5+SPFqTDnu1kiTLp/OlNHy6WjPWjVgEH07CmBuGZroywLyW ge0DiREgY3+slrJR3OFib2JHdjM++LaEAGSV6G1N2Yi9H2ra1lJGtQv54Yt1YM0/Jb/q ekvA== 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; bh=2sv0RtVZTt50sXylQZf9RQAUeeIB7zRRdlsTCZ0G5Ak=; b=laYa1HrARYyQwT5WwwtLTmncIyxvrFXvOPzaEw1+S91pQC+BxOXUsfMjtx4OHn64aI kE6PExQy6igdTvM6q6TlZhGUkVCHH9a2dx8rIR0c4qIawhf1DMa3Ytbt6hsJeWgwoxHy UAAZ51pk4fZ1iqU7LaMAe8him3bJra0+J0VLYottMboXMNAkNDaxtRf3cUjSW1Hi52Af FdpyKVWmjA+rVYD6kfBfWZ0y1xyEWIWKKeVCtA9fU5Aw28l6fV/+/ToY33/JmNMXClcw 5B6MTY4prTsNIXoanwmPG5oG4yHS3IIF5YHk5fI0bBTNnyCvG2F0C1XiPz8rNvD5Wy2S VbBw== X-Gm-Message-State: APt69E3PVEmi9HGYwEsRXVAiza5vwaAu14U64GX6q+tSAE6utXgOVcQe a4FsmNOKsObUnySQx8OduwJOGglvxKA= X-Google-Smtp-Source: ADUXVKLfj9xPTmKItpVrpxklJql64ioUyGwYXt2SCs9wcZmI30GW0WM074mPNNMvAR7npVXUWTP2nw== X-Received: by 2002:aca:abca:: with SMTP id u193-v6mr8817660oie.124.1529372829104; Mon, 18 Jun 2018 18:47:09 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 18 Jun 2018 20:42:47 -0500 Message-Id: <20180619014319.28272-82-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180619014319.28272-1-mdroth@linux.vnet.ibm.com> References: <20180619014319.28272-1-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::22f Subject: [Qemu-devel] [PATCH 081/113] s390x/virtio: Convert virtio-ccw from *_exit to *_unrealize 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: Nia Alarie , Cornelia Huck , qemu-stable@nongnu.org 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" From: Nia Alarie Signed-off-by: Nia Alarie Message-Id: <20180307162958.11232-1-nia.alarie@gmail.com> Reviewed-by: Stefan Hajnoczi Signed-off-by: Cornelia Huck (cherry picked from commit 24118af846868bb22e573be206c63e684ba9846a) *prereq for 0c53057adb Signed-off-by: Michael Roth --- hw/s390x/virtio-ccw.c | 34 +++++++++++++++++----------------- hw/s390x/virtio-ccw.h | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 184515ce94..8f2998e8ac 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; @@ -759,12 +759,12 @@ static int virtio_ccw_exit(VirtioCcwDevice *dev) if (sch) { css_subch_assign(sch->cssid, sch->ssid, sch->schid, sch->devno, NU= LL); g_free(sch); + ccw_dev->sch =3D NULL; } if (dev->indicators) { 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 +1343,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 +1371,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 +1399,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 +1427,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 +1455,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 +1482,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 +1519,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 +1557,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 +1595,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 +1624,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 +1704,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 - return _info->exit(_dev); + _info->unrealize(_dev, errp); } =20 static void virtio_ccw_busdev_unplug(HotplugHandler *hotplug_dev, @@ -1727,7 +1727,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 +1803,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 +1852,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; 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 --=20 2.11.0