From nobody Tue Feb 10 02:43:26 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 151582034038618.00854216487687; Fri, 12 Jan 2018 21:12:20 -0800 (PST) Received: from localhost ([::1]:38900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE79-0003Rg-DY for importer@patchew.org; Sat, 13 Jan 2018 00:12:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE2m-0000Rx-Ch for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE2l-00040z-F4 for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:48 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:46729) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE2l-00040b-AM for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:47 -0500 Received: by mail-qt0-x241.google.com with SMTP id r39so8538124qtr.13 for ; Fri, 12 Jan 2018 21:07:47 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.07.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:07:46 -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=D6MN2WGqMfZZ2eOEUpBrydCfRSLGDE+YjtGVsGZWPmE=; b=Se2M0I8NXS6zNDLTehZOkLObAKJ0X6wwDpaS0DMTs5O14vlqoc+IB2mKI05RuhiWrH +3Y/goDQ6YJdEkHMhLpvI4MtTZSw93FRdcSFTJ1d370x/yvjRRTo+A4C+1GP0Rir72ox w3h7hEwvNNpuVVxFG+Dof6Pt5CxLoSlNU9pdFATAE/ldsp8+FbNLK8MW0mZgTkmbokB8 XumL9XdBhUBI3s5EB7jR3YelrLYN9UtHSHfcNRtizwssEC9b25e9qXkVjvVr8bfM+jEh OC6Fb8vaER8MGuWlWZEwD+A7LwK0nyYRhr+jEysH935uO6q1ay7KY8qevi4jcIVHMspO yDRw== 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=D6MN2WGqMfZZ2eOEUpBrydCfRSLGDE+YjtGVsGZWPmE=; b=hgI4KrqnwXjd28sgzZ+J/OzlTOCAFR+UnbXgCAVy8Osp2XVRjKG57QNTQ2hsKWOzXv 7mWtp9oeDuczDpMnq7eZWMYVdusmO4fS4Q5QsVkRNqQ9ntrQksEeVCgzoMteGfdkICzU zTprTxU5uspG403lTVQmH77fiOEmj3tPtXXdpZJMKoKukKYyJMCdpTYsBKu5ZxwF9L1P 9OxUnB23111Vf4pO1XA+z+4uPrY1MSH0YMjmlGkwq4b+q75r6IcPHg0aPbJhTynHxe9l 1fMr9vmh23tIa17RyAqLTZQaG3JGZNDfh4hHSBsZBty/AiBE97U9iT3wz5Vso5wJTEVz Mj3g== X-Gm-Message-State: AKwxytdCwfCcU2ad4peOlKdGjgzx7PFJZT4bog9TwRsRAW3CKtlIcqlm GTXzw4cAXjc6aTrZSaJGxd8= X-Google-Smtp-Source: ACJfBou8hIexa7BVaRJmy0IlTRByPoKspLAyLJ55he8OcqFs+7DvZmCFJOW00MscGYNNpPyIJIDV+g== X-Received: by 10.200.51.103 with SMTP id u36mr5327141qta.127.1515820066895; Fri, 12 Jan 2018 21:07:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:07 -0300 Message-Id: <20180113050717.22969-5-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-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::241 Subject: [Qemu-devel] [PATCH v7 04/14] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Paolo Bonzini 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 | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 6c3389cfdc..191f0d26ee 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1280,6 +1280,15 @@ const VMStateDescription sdhci_vmstate =3D { }, }; =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->reset =3D sdhci_poweron_reset; +} + /* --- qdev PCI --- */ =20 static void sdhci_pci_realize(PCIDevice *dev, Error **errp) @@ -1304,7 +1313,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; @@ -1312,9 +1320,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->reset =3D sdhci_poweron_reset; + + sdhci_common_class_init(klass, data); } =20 static const TypeInfo sdhci_pci_info =3D { @@ -1368,9 +1375,9 @@ static void sdhci_sysbus_class_init(ObjectClass *klas= s, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - dc->vmsd =3D &sdhci_vmstate; 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