From nobody Tue Feb 10 21:59:53 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513307952561446.04428801328356; Thu, 14 Dec 2017 19:19:12 -0800 (PST) Received: from localhost ([::1]:43954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePgWf-0007WT-Lq for importer@patchew.org; Thu, 14 Dec 2017 22:19:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePgU4-0005gL-6g for qemu-devel@nongnu.org; Thu, 14 Dec 2017 22:16:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePgU1-0000rP-22 for qemu-devel@nongnu.org; Thu, 14 Dec 2017 22:16:24 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:43731) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePgU0-0000qx-TW; Thu, 14 Dec 2017 22:16:20 -0500 Received: by mail-qk0-x243.google.com with SMTP id j207so8835929qke.10; Thu, 14 Dec 2017 19:16:20 -0800 (PST) Received: from x1.local ([181.91.222.165]) by smtp.gmail.com with ESMTPSA id l125sm3484740qkc.3.2017.12.14.19.16.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Dec 2017 19:16:19 -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=5pfinWsdwnR1Jc7lTvX1Xe+KRjO8N5jDEN+jgmrkaEU=; b=ct9qKrJcDUJIfcsLynFnxks62wpCm4meFFl/iqOtxPeAtUsuwJhFkSBzccAuf4Wkyn yMh/MHY4cpt9OMeFwmglBTXiSpZBuJeGSUCgbnxc0CSTTv+9mbuDq+qsbpPBZSYsBp53 GRdQ/Aj9ZmEDhFoO/eYrBXXjbnvmzdTPJ2p/LNHDbOeGqV9C8N2y8iggKqEw6gyVf332 yjRvISlWgynsUhOkkGSqW88lmefzAzZD7vNUZ3Yb/0VupynOHid/2G3+IiHfZDXyP1dZ IfIOnVSMEMCOlO13CQwJDeE8vI2NgszmhG2as1oINVjdyXyRUHLyrmAmaFdDG3RcIbD7 Rukg== 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=5pfinWsdwnR1Jc7lTvX1Xe+KRjO8N5jDEN+jgmrkaEU=; b=WQwZFu7rvtTWMwOC+g5YEZcNRL8XwOajZ6jc6eG152uaSQNwJtrCQJ9sGOgnO+HQ1r A2efcTQFxw3BO2ykakYTCq02Y3a4EEdYe0Ol65BrNJgC9eYhGJyoQwxEvQ6eeuddwwdI qd3VZsx/97c9xbX1La1URdtkhWqoJ7IufvRgyE2k6QK52SgCydAVxGyX8riL1BcSNh2a H0naqwY6rvkB6MCRo5gWqVdJSdsWFrwyzcYSlRoVcNZFzyfoX/fzaSLYg9j2NjzAEosC F1Pk5chR8T9DpQm/lTpWwp9/+UjlyvBZWnWeBDWvnrV2fl8djzRqBZ1atJRjKzG/Bu9f 0KQA== X-Gm-Message-State: AKGB3mKQrCkRQYYHrR9daOjCM0ghUlsb9iVrJi2uFIIChnhOzlCY16kS qRk4YK9XAnkMlhUbyIoCGtc= X-Google-Smtp-Source: ACJfBovRlxkbwViTM/nR6/smzOJbdDV27YBCNyFrFf8NMqBPNjW8QFmipVaZ4e0zB03Z0Rk3Mh+Ehg== X-Received: by 10.55.166.82 with SMTP id p79mr19919596qke.302.1513307780433; Thu, 14 Dec 2017 19:16:20 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Michael Walle , Andrzej Zaborowski , Andrew Baumann , Andrey Smirnov , Andrey Yurovsky , Eduardo Habkost Date: Fri, 15 Dec 2017 00:15:31 -0300 Message-Id: <20171215031547.31006-5-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171215031547.31006-1-f4bug@amsat.org> References: <20171215031547.31006-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::243 Subject: [Qemu-devel] [PATCH v2 04/20] 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: Prasad J Pandit , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Sai Pavan Boddu , qemu-arm@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 2823da00da..dbdfd54350 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1265,13 +1265,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); @@ -1304,7 +1308,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 @@ -1319,14 +1323,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) { @@ -1359,7 +1356,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; } @@ -1373,6 +1370,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