From nobody Tue Feb 10 02:43:03 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 151319568127357.62175519585071; Wed, 13 Dec 2017 12:08:01 -0800 (PST) Received: from localhost ([::1]:37402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDJs-0000kT-GM for importer@patchew.org; Wed, 13 Dec 2017 15:07:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDBq-0002t1-Nu for qemu-devel@nongnu.org; Wed, 13 Dec 2017 14:59:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePDBn-0005Zb-7V for qemu-devel@nongnu.org; Wed, 13 Dec 2017 14:59:38 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:42270) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePDBn-0005ZP-3h for qemu-devel@nongnu.org; Wed, 13 Dec 2017 14:59:35 -0500 Received: by mail-qt0-x241.google.com with SMTP id g9so5222848qth.9 for ; Wed, 13 Dec 2017 11:59:34 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id o5sm1518876qtc.72.2017.12.13.11.59.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 11:59:33 -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=GFEQQewkMa7l1jUgT4pmA2M/PutdRDSnUtofL9CtNUI=; b=BqK7khFZXTy1lTip4G0ji5FwW47SjVIn3THLWe54MCcVaDWzBcvAeaS3VYNDZg/u+N SSX4yFVxnXygB44k8ZF5alceUTkeDNTnk4ZEQVs0zCO/8jt4J7Y7kTaT4QNOzw3MdZkm eGysf5TNjsDpI6LOD96G+hjV9x6ahoF/0gqAKf86K29JB8ZQy7v6i0JRWN5YX3j0JyJg R3azrYNrxYKAYphDf0oXqVHEIXOXvwAiwjoj/TQV+fWBh6kElw53JcwQzWg8tRYzvgtb h5hDJ/Lnc/tQXTP7Xd7NIC31j/WtRmn+6EK14C9p1lpS2rpLgPtEe3eWHJU82UuFsHW6 1i0g== 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=GFEQQewkMa7l1jUgT4pmA2M/PutdRDSnUtofL9CtNUI=; b=s1ChW7qB/GBTzyQXhBTNsXPxhSelJAjS9VDZCRX0fOIQoVuPLTzHF+cjX2znZdl9vO n13fHL6RsMNqykAGK1vm4iwDPhFQlSbZYTyfV0AwYyVGSyoK40f/EnSpmY98vTFuaIPX FTg+KTIIOZrjeKWLtxO2CLdwtlt6no879EAK9mSIl2sYtKe4f4ZRLlZG3atKkLWHOljq y52a1KwgYjtdoiGZO4d1L8cl2Wqqza2DUau9L1kquVoch68ALA6azjSKt+YxEwZ8VUOO TWPetACKcGmoLtKSh40Gx+p8iPhoZxci2SJij0Uf/OMfwL4UBii+nX5GKGPvqpN0EkZE AohA== X-Gm-Message-State: AKGB3mK4Unect3CVybyERTmMWsqKDmh+GrMBGftZEUUU+4ssltRaLoAv vWbAkmjl1WzUS9MwvvTdbSk= X-Google-Smtp-Source: ACJfBotnN6eRrLS+gOxT9KDoetnMxqlB8lRyeWJ+PU1pF8/Yd5gIEXX8UlxnTCKnagK9aq9hDBFC7A== X-Received: by 10.237.59.183 with SMTP id r52mr12805152qte.121.1513195174506; Wed, 13 Dec 2017 11:59:34 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Prasad J Pandit , Peter Maydell , Andrew Baumann , Andrey Smirnov , Andrey Yurovsky Date: Wed, 13 Dec 2017 16:58:44 -0300 Message-Id: <20171213195852.30439-7-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213195852.30439-1-f4bug@amsat.org> References: <20171213195852.30439-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 06/14] sdhci: refactor same sysbus/pci properties into a common one 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: Sai Pavan Boddu , Peter Crosthwaite , =?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 add sysbus/pci/sdbus separator comments to keep it clearer Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index a56c0c273e..c8b7b1ca4c 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1256,13 +1256,17 @@ const VMStateDescription sdhci_vmstate =3D { =20 /* Capabilities registers provide information on supported features of this * specific host controller implementation */ -static Property sdhci_pci_properties[] =3D { +static Property sdhci_properties[] =3D { DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFAULT), DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), + DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_qu= irk, + false), DEFINE_PROP_END_OF_LIST(), }; =20 +/* --- qdev PCI --- */ + static void sdhci_pci_realize(PCIDevice *dev, Error **errp) { SDHCIState *s =3D PCI_SDHCI(dev); @@ -1295,7 +1299,7 @@ static void sdhci_pci_class_init(ObjectClass *klass, = void *data) k->class_id =3D PCI_CLASS_SYSTEM_SDHCI; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->vmsd =3D &sdhci_vmstate; - dc->props =3D sdhci_pci_properties; + dc->props =3D sdhci_properties; dc->reset =3D sdhci_poweron_reset; } =20 @@ -1310,14 +1314,7 @@ static const TypeInfo sdhci_pci_info =3D { }, }; =20 -static Property sdhci_sysbus_properties[] =3D { - DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, - SDHC_CAPAB_REG_DEFAULT), - DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), - DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_qu= irk, - false), - DEFINE_PROP_END_OF_LIST(), -}; +/* --- qdev SysBus --- */ =20 static void sdhci_sysbus_init(Object *obj) { @@ -1350,7 +1347,7 @@ static void sdhci_sysbus_class_init(ObjectClass *klas= s, void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->vmsd =3D &sdhci_vmstate; - dc->props =3D sdhci_sysbus_properties; + dc->props =3D sdhci_properties; dc->realize =3D sdhci_sysbus_realize; dc->reset =3D sdhci_poweron_reset; } @@ -1364,6 +1361,8 @@ static const TypeInfo sdhci_sysbus_info =3D { .class_init =3D sdhci_sysbus_class_init, }; =20 +/* --- qdev bus master --- */ + static void sdhci_bus_class_init(ObjectClass *klass, void *data) { SDBusClass *sbc =3D SD_BUS_CLASS(klass); --=20 2.15.1