diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-04-02 14:36:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-02 14:36:57 +0100 |
| commit | 913fbe9a6a05296132b5fab431bf1c377a0bbf1a (patch) | |
| tree | fa836796006102bad688f551d7c97e2497470acd /hw/arm/spitz.c | |
| parent | 11f10cf8057dd5392171da061381f6c890b1e21d (diff) | |
| parent | 9f9bdf43cac28251f8cb33b77fed5e19225375c4 (diff) | |
| download | focaccia-qemu-913fbe9a6a05296132b5fab431bf1c377a0bbf1a.tar.gz focaccia-qemu-913fbe9a6a05296132b5fab431bf1c377a0bbf1a.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-hw-2015-04-02' into staging
hw: Contain drive, serial, parallel, net misuse # gpg: Signature made Thu Apr 2 14:32:00 2015 BST using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" * remotes/armbru/tags/pull-hw-2015-04-02: sysbus: Make devices picking up backends unavailable with -device sdhci: Make device "sdhci-pci" unavailable with -device hw: Mark device misusing nd_table[] FIXME hw: Mark devices picking up char backends actively FIXME hw: Mark devices picking up block backends actively FIXME Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/spitz.c')
| -rw-r--r-- | hw/arm/spitz.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index a16831c2e5..5bf032a637 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); @@ -1035,6 +1036,8 @@ static void sl_nand_class_init(ObjectClass *klass, void *data) k->init = sl_nand_init; dc->vmsd = &vmstate_sl_nand_info; dc->props = sl_nand_properties; + /* Reason: init() method uses drive_get() */ + dc->cannot_instantiate_with_device_add_yet = true; } static const TypeInfo sl_nand_info = { |