From nobody Tue Feb 10 20:14:38 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 151569918428739.888338857101985; Thu, 11 Jan 2018 11:33:04 -0800 (PST) Received: from localhost ([::1]:36586 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZib1-00044v-G8 for importer@patchew.org; Thu, 11 Jan 2018 14:33:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZiYk-0002gw-UT for qemu-devel@nongnu.org; Thu, 11 Jan 2018 14:30:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZiYk-0005MB-0c for qemu-devel@nongnu.org; Thu, 11 Jan 2018 14:30:42 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:45550) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eZiYj-0005Lc-SK for qemu-devel@nongnu.org; Thu, 11 Jan 2018 14:30:41 -0500 Received: by mail-qk0-x241.google.com with SMTP id z12so5693273qkf.12 for ; Thu, 11 Jan 2018 11:30:41 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id i37sm4870538qtc.80.2018.01.11.11.30.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jan 2018 11:30:40 -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=FC0J6XG/qG2b9tl7VHzmcr7zLRwIYaVPjN9DesCvoYI=; b=YpmPKN2LZcU6Ohoo5T1kyA7FsSI9GuASeQDssXEm/3MnNGNqilH78SBA3jG75WUtAp iH5LE9aA6nUHb2SJTa16kVTrYHRYnZYtAwRdRJ8fkCqXhphNBocP3/Y1Er+PRTA35nyi zQMpcZNdG22lkBw/eRsdN6biXmGowWNUoSUd9hnZTCHzLYGu+47sjUQOH94X5uRgwT8v +yMJuvq6fWqYPX3zjFTIMj8S7LtJf3r46gxqjZ5IvFM04Ki2QyCX/IxWZTjobCnf4H6b WvioELkrMcNs/lAmYIBLMfqkKYjt1pCygORVuWIiD/4zBUt9+EHnJXWkrbh8/ieyY6/T vMAQ== 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=FC0J6XG/qG2b9tl7VHzmcr7zLRwIYaVPjN9DesCvoYI=; b=b3RHm9PLlVmI0HgTmQ4brmHS2uUKJUeoOzA9RZFCe8Fpht1eKRfdx5WH5axRmT5a6e Z9YS0csZhY0v1gkrf/aq/rww5rBBAkn6FgVkuJTQIQgmcNC8dfL0shYmu4Ou8mhS61uk dUvj6h9fCJIkgUb4PTiPcr+eqAouvmrCk1jcr9nbk7x3No3f72VQohYYAsx1ZelUoovL xafuoMjHhGiTvf20rFukZyp4CxavNxsXeQxixWZn4bB2KJxXP4w3NRvHFjWp+pYxgrJ3 ipOnkyTFwIwWnFc2/3BDXtAB7bhjJ9TvwcVELHlRfoolVREmoZuKDN/L59OxS9DUIRVO qokA== X-Gm-Message-State: AKwxytdKX1raMVhwN+w11iABQjvtHEMakuMyLr4VFUppYYRR74KBf3tQ TyviQ2/vsBrP0tZwwfMitHc= X-Google-Smtp-Source: ACJfBoujeNQniVBA+q36F7u7zoBoE6LyyX0wrzSIdcaww9DOj9jZJ5HQHexOCDqK2RsRBW5PIdfyJg== X-Received: by 10.55.215.5 with SMTP id m5mr12559383qki.14.1515699041376; Thu, 11 Jan 2018 11:30:41 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 11 Jan 2018 16:30:12 -0300 Message-Id: <20180111193021.17466-5-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180111193021.17466-1-f4bug@amsat.org> References: <20180111193021.17466-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:c09::241 Subject: [Qemu-devel] [PATCH v6 04/13] 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 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