From nobody Tue Feb 10 21:59:51 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 1514570114409739.9359700861405; Fri, 29 Dec 2017 09:55:14 -0800 (PST) Received: from localhost ([::1]:48844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUysB-0006fI-9q for importer@patchew.org; Fri, 29 Dec 2017 12:55:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUynE-0002pE-T7 for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUynB-0005Ov-Ri for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:04 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:44779) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eUynB-0005OL-Mt for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:01 -0500 Received: by mail-qt0-x242.google.com with SMTP id m59so54884326qte.11 for ; Fri, 29 Dec 2017 09:50:01 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t41sm24223893qtt.84.2017.12.29.09.49.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Dec 2017 09:50:00 -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=Xo1AC5HWNhg9xzEhD2U4CPgXqIYKYD2Eqxz3/zGvhIE=; b=hfWNcDdR+o/JGDDeu2EVH8oZHrWlDa+ZWwU/n/mnQDY4TOIE1go8Z8RiQbZlpC506m IJZo/h2RPKAHD/FSc2IMjTBJbdEv3gNtaLBvg/u60mj9W3DLgI1+iZHnhRPyjaIv/t+l C+rb4/0QFuvrKQOdhFZNAy7s2K6Wf2hxJnLDE4eqdaZCzVXkNtu9WVODepvDLk13Lt2K JNkTe6ysee48YagywVgiQ/PbeGHiakjfHBS8s5LHYHwsKF54VLi7NNsgckjW27J04iIG 5UkIjhZCkehMV7434VogGlI2D3Mh0An7aPlHIv8XZv9hDCunLg9Y7hZqxAxxsU5igxQr dKRg== 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=Xo1AC5HWNhg9xzEhD2U4CPgXqIYKYD2Eqxz3/zGvhIE=; b=kErX/jxCPvq4L673jCAHawZ1npkHZVskuUmc0nJhfpqJ16m4WHIA/Q/0PqFeIh0s3v RiUOdUlMCwFmOA4MLbZrlRp3aRldTtmB6s6i2xP4nwH60zmKJ55yJyBzS5BSjaBG9pbm pwdYXjQTlUFvBEryfElWL1Lqxr0hZe/tf3tTvpt+bSZnscs06D+nJINWbRa4iSU0J0G8 3H1ppMDmEsK0hCqA7jxkJRB+SdSh6dDO84kgYvg2ai09vmUEc4TEPUR2FMvLqsua9ZxD GCnVKr2bzHwzF8NIwlWsR5ooI+nl7Mq8k04Jn280Kjg0hf0rlklA2CXd2Cl4dIdsG1sZ EtjA== X-Gm-Message-State: AKGB3mJZTCxVxchCwruTgaPBBGKLPO+FpZpD90AF2jd0ToAmxG6f6ugc jRNjmsVf/F/qpJ+rEH0KXI0= X-Google-Smtp-Source: ACJfBovrdA3ePjZZ96hhO2HhdaC1ocF/xFccC9cc9ZC17Ebqcn8RUfhH78sIxT2uSxN0Hcwpw27URg== X-Received: by 10.200.34.112 with SMTP id p45mr44808981qtp.240.1514569801091; Fri, 29 Dec 2017 09:50:01 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrey Smirnov , Eduardo Habkost , Xiaoqiang Zhao , Fam Zheng Date: Fri, 29 Dec 2017 14:48:55 -0300 Message-Id: <20171229174933.1781-5-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171229174933.1781-1-f4bug@amsat.org> References: <20171229174933.1781-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::242 Subject: [Qemu-devel] [PATCH v3 04/42] 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: 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 365bc80009..a11469fbca 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1266,13 +1266,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); @@ -1305,7 +1309,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 @@ -1320,14 +1324,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) { @@ -1360,7 +1357,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; } @@ -1374,6 +1371,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