From nobody Mon Feb 9 10:38:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619275997; cv=none; d=zohomail.com; s=zohoarc; b=foRZEti4gE3EWoLWx+oq8+E3m6MXioAnaKCmG+HPvfiH24MgFex7IlidSfEGYBCuPoCB0+pX876l1VTbvuCTqWeqXLpBYE7ODbzijs46vx5pEeWvsxiZPifG6YBMOiXONwxtVIPl+5HF0gUd8hcbuF1yG9MFzScPU/gktVFrQYg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619275997; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=dcj02hY637ePPnBlD5sXEWdsMGDRflsUeWtCTI08c6A=; b=lHz9z92R+CC8TnxTlwOCHDg+WSpntZzTfEjmR32DLPeufxXwabiAGxp/0T7yVwBxX4RJRZImZiy8gnHsV7MAEsJhgughhhSjp7so1jBbrfUO07YL7/sqQjjaOs39Wo0jm4IzNy2QNNaYWKiTIVUrMWzdxznNnnLJI2L1X0Mw0Uw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1619275997872670.498340883224; Sat, 24 Apr 2021 07:53:17 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id n127so15749692wmb.5 for ; Sat, 24 Apr 2021 07:53:17 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id x23sm10506895wmj.43.2021.04.24.07.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Apr 2021 07:53:15 -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:mime-version :content-transfer-encoding; bh=dcj02hY637ePPnBlD5sXEWdsMGDRflsUeWtCTI08c6A=; b=SbhVrlxzpRZCDe+eID+/3r9izdzp0xoTW2xuD6rRLFOcMywgpa2k1bPVIciVRyxokh mB5ngCnUWOvq90d5QgJsi2b9NDWzYLy1VAOBC8QbyIR3wj0VxSn4Oy4SMiukbAfIP6Mh LyskJQehLZQz7vAeR9PAu8j0pcRvUcB+594PF9MPFks1qUPs1flHp2v3MnjO6UXOC52G KIQ/BPHb22FtSFhA7umYNejWzODTs6XKf5wwz+GjAglAoT+u6wYWEAu7xyfT0OkFMpT9 f6vndhe3kg3tZV8jNq88qkuQ2ey9ILguxuJYKgh1+DZlj/KpU/PRjYszdpSEo3aGIBWq rKjA== 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 :mime-version:content-transfer-encoding; bh=dcj02hY637ePPnBlD5sXEWdsMGDRflsUeWtCTI08c6A=; b=JkfpAssEqV2loWiTz3pfeOGfSjiHTTiuUohMX3HHpESshBwFiaDHaQYUFvB8nHf2IQ 9fxIT1USdDgfIrBGHHDz9E8Ptr1qFbb9nfh9hyJV/zE1hBiQESizaPaIeWeSGGNYLsxw ZXjR/eVpgkMoninTtkY6GZbPbq2eV/2Z4nvpMavPlWPFK8Fv90zprgzWdMjkGsIDY02t cCGPNIxDm9wz0QyUAQC6W/QU6c+E4cZzv+wE4DJLZPnMHqALJIyvaUMcJdPgXcvGJM4X c0ZOvzAE6PbdXf5zlis1fbuoadHtPpJiJJ4Hx1yRH5KAK/0jH/0/rpdjOWjW6WniyS5Q PEqg== X-Gm-Message-State: AOAM531lNbBW6KxQeHdMfucFLljYRem8fN3xOBU2PImP9M5WdO6eABKZ svNtB4R7A2W55SmnnLF6o28= X-Google-Smtp-Source: ABdhPJwiC38bWd4erKLT+X2CpT+1pHlmsnz5O38SNXPNG5hvA/XmAVrWTerkLrD4Tjqz4chyHmiZgg== X-Received: by 2002:a1c:156:: with SMTP id 83mr3092096wmb.186.1619275996051; Sat, 24 Apr 2021 07:53:16 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Farman , Markus Armbruster , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , Matthew Rosato , Richard Henderson , Halil Pasic , Cornelia Huck , David Hildenbrand , Thomas Huth , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH] hw/s390x/ccw: Register qbus type in abstract TYPE_CCW_DEVICE parent Date: Sat, 24 Apr 2021 16:53:13 +0200 Message-Id: <20210424145313.3287400-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Instead of having all TYPE_CCW_DEVICE children set the bus type to TYPE_VIRTUAL_CSS_BUS, do it once in the abstract parent. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Eric Farman --- RFC because I don't know these devices, maybe there is a reason for setting the bus type in the children (but it should be documented IMO). --- hw/s390x/ccw-device.h | 1 + hw/s390x/3270-ccw.c | 1 - hw/s390x/ccw-device.c | 1 + hw/s390x/s390-ccw.c | 2 -- hw/s390x/virtio-ccw.c | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/s390x/ccw-device.h b/hw/s390x/ccw-device.h index 832c78cd421..6dff95225df 100644 --- a/hw/s390x/ccw-device.h +++ b/hw/s390x/ccw-device.h @@ -14,6 +14,7 @@ #include "qom/object.h" #include "hw/qdev-core.h" #include "hw/s390x/css.h" +#include "hw/s390x/css-bridge.h" =20 struct CcwDevice { DeviceState parent_obj; diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c index f3e7342b1e8..0757af60632 100644 --- a/hw/s390x/3270-ccw.c +++ b/hw/s390x/3270-ccw.c @@ -159,7 +159,6 @@ static void emulated_ccw_3270_class_init(ObjectClass *k= lass, void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); =20 device_class_set_props(dc, emulated_ccw_3270_properties); - dc->bus_type =3D TYPE_VIRTUAL_CSS_BUS; dc->realize =3D emulated_ccw_3270_realize; dc->hotpluggable =3D false; set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c index c9707110e9c..95f269ab441 100644 --- a/hw/s390x/ccw-device.c +++ b/hw/s390x/ccw-device.c @@ -59,6 +59,7 @@ static void ccw_device_class_init(ObjectClass *klass, voi= d *data) k->refill_ids =3D ccw_device_refill_ids; device_class_set_props(dc, ccw_device_properties); dc->reset =3D ccw_device_reset; + dc->bus_type =3D TYPE_VIRTUAL_CSS_BUS; } =20 const VMStateDescription vmstate_ccw_dev =3D { diff --git a/hw/s390x/s390-ccw.c b/hw/s390x/s390-ccw.c index b497571863f..cb49f380a6b 100644 --- a/hw/s390x/s390-ccw.c +++ b/hw/s390x/s390-ccw.c @@ -177,10 +177,8 @@ static void s390_ccw_instance_init(Object *obj) =20 static void s390_ccw_class_init(ObjectClass *klass, void *data) { - DeviceClass *dc =3D DEVICE_CLASS(klass); S390CCWDeviceClass *cdc =3D S390_CCW_DEVICE_CLASS(klass); =20 - dc->bus_type =3D TYPE_VIRTUAL_CSS_BUS; cdc->realize =3D s390_ccw_realize; cdc->unrealize =3D s390_ccw_unrealize; } diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 8195f3546e4..71ec2bdcc31 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -1235,7 +1235,6 @@ static void virtio_ccw_device_class_init(ObjectClass = *klass, void *data) k->unplug =3D virtio_ccw_busdev_unplug; dc->realize =3D virtio_ccw_busdev_realize; dc->unrealize =3D virtio_ccw_busdev_unrealize; - dc->bus_type =3D TYPE_VIRTUAL_CSS_BUS; device_class_set_parent_reset(dc, virtio_ccw_reset, &vdc->parent_reset= ); } =20 --=20 2.26.3