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/char/lm32_uart.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/char/lm32_uart.c')
| -rw-r--r-- | hw/char/lm32_uart.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c index 4f2096637d..837a46e8e1 100644 --- a/hw/char/lm32_uart.c +++ b/hw/char/lm32_uart.c @@ -258,6 +258,7 @@ static int lm32_uart_init(SysBusDevice *dev) "uart", R_MAX * 4); sysbus_init_mmio(dev, &s->iomem); + /* FIXME use a qdev chardev prop instead of qemu_char_get_next_serial() */ s->chr = qemu_char_get_next_serial(); if (s->chr) { qemu_chr_add_handlers(s->chr, uart_can_rx, uart_rx, uart_event, s); @@ -284,6 +285,8 @@ static void lm32_uart_class_init(ObjectClass *klass, void *data) k->init = lm32_uart_init; dc->reset = uart_reset; dc->vmsd = &vmstate_lm32_uart; + /* Reason: init() method uses qemu_char_get_next_serial() */ + dc->cannot_instantiate_with_device_add_yet = true; } static const TypeInfo lm32_uart_info = { |