From nobody Tue Feb 10 02:27: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 1513198506825963.5446061644566; Wed, 13 Dec 2017 12:55:06 -0800 (PST) Received: from localhost ([::1]:37607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePE3U-0003bY-4I for importer@patchew.org; Wed, 13 Dec 2017 15:55:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDuP-0004d2-7H for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:45:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePDuN-0007Rz-3G for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:45:41 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:41552) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePDuM-0007RS-Uq; Wed, 13 Dec 2017 15:45:39 -0500 Received: by mail-qt0-x242.google.com with SMTP id i40so5374723qti.8; Wed, 13 Dec 2017 12:45:38 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id n64sm1507938qkd.97.2017.12.13.12.45.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 12:45:37 -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=sO3kB1ctN8NFcmZjii81FfGWOyoLufxQdat3GfimeS4=; b=X28XX5w/DnumCWRp/8ImPJwCoMxmbCES575MyI/y/hK7AcHPwK0GvD1pVeFCFAsycP H5HVuzfcAHs0kS/t9NC6pb/wOAwqN3D06hwVjLg8VqwYLMMk1bCtVljhlzuOksooDtBN RgNYT7FTnY565neeWCBXny9NKghRWYkp8j5YpdNyKstgMXzWT/ptjwU9j8vCZyYItD1A felejYfc4+6LgFhjD6K1kAc+UfiHOIO/S6m+mlQ8YVHxtGONdXN5uGTuSjnemg/t4tdj 8b3u7dDRcU8siIkp0HASfIXzRCFwEHAyVfRX5AovE6LEEdonFN5T3szDSeWdHvqrXs9R C+Dg== 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=sO3kB1ctN8NFcmZjii81FfGWOyoLufxQdat3GfimeS4=; b=TQKRz0uEGyNHKHV5r7OL6iaEtLRL3mpbmTaR1YjQGpE67AbVL0tP+Md8kdC/yFpmnD ZwfQ2taaYZKzCR2LXtyBZUDlcbXXCnSIPXFxpTr9tpZbBXXsmUoMprtWvT8wotwTUfUm yhvomJATtTZCD4HnXXDtX8HbNDFo3sBX1MKvwAoSQ45vCEsjy5ru2Oif+54Vxa2wmDOz w7UehvXtBZ7yrvNHZ0gHy3/hrEeJnuHryA8VsxPt+GjUoLwIqdcz520/XmLoUGp7eq45 FMYP792yV8t8sagvRo7zZpirS05p/sRrc+fkISE63j989P/oqYDsE+ZaAfriyaesqEQl gfOg== X-Gm-Message-State: AKGB3mJfcsR8GCQ/m7MX/xihs0QpdNIhWFx2jysp4BD5duzQNkHvaDDT TpuyVmOJXlaW2EWkPtvZL6M= X-Google-Smtp-Source: ACJfBouwcW4eI5xAsQmApp6f3lD+FvRRMB4ARHe0RrJ2qaqIpOHcmYMzl5i1425SpwB8HZP3CtidEw== X-Received: by 10.200.22.210 with SMTP id y18mr12987095qtk.38.1513197938398; Wed, 13 Dec 2017 12:45:38 -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 , Clement Deschamps Date: Wed, 13 Dec 2017 17:44:36 -0300 Message-Id: <20171213204436.5379-12-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213204436.5379-1-f4bug@amsat.org> References: <20171213204436.5379-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 11/11] hw/arm/xilinx_zynq: use sdbus_create_slave() to name the different SD busses 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, Sai Pavan Boddu , qemu-arm@nongnu.org, "Edgar E. Iglesias" 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 Using the "bus-name" property we can now address any bus. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/xilinx_zynq.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 1836a4ed45..9275ae6daf 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -167,6 +167,7 @@ static void zynq_init(MachineState *machine) MemoryRegion *ocm_ram =3D g_new(MemoryRegion, 1); DeviceState *dev, *carddev; SysBusDevice *busdev; + SDBus *sdbus; DriveInfo *di; BlockBackend *blk; qemu_irq pic[64]; @@ -248,24 +249,28 @@ static void zynq_init(MachineState *machine) gem_init(&nd_table[1], 0xE000C000, pic[77-IRQ_OFFSET]); =20 dev =3D qdev_create(NULL, TYPE_SYSBUS_SDHCI); + qdev_prop_set_string(dev, "sd-bus-name", "sd.0"); qdev_init_nofail(dev); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0100000); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[56-IRQ_OFFSET]); =20 di =3D drive_get_next(IF_SD); blk =3D di ? blk_by_legacy_dinfo(di) : NULL; - carddev =3D qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD_CAR= D); + sdbus =3D (SDBus *)qdev_get_child_bus(dev, "sd.0"); + carddev =3D sdbus_create_slave_no_init(sdbus, TYPE_SD_CARD); qdev_prop_set_drive(carddev, "drive", blk, &error_fatal); object_property_set_bool(OBJECT(carddev), true, "realized", &error_fat= al); =20 dev =3D qdev_create(NULL, TYPE_SYSBUS_SDHCI); + qdev_prop_set_string(dev, "sd-bus-name", "sd.1"); qdev_init_nofail(dev); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0101000); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[79-IRQ_OFFSET]); =20 di =3D drive_get_next(IF_SD); blk =3D di ? blk_by_legacy_dinfo(di) : NULL; - carddev =3D qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD_CAR= D); + sdbus =3D (SDBus *)qdev_get_child_bus(dev, "sd.1"); + carddev =3D sdbus_create_slave_no_init(sdbus, TYPE_SD_CARD); qdev_prop_set_drive(carddev, "drive", blk, &error_fatal); object_property_set_bool(OBJECT(carddev), true, "realized", &error_fat= al); =20 --=20 2.15.1