diff options
| author | xiaoqiang zhao <zxq_yx_007@163.com> | 2016-05-25 14:39:02 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-05-29 09:11:10 +0200 |
| commit | c2ddaa62b6979c8f30569059180f66af7bba1224 (patch) | |
| tree | e8b6157afb97567ad277ebdc5ad903df33620e9a /hw/char/lm32_juart.c | |
| parent | 8290de92b83e843390571b36dc9e09a9fb75abf0 (diff) | |
| download | qemu-c2ddaa62b6979c8f30569059180f66af7bba1224.zip qemu-c2ddaa62b6979c8f30569059180f66af7bba1224.tar.gz qemu-c2ddaa62b6979c8f30569059180f66af7bba1224.tar.bz2 | |
hw/char: QOM'ify lm32_juart.c
* Drop the old SysBus init function
* Call qemu_chr_add_handlers in the realize callback
* Use qdev chardev prop instead of qemu_char_get_next_serial
Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Message-Id: <1464158344-12266-4-git-send-email-zxq_yx_007@163.com>
Tested-by: Michael Walle <michael@walle.cc>
Acked-by: Michael Walle <michael@walle.cc>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/char/lm32_juart.c')
| -rw-r--r-- | hw/char/lm32_juart.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c index 5bf8acf..28c2cf7 100644 --- a/hw/char/lm32_juart.c +++ b/hw/char/lm32_juart.c @@ -114,17 +114,13 @@ static void juart_reset(DeviceState *d) s->jrx = 0; } -static int lm32_juart_init(SysBusDevice *dev) +static void lm32_juart_realize(DeviceState *dev, Error **errp) { LM32JuartState *s = LM32_JUART(dev); - /* 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, juart_can_rx, juart_rx, juart_event, s); } - - return 0; } static const VMStateDescription vmstate_lm32_juart = { @@ -138,16 +134,19 @@ static const VMStateDescription vmstate_lm32_juart = { } }; +static Property lm32_juart_properties[] = { + DEFINE_PROP_CHR("chardev", LM32JuartState, chr), + DEFINE_PROP_END_OF_LIST(), +}; + static void lm32_juart_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = lm32_juart_init; dc->reset = juart_reset; dc->vmsd = &vmstate_lm32_juart; - /* Reason: init() method uses qemu_char_get_next_serial() */ - dc->cannot_instantiate_with_device_add_yet = true; + dc->props = lm32_juart_properties; + dc->realize = lm32_juart_realize; } static const TypeInfo lm32_juart_info = { |