diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-03-23 19:22:10 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-04-02 15:30:39 +0200 |
| commit | 19109131ca2701de1b4e083bd51172f376f7a5ef (patch) | |
| tree | 15de7615efdaab26c53964f4c63a7d348a203589 /hw/sd | |
| parent | 19f33f16890fc5ec0d43841625ca44ef28767d1a (diff) | |
| download | qemu-19109131ca2701de1b4e083bd51172f376f7a5ef.tar.gz qemu-19109131ca2701de1b4e083bd51172f376f7a5ef.tar.bz2 qemu-19109131ca2701de1b4e083bd51172f376f7a5ef.zip | |
sdhci: Make device "sdhci-pci" unavailable with -device
Device models aren't supposed to go on fishing expeditions for
backends. They should expose suitable properties for the user to set.
For onboard devices, board code sets them.
"sdhci-pci" picks up its block backend in its realize() method with
drive_get_next() instead. Already marked FIXME. See the commit that
added the FIXME for a more detailed explanation of what's wrong.
We can't fix this in time for the release, but since the device is new
in 2.3, we can set cannot_instantiate_with_device_add_yet to disable
it before this mistake becomes ABI, and we have to support command
lines like
$ qemu -drive if=sd -drive if=sd,file=sd.img -device sdhci-pci -device sdhci-pci
forever.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'hw/sd')
| -rw-r--r-- | hw/sd/sdhci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index f056c523dd..ab1350524f 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1254,6 +1254,8 @@ static void sdhci_pci_class_init(ObjectClass *klass, void *data) set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->vmsd = &sdhci_vmstate; dc->props = sdhci_properties; + /* Reason: realize() method uses drive_get_next() */ + dc->cannot_instantiate_with_device_add_yet = true; } static const TypeInfo sdhci_pci_info = { |