[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/13] hw/arm/npcm7xx_boards: Replace drive_get_next() by drive_ge
From: |
Markus Armbruster |
Subject: |
[PULL 03/13] hw/arm/npcm7xx_boards: Replace drive_get_next() by drive_get() |
Date: |
Wed, 15 Dec 2021 15:02:12 +0100 |
drive_get_next() is basically a bad idea. It returns the "next" block
backend of a certain interface type. "Next" means bus=0,unit=N, where
subsequent calls count N up from zero, per interface type.
This lets you define unit numbers implicitly by execution order. If the
order changes, or new calls appear "in the middle", unit numbers change.
ABI break. Hard to spot in review.
Machine "quanta-gbs-bmc" connects just one backend with
drive_get_next(), but with a helper function. Change it to use
drive_get() directly. This makes the unit numbers explicit in the
code.
Cc: Havard Skinnemoen <hskinnemoen@google.com>
Cc: Tyrone Ting <kfting@nuvoton.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211117163409.3587705-4-armbru@redhat.com>
Reviewed-by: Havard Skinnemoen <hskinnemoen@google.com>
---
hw/arm/npcm7xx_boards.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c
index dec7d16ae5..d8a49e4e85 100644
--- a/hw/arm/npcm7xx_boards.c
+++ b/hw/arm/npcm7xx_boards.c
@@ -84,9 +84,9 @@ static void npcm7xx_connect_dram(NPCM7xxState *soc,
MemoryRegion *dram)
&error_abort);
}
-static void sdhci_attach_drive(SDHCIState *sdhci)
+static void sdhci_attach_drive(SDHCIState *sdhci, int unit)
{
- DriveInfo *di = drive_get_next(IF_SD);
+ DriveInfo *di = drive_get(IF_SD, 0, unit);
BlockBackend *blk = di ? blk_by_legacy_dinfo(di) : NULL;
BusState *bus = qdev_get_child_bus(DEVICE(sdhci), "sd-bus");
@@ -374,7 +374,7 @@ static void quanta_gbs_init(MachineState *machine)
drive_get(IF_MTD, 0, 0));
quanta_gbs_i2c_init(soc);
- sdhci_attach_drive(&soc->mmc.sdhci);
+ sdhci_attach_drive(&soc->mmc.sdhci, 0);
npcm7xx_load_kernel(machine, soc);
}
--
2.31.1
- [PULL 00/13] Block device patches patches for 2021-12-15, Markus Armbruster, 2021/12/15
- [PULL 11/13] hw/arm/xilinx_zynq: Replace drive_get_next() by drive_get(), Markus Armbruster, 2021/12/15
- [PULL 13/13] blockdev: Drop unused drive_get_next(), Markus Armbruster, 2021/12/15
- [PULL 09/13] hw/microblaze: Replace drive_get_next() by drive_get(), Markus Armbruster, 2021/12/15
- [PULL 01/13] hw/sd/ssi-sd: Do not create SD card within controller's realize, Markus Armbruster, 2021/12/15
- [PULL 04/13] hw/arm/versatilepb hw/arm/vexpress: Replace drive_get_next() by drive_get(), Markus Armbruster, 2021/12/15
- [PULL 05/13] hw/arm/imx25_pdk: Replace drive_get_next() by drive_get(), Markus Armbruster, 2021/12/15
- [PULL 06/13] hw/arm/mcimx6ul-evk: Replace drive_get_next() by drive_get(), Markus Armbruster, 2021/12/15
- [PULL 08/13] hw/arm/xlnx-versal-virt: Replace drive_get_next() by drive_get(), Markus Armbruster, 2021/12/15
- [PULL 02/13] hw: Replace trivial drive_get_next() by drive_get(), Markus Armbruster, 2021/12/15
- [PULL 03/13] hw/arm/npcm7xx_boards: Replace drive_get_next() by drive_get(),
Markus Armbruster <=
- [PULL 12/13] hw/arm/aspeed: Replace drive_get_next() by drive_get(), Markus Armbruster, 2021/12/15
- [PULL 07/13] hw/arm/mcimx7d-sabre: Replace drive_get_next() by drive_get(), Markus Armbruster, 2021/12/15
- [PULL 10/13] hw/arm/xlnx-zcu102: Replace drive_get_next() by drive_get(), Markus Armbruster, 2021/12/15
- Re: [PULL 00/13] Block device patches patches for 2021-12-15, Richard Henderson, 2021/12/15