From nobody Sun Feb 8 12:38:08 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 1532378263600387.64122529520637; Mon, 23 Jul 2018 13:37:43 -0700 (PDT) Received: from localhost ([::1]:36435 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhhaQ-0001BJ-GA for importer@patchew.org; Mon, 23 Jul 2018 16:37:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhhIW-0001dN-28 for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:19:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhhIU-0002oi-KE for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:19:12 -0400 Received: from mail-oi0-x244.google.com ([2607:f8b0:4003:c06::244]:42717) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhhIU-0002o9-Cs; Mon, 23 Jul 2018 16:19:10 -0400 Received: by mail-oi0-x244.google.com with SMTP id n84-v6so3460958oib.9; Mon, 23 Jul 2018 13:19:10 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id 185-v6sm7074575oid.22.2018.07.23.13.19.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jul 2018 13:19: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=JwXV6lCdYGTsoITieUCAbMMso48s1+5BSagBEGpnQw4=; b=KNjM6ZDt6FNsqxhcbkDFSwYv90kWnixSiXcsNaX20vaGami8XB4+0gjKVWLxpoxCYo woco0vbUeJCxio59EVGlqEd6rs0EkDJYYpUkhS5Ls8lTWWvdWm2X6mcxUl4LMeW7zHCe Ex5xAY9bGvrsvGPtwtBU/6KFXXV4q25y6rNFl9cY7FrwuKdfQY5YsH8EgZL+JQw8eFf6 7IEHJM7GxPQP2PlLM5DtvKnoFbonyywTaZPC6fMDYQ8ndOXOSQnC3NzkrtkDRBxHShM5 61m6snNRM6fBUAwW5VQ8LqbQ2uj00gcCpT1S8AMhzMff4OC5eCJ2jS04GK3ro7UGg+Oi jgCg== 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=JwXV6lCdYGTsoITieUCAbMMso48s1+5BSagBEGpnQw4=; b=sVpmA253vdQRhREcpukyUJZL/B+7LsHJIyhMVEvfLp2419iUaFuFS4iU6BfDck9Y/P NLZ9M009MjvQ/lHC/JNi5to0Kn1+bn7ntCNpxees35v/Ehv8xO9nHHItOfBEEYzyBEKO 88Z4TF9vnEDES45NXGUcONxTIu7djmYh/HbnphXJyYkBuYbbhC6lBBXNwDDyLQtapW5/ qeM6lPh5qImUTBukdV7Cj5379l3jMMXOwALSKttA8bALmQEj4mSNJOd57EgitC/aDqBt p9kHWq+7CeflWqqBw0M9u2gsMeybw6wKYu7h8sr3/3jVBE5PsUBMtbKVc9mJePDiJcle bvVA== X-Gm-Message-State: AOUpUlGC4YCgMmgeBBkbrhzMNp27YmxR2Rd7evhcvD2gA4mg85iKaXdj r7jjGJ5DUwEEAxJYRLcoNs0Z5TqKwSQ= X-Google-Smtp-Source: AAOMgpe+JyxtkeQnt/hcnt9efMsFbhWNk/zseImgVtJWAUHJT+B9BbQKbYMAlUIlMV1epvBPhla5gA== X-Received: by 2002:aca:a64d:: with SMTP id p74-v6mr262894oie.149.1532377149266; Mon, 23 Jul 2018 13:19:09 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 23 Jul 2018 15:16:30 -0500 Message-Id: <20180723201748.25573-22-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com> References: <20180723201748.25573-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::244 Subject: [Qemu-devel] [PATCH 21/99] 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: 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: Cornelia Huck All the different virtio ccw devices use the same reset handler, so let's move setting it into the base virtio ccw device class. CC: qemu-stable@nongnu.org Reviewed-by: Thomas Huth Reviewed-by: David Hildenbrand Reviewed-by: Halil Pasic Signed-off-by: Cornelia Huck (cherry picked from commit 0c53057adb04d254bc09511880670c92ab185fc6) Signed-off-by: Michael Roth --- 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.17.1