From nobody Tue Oct 28 12:15:21 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; 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 1515003550234979.9048229274082; Wed, 3 Jan 2018 10:19:10 -0800 (PST) Received: from localhost ([::1]:60135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnd7-0000XH-8S for importer@patchew.org; Wed, 03 Jan 2018 13:19:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnSn-0000Lk-2O for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSm-0006xS-6y for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:29 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34145) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSm-0006xJ-2Q for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:28 -0500 Received: by mail-qt0-x243.google.com with SMTP id 33so3136370qtv.1 for ; Wed, 03 Jan 2018 10:08:28 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:27 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=vEONWK2QEUtykrU5iMWji4TbfJ2EtqRDFmSoRb1Clmw=; b=HFiTU8mT5jl07LKK/A4IKxbSRKqWyIQYkT/OvycKQKDxmXdelyVlHt65NKIYPeCDTl T8DiGTCK2blzwArCN+CFhMQmmuQ9qdIVyytL3FZBcNAQLvDVsuTwWq1yo1/RDRC9EDrO WY7uuWbFd4cVkco/D9VF33T/pDwNihdwytPALpq4ghwiajYlzadC/3bkKD0jL0zXUmPF qtnPlO66QoJWgmJDwEKGymWTQ4q5kCfnEQoIUm1WmxP02NyJ76nfuHKgvH1RC0DAOyNA vnOkp9+8hsbO3DnDMuFcOrRdp5gga0NWv+isuRmm69fjqt3GWrnaa5X7cHKUUNfmYTHW 0Kwg== 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:mime-version:content-transfer-encoding; bh=vEONWK2QEUtykrU5iMWji4TbfJ2EtqRDFmSoRb1Clmw=; b=PNyMKRcu0W4Ez8/rkA0Ee9sb8IJo11z2Hf2/W/AorbXoMv0LK8GoP842+rH12SVXUa PPckN4TJOkZ2DWJ0k1pZWf2hBkq1BWFdCQwZsr60BVJnLPUMgQpaty9TAYrzWG5xWFaU wgXM9lINmYTLp8tMpuPv7ei2awc5x2eQtIVRr48yVDA0iNRPZh0TARrQg30z4f8pWWgm TfKW1xc0m/c/wUrl0OKniJqtJ+iDleVXlRV2b3v6z4aOM+/xTiH8pg4AXoVK3KKw9Mw6 3RPN/g+SqBb31oH7O+i7iWJ2wD23XpbFY4jlFilLXVVtEpISEXmC/j3OsXs9GFjq6hJo 63zg== X-Gm-Message-State: AKGB3mI3k28uATpbAhLTxc2Dog9S0wKlCdoBkrzfLv2iu0eK80tPJ2jw z9FOkLVjJqouuTyq6hhBaTA= X-Google-Smtp-Source: ACJfBotjE4K/gVsckSom8zcVePb1CNjCKj2VORfwnB8N8Y0nMnI4OHFAzJsAg/0LTGFfatKzyOLItA== X-Received: by 10.200.44.243 with SMTP id 48mr2597539qtx.99.1515002907726; Wed, 03 Jan 2018 10:08:27 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 15:07:53 -0300 Message-Id: <20180103180805.18140-6-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v5 05/17] sdhci: refactor common sysbus/pci class_init() into sdhci_common_class_init() 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: "Edgar E . Iglesias" , Peter Maydell , Eduardo Habkost , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@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 Now both inherited classes appear as DEVICE_CATEGORY_STORAGE. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index a11469fbca..68bcf75478 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1275,6 +1275,16 @@ static Property sdhci_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 +static void sdhci_common_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); + dc->vmsd =3D &sdhci_vmstate; + dc->props =3D sdhci_properties; + dc->reset =3D sdhci_poweron_reset; +} + /* --- qdev PCI --- */ =20 static void sdhci_pci_realize(PCIDevice *dev, Error **errp) @@ -1299,7 +1309,6 @@ static void sdhci_pci_exit(PCIDevice *dev) =20 static void sdhci_pci_class_init(ObjectClass *klass, void *data) { - DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 k->realize =3D sdhci_pci_realize; @@ -1307,10 +1316,8 @@ static void sdhci_pci_class_init(ObjectClass *klass,= void *data) k->vendor_id =3D PCI_VENDOR_ID_REDHAT; k->device_id =3D PCI_DEVICE_ID_REDHAT_SDHCI; k->class_id =3D PCI_CLASS_SYSTEM_SDHCI; - set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); - dc->vmsd =3D &sdhci_vmstate; - dc->props =3D sdhci_properties; - dc->reset =3D sdhci_poweron_reset; + + sdhci_common_class_init(klass, data); } =20 static const TypeInfo sdhci_pci_info =3D { @@ -1356,10 +1363,9 @@ static void sdhci_sysbus_class_init(ObjectClass *kla= ss, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - dc->vmsd =3D &sdhci_vmstate; - dc->props =3D sdhci_properties; dc->realize =3D sdhci_sysbus_realize; - dc->reset =3D sdhci_poweron_reset; + + sdhci_common_class_init(klass, data); } =20 static const TypeInfo sdhci_sysbus_info =3D { --=20 2.15.1