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/block/m25p80.c | |
| parent | 11f10cf8057dd5392171da061381f6c890b1e21d (diff) | |
| parent | 9f9bdf43cac28251f8cb33b77fed5e19225375c4 (diff) | |
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/block/m25p80.c')
| -rw-r--r-- | hw/block/m25p80.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index ff1106b6c9..afe243b811 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) { |