motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 07:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/sd/pl181: Do not create SD card within the SD host controller

Browse source 
SD/MMC host controllers provide a SD Bus to plug SD cards,
but don't come with SD card plugged in :) Let the machine/board
model create and plug the SD cards when required.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200705204630.4133-8-f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-07-05 14:24:24 +02:00
parent 2762eed1f5
commit 26c607b86b
5 changed files with 61 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hw/sd/pl181.c
View file

@ -17,7 +17,6 @@
#include "qemu/module.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "hw/qdev-properties.h"
//#define DEBUG_PL181 1
@ -518,30 +517,14 @@ static void pl181_init(Object *obj)
TYPE_PL181_BUS, dev, "sd-bus");
}
static void pl181_realize(DeviceState *dev, Error **errp)
{
DeviceState *card;
DriveInfo *dinfo;
/* FIXME use a qdev drive property instead of drive_get_next() */
card = qdev_new(TYPE_SD_CARD);
dinfo = drive_get_next(IF_SD);
qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo),
&error_fatal);
qdev_realize_and_unref(card,
qdev_get_child_bus(dev, "sd-bus"),
&error_fatal);
}
static void pl181_class_init(ObjectClass *klass, void *data)
{
DeviceClass *k = DEVICE_CLASS(klass);
k->vmsd = &vmstate_pl181;
k->reset = pl181_reset;
/* Reason: init() method uses drive_get_next() */
/* Reason: output IRQs should be wired up */
k->user_creatable = false;
k->realize = pl181_realize;
}
static const TypeInfo pl181_info = {