From nobody Tue Oct 28 12:16:31 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 15149777167251010.4402085755946; Wed, 3 Jan 2018 03:08:36 -0800 (PST) Received: from localhost ([::1]:48693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWguQ-0008Uh-0F for importer@patchew.org; Wed, 03 Jan 2018 06:08:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWgnt-0002yp-V5 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:01:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWgnt-0005oe-42 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:01:50 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:36357) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWgnt-0005oV-0K for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:01:49 -0500 Received: by mail-qt0-x243.google.com with SMTP id a16so1644048qtj.3 for ; Wed, 03 Jan 2018 03:01:48 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id r55sm417735qta.57.2018.01.03.03.01.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 03:01:47 -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=x+mpWe3DxtF+GwUlftp0wKsrhirLrlHmg3JScEzdEps=; b=VWZ9CO6cERs6f04b1RTbSs5JYamdRMYovZk/OpJMWgPxcA7G/93rBeZPGdlqRmOB95 5gUM7vRf2+jPxaPuJU+aHBttZFavyin01FbxdYPuI9b06uqC/0yWg2cqmJnfiL8o49za 8qoKbfXUWr12+AcoYa3bjnBqZSz5Kjpf3xmUt6Dt1f7W1Ii0UNRYQPX4T2ODEw0uHHV+ ahpq7oWZwd2Sfq1zIgjgCAm/BpFi7Lyr0W125tlnLwQjZWAZz30GF0DFA1Zu+rMr/pit 4CmHCK3QTcO/8n7eMxMEij5zDl+sSBphjnuSX3DcYubCLJL07D7C3l/lXDkhjerze13F HC8g== 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=x+mpWe3DxtF+GwUlftp0wKsrhirLrlHmg3JScEzdEps=; b=cN5zVRLTinSSWiMZMttGrTgYrR7f+aqO2yrbbdKb9Hpq4PorKgOtPT+7RWkDCsOdrx EaqWHoeq57EI4BMEX3Z8O92dIHrDFPCcpj8tSc8wzi4Q4CfTj0TrITSoQEvd7cYvRaVS 2oTLChLGOy4mBUiocP1edtMebS+T0exN5O1UidahHsJzY4xkCLGscYJedMfodQPNJiig OJKR66A/+RAADdtkzTz/1LSypR2KK4HCUQ1OpGS3GLgKAOJupVWHDxZOX+OVKp5MC8Uj HyM3gYervkuGOIy5l1jsFHw3fkkuZhnUNsMZO/1dV6td5XcGFs20wcmZfzX7zT0pT5v/ SeBA== X-Gm-Message-State: AKGB3mJPlzA7ZiZiehiW3uYXq8MbtVkTY9ZXNOaLxf7/FCWmyL+ypsyK 4B7adrX/mpmD0DRKp+2sUAI= X-Google-Smtp-Source: ACJfBot0+D1Qoaoeq3bJV6nMWqXB8Jg2hkInfrFCvZRKheZL+Ts1/6S846od0Gx7VuHMXgDfYUiaVw== X-Received: by 10.200.47.105 with SMTP id k38mr1036171qta.195.1514977308416; Wed, 03 Jan 2018 03:01:48 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 08:01:14 -0300 Message-Id: <20180103110126.29209-6-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103110126.29209-1-f4bug@amsat.org> References: <20180103110126.29209-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 v4 05/17] sdhci: refactor common sysbus/pci class_init() into sdhci_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 --- 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..38d82b4c61 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_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_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_class_init(klass, data); } =20 static const TypeInfo sdhci_sysbus_info =3D { --=20 2.15.1