From nobody Mon Feb 9 17:25:19 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 1514570468636628.1432329164029; Fri, 29 Dec 2017 10:01:08 -0800 (PST) Received: from localhost ([::1]:48892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUyxv-0003DX-LU for importer@patchew.org; Fri, 29 Dec 2017 13:01:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUynI-0002t5-Pt for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUynI-0005h4-1S for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:08 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:34528) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eUynH-0005gG-SB for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:07 -0500 Received: by mail-qt0-x242.google.com with SMTP id 33so54962921qtv.1 for ; Fri, 29 Dec 2017 09:50:07 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t41sm24223893qtt.84.2017.12.29.09.50.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Dec 2017 09:50:06 -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=2Mbalk0PtTsyvmFwhkScWiwv7tjXzup7vgMKIgLXo+k=; b=FkYZOhSPBVRDF8Moj4Z8gdhKmtDua5g2geBlzzumqgxxpmml4O6zQY6kosaHf1ZKmW J1OmDLw5dcUa0a6NR0Cbu/fGnVGmhwAQI0ZGt1lYQs19a189b5m+rnKNP0DtM0o3dFzN EqqKarnm5VFuMQg2JK80JiQ2tEovTYVJ7tCqYSO+l27N9lbRwOJvKCQbB/v23jLFWLha 9J/82fGMyE/jR25dyLqrZdlveGWLsDrNgvLK8TD/MHer3H7Pr4eJMkTi2H44ZWaCTBd4 AZ/La61sRSsO0PzOsm4edy6X7cnLVairSdkkjXsx7BNgPqzGXx2wXXCbzBgIwPwdxRXq Ty7w== 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=2Mbalk0PtTsyvmFwhkScWiwv7tjXzup7vgMKIgLXo+k=; b=hfd6UjIiIzJRFgNEoF6QpCsyyCjJ4WeGkX42eN9Gi2n7YKSYlcV7ZJkkj77t/NS7gz EDQT2xtq4EXaLzKctQuSQs4zrpLmnZX1gjANzPeNWQEwG7iTgu+k2GbvkrQwORozWflw lHtFii/oEKIui8bRv+z36lQL9z/xkantEmrMzst+pIDbFbCu4hKPJJWy+OACkXNKzquq tkEBsUz21YYH0h96zRxKdiXRu+MTWYJ5Ia9plPVaa2bn1tOgH8dLNWjGjbkmwpBWW9/M IngFpzfyLDOeT0IXHR4bctN5Rw0/78FeJWejFGIyso10Rqwf1K70j8vdERl0eol3uwta Kv1g== X-Gm-Message-State: AKGB3mItPjrA8cDemfrsX8+mMXJBSagB6qhonGfevxD94f0pqbsiWUiU Ublo2iNliY1LcJitVZYRjtw= X-Google-Smtp-Source: ACJfBouAz/cE+/N0Ym36s36gX1qwuimec7FiuTKQ15KzIKsXiJMipuEv78pm13/Aw7LYWWh0uwBS2w== X-Received: by 10.200.40.66 with SMTP id 2mr47761546qtr.177.1514569807385; Fri, 29 Dec 2017 09:50:07 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Eduardo Habkost , Xiaoqiang Zhao , Andrey Smirnov Date: Fri, 29 Dec 2017 14:48:57 -0300 Message-Id: <20171229174933.1781-7-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 06/42] sdhci: refactor common sysbus/pci realize() into sdhci_realizefn() 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 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 38d82b4c61..ad5853d527 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1194,6 +1194,15 @@ static void sdhci_initfn(SDHCIState *s) s->transfer_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_data_tran= sfer, s); } =20 +static void sdhci_realizefn(SDHCIState *s, Error **errp) +{ + s->buf_maxsz =3D sdhci_get_fifolen(s); + s->fifo_buffer =3D g_malloc0(s->buf_maxsz); + + memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci= ", + SDHC_REGISTERS_MAP_SIZE); +} + static void sdhci_uninitfn(SDHCIState *s) { timer_del(s->insert_timer); @@ -1292,12 +1301,11 @@ static void sdhci_pci_realize(PCIDevice *dev, Error= **errp) SDHCIState *s =3D PCI_SDHCI(dev); dev->config[PCI_CLASS_PROG] =3D 0x01; /* Standard Host supported DMA */ dev->config[PCI_INTERRUPT_PIN] =3D 0x01; /* interrupt pin A */ + sdhci_initfn(s); - s->buf_maxsz =3D sdhci_get_fifolen(s); - s->fifo_buffer =3D g_malloc0(s->buf_maxsz); + sdhci_realizefn(s, errp); + s->irq =3D pci_allocate_irq(dev); - memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci= ", - SDHC_REGISTERS_MAP_SIZE); pci_register_bar(dev, 0, 0, &s->iomem); } =20 @@ -1351,11 +1359,9 @@ static void sdhci_sysbus_realize(DeviceState *dev, E= rror ** errp) SDHCIState *s =3D SYSBUS_SDHCI(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); =20 - s->buf_maxsz =3D sdhci_get_fifolen(s); - s->fifo_buffer =3D g_malloc0(s->buf_maxsz); + sdhci_realizefn(s, errp); + sysbus_init_irq(sbd, &s->irq); - memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci= ", - SDHC_REGISTERS_MAP_SIZE); sysbus_init_mmio(sbd, &s->iomem); } =20 --=20 2.15.1