From nobody Thu Oct 30 15:20:13 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525708414652171.57424103030087; Mon, 7 May 2018 08:53:34 -0700 (PDT) Received: from localhost ([::1]:46901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFiS5-0002ut-NF for importer@patchew.org; Mon, 07 May 2018 11:53:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFiQV-00023g-MI for qemu-devel@nongnu.org; Mon, 07 May 2018 11:51:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFiQR-00019O-JJ for qemu-devel@nongnu.org; Mon, 07 May 2018 11:51:47 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:47006 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fFiQR-00019E-ET; Mon, 07 May 2018 11:51:43 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E880A4079F32; Mon, 7 May 2018 15:51:42 +0000 (UTC) Received: from localhost (dhcp-192-222.str.redhat.com [10.33.192.222]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 86E9E111AF05; Mon, 7 May 2018 15:51:40 +0000 (UTC) From: Cornelia Huck To: Christian Borntraeger , Thomas Huth Date: Mon, 7 May 2018 17:51:29 +0200 Message-Id: <20180507155130.21085-2-cohuck@redhat.com> In-Reply-To: <20180507155130.21085-1-cohuck@redhat.com> References: <20180507155130.21085-1-cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 07 May 2018 15:51:42 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 07 May 2018 15:51:42 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'cohuck@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 1/2] virtio-ccw: common reset handler 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: David Hildenbrand , Cornelia Huck , qemu-devel@nongnu.org, Alexander Graf , Halil Pasic , qemu-s390x@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" All the different virtio ccw devices use the same reset handler, so let's move setting it into the base virtio ccw device class. Signed-off-by: Cornelia Huck Reviewed-by: David Hildenbrand Reviewed-by: Halil Pasic Reviewed-by: Thomas Huth --- hw/s390x/virtio-ccw.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index e51fbefd23..40a33302a7 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -1345,7 +1345,6 @@ static void virtio_ccw_net_class_init(ObjectClass *kl= ass, void *data) =20 k->realize =3D virtio_ccw_net_realize; 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); } @@ -1373,7 +1372,6 @@ static void virtio_ccw_blk_class_init(ObjectClass *kl= ass, void *data) =20 k->realize =3D virtio_ccw_blk_realize; 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); } @@ -1401,7 +1399,6 @@ static void virtio_ccw_serial_class_init(ObjectClass = *klass, void *data) =20 k->realize =3D virtio_ccw_serial_realize; 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); } @@ -1429,7 +1426,6 @@ static void virtio_ccw_balloon_class_init(ObjectClass= *klass, void *data) =20 k->realize =3D virtio_ccw_balloon_realize; 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); } @@ -1457,7 +1453,6 @@ static void virtio_ccw_scsi_class_init(ObjectClass *k= lass, void *data) =20 k->realize =3D virtio_ccw_scsi_realize; 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); } @@ -1484,7 +1479,6 @@ static void vhost_ccw_scsi_class_init(ObjectClass *kl= ass, void *data) =20 k->realize =3D vhost_ccw_scsi_realize; 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); } @@ -1521,7 +1515,6 @@ static void virtio_ccw_rng_class_init(ObjectClass *kl= ass, void *data) =20 k->realize =3D virtio_ccw_rng_realize; 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); } @@ -1559,7 +1552,6 @@ static void virtio_ccw_crypto_class_init(ObjectClass = *klass, void *data) =20 k->realize =3D virtio_ccw_crypto_realize; 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); } @@ -1597,7 +1589,6 @@ static void virtio_ccw_gpu_class_init(ObjectClass *kl= ass, void *data) =20 k->realize =3D virtio_ccw_gpu_realize; k->unrealize =3D virtio_ccw_unrealize; - dc->reset =3D virtio_ccw_reset; dc->props =3D virtio_ccw_gpu_properties; dc->hotpluggable =3D false; set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); @@ -1626,7 +1617,6 @@ static void virtio_ccw_input_class_init(ObjectClass *= klass, void *data) =20 k->realize =3D virtio_ccw_input_realize; 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); } @@ -1730,6 +1720,7 @@ static void virtio_ccw_device_class_init(ObjectClass = *klass, void *data) dc->realize =3D virtio_ccw_busdev_realize; dc->unrealize =3D virtio_ccw_busdev_unrealize; dc->bus_type =3D TYPE_VIRTUAL_CSS_BUS; + dc->reset =3D virtio_ccw_reset; } =20 static const TypeInfo virtio_ccw_device_info =3D { @@ -1806,7 +1797,6 @@ static void virtio_ccw_9p_class_init(ObjectClass *kla= ss, void *data) =20 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; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } @@ -1856,7 +1846,6 @@ static void vhost_vsock_ccw_class_init(ObjectClass *k= lass, void *data) 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 static void vhost_vsock_ccw_instance_init(Object *obj) --=20 2.14.3