[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.3 1/3] hw: Mark devices misusing drive_get(),
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH for-2.3 1/3] hw: Mark devices misusing drive_get(), drive_get_next() FIXME |
Date: |
Mon, 23 Mar 2015 20:09:48 +0100 |
Drives defined with if!=none are for board initialization to wire up.
Board code calls drive_get() or similar to find them, and creates
devices with their qdev drive properties set accordingly.
Except a few devices go on a fishing expedition for a suitable backend
instead of exposing a drive property for board code to set: they call
driver_get() or drive_get_next() in their realize() or init() method.
Wrong. Mark them with suitable FIXME comments.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/arm/spitz.c | 1 +
hw/block/m25p80.c | 1 +
hw/isa/pc87312.c | 2 ++
hw/sd/milkymist-memcard.c | 1 +
hw/sd/pl181.c | 1 +
hw/sd/sdhci.c | 1 +
hw/sd/ssi-sd.c | 1 +
7 files changed, 8 insertions(+)
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index a16831c..da02932 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -168,6 +168,7 @@ static int sl_nand_init(SysBusDevice *dev)
DriveInfo *nand;
s->ctl = 0;
+ /* FIXME use a qdev drive property instead of drive_get() */
nand = drive_get(IF_MTD, 0, 0);
s->nand = nand_init(nand ? blk_by_legacy_dinfo(nand) : NULL,
s->manf_id, s->chip_id);
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index ff1106b..afe243b 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -623,6 +623,7 @@ static int m25p80_init(SSISlave *ss)
s->dirty_page = -1;
s->storage = blk_blockalign(s->blk, s->size);
+ /* FIXME use a qdev drive property instead of drive_get_next() */
dinfo = drive_get_next(IF_MTD);
if (dinfo) {
diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index 40a1106..2849e8d 100644
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -319,11 +319,13 @@ static void pc87312_realize(DeviceState *dev, Error
**errp)
d = DEVICE(isa);
qdev_prop_set_uint32(d, "iobase", get_fdc_iobase(s));
qdev_prop_set_uint32(d, "irq", 6);
+ /* FIXME use a qdev drive property instead of drive_get() */
drive = drive_get(IF_FLOPPY, 0, 0);
if (drive != NULL) {
qdev_prop_set_drive_nofail(d, "driveA",
blk_by_legacy_dinfo(drive));
}
+ /* FIXME use a qdev drive property instead of drive_get() */
drive = drive_get(IF_FLOPPY, 0, 1);
if (drive != NULL) {
qdev_prop_set_drive_nofail(d, "driveB",
diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
index 9661eaf..0cc53d9 100644
--- a/hw/sd/milkymist-memcard.c
+++ b/hw/sd/milkymist-memcard.c
@@ -255,6 +255,7 @@ static int milkymist_memcard_init(SysBusDevice *dev)
DriveInfo *dinfo;
BlockBackend *blk;
+ /* FIXME use a qdev drive property instead of drive_get_next() */
dinfo = drive_get_next(IF_SD);
blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL;
s->card = sd_init(blk, false);
diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c
index e704b6e..bf37da6 100644
--- a/hw/sd/pl181.c
+++ b/hw/sd/pl181.c
@@ -490,6 +490,7 @@ static int pl181_init(SysBusDevice *sbd)
sysbus_init_irq(sbd, &s->irq[0]);
sysbus_init_irq(sbd, &s->irq[1]);
qdev_init_gpio_out(dev, s->cardstatus, 2);
+ /* FIXME use a qdev drive property instead of drive_get_next() */
dinfo = drive_get_next(IF_SD);
s->card = sd_init(dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, false);
if (s->card == NULL) {
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 27b914a..f056c52 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1146,6 +1146,7 @@ static void sdhci_initfn(SDHCIState *s)
{
DriveInfo *di;
+ /* FIXME use a qdev drive property instead of drive_get_next() */
di = drive_get_next(IF_SD);
s->card = sd_init(di ? blk_by_legacy_dinfo(di) : NULL, false);
if (s->card == NULL) {
diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
index a71fbca..e4b2d4f 100644
--- a/hw/sd/ssi-sd.c
+++ b/hw/sd/ssi-sd.c
@@ -255,6 +255,7 @@ static int ssi_sd_init(SSISlave *d)
DriveInfo *dinfo;
s->mode = SSI_SD_CMD;
+ /* FIXME use a qdev drive property instead of drive_get_next() */
dinfo = drive_get_next(IF_SD);
s->sd = sd_init(dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, true);
if (s->sd == NULL) {
--
1.9.3
- [Qemu-devel] [PATCH for-2.3 0/3] Contain drive_get() misuse, Markus Armbruster, 2015/03/23
- [Qemu-devel] [PATCH for-2.3 3/3] sysbus: Contain drive_get_next() misuse, Markus Armbruster, 2015/03/23
- [Qemu-devel] [PATCH for-2.3 2/3] sdhci: Make device "sdhci-pci" unavailable with -device, Markus Armbruster, 2015/03/23
- [Qemu-devel] [PATCH for-2.3 1/3] hw: Mark devices misusing drive_get(), drive_get_next() FIXME,
Markus Armbruster <=
- Re: [Qemu-devel] [PATCH for-2.3 0/3] Contain drive_get() misuse, Paolo Bonzini, 2015/03/24
- Re: [Qemu-devel] [PATCH for-2.3 0/3] Contain drive_get() misuse, Markus Armbruster, 2015/03/24
- Re: [Qemu-devel] [PATCH for-2.3 0/3] Contain drive_get() misuse, Paolo Bonzini, 2015/03/24
- Re: [Qemu-devel] [PATCH for-2.3 0/3] Contain drive_get() misuse, Markus Armbruster, 2015/03/24
- Re: [Qemu-devel] [PATCH for-2.3 0/3] Contain drive_get() misuse, Paolo Bonzini, 2015/03/24
- Re: [Qemu-devel] [PATCH for-2.3 0/3] Contain drive_get() misuse, Markus Armbruster, 2015/03/24
- Re: [Qemu-devel] [PATCH for-2.3 0/3] Contain drive_get() misuse, Paolo Bonzini, 2015/03/24
- Re: [Qemu-devel] [PATCH for-2.3 0/3] Contain drive_get() misuse, Markus Armbruster, 2015/03/25
Re: [Qemu-devel] [PATCH for-2.3 0/3] Contain drive_get() misuse, Markus Armbruster, 2015/03/25