xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-23 19:49:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/char: QOM'ify milkymist-uart.c

Browse Source 
drop the qemu_char_get_next_serial and use chardev prop instead

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Message-Id: <1464158344-12266-6-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>
This commit is contained in:
xiaoqiang zhao 2016-05-25 14:39:04 +08:00 committed by Paolo Bonzini
parent 7aaefcaf66
commit e269fbe231
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/char/milkymist-uart.c
View File

@ -200,8 +200,6 @@ static void milkymist_uart_realize(DeviceState *dev, Error **errp)
{ {
MilkymistUartState *s = MILKYMIST_UART(dev); MilkymistUartState *s = MILKYMIST_UART(dev);
/* FIXME use a qdev chardev prop instead of qemu_char_get_next_serial() */
s->chr = qemu_char_get_next_serial();
if (s->chr) { if (s->chr) {
qemu_chr_add_handlers(s->chr, uart_can_rx, uart_rx, uart_event, s); qemu_chr_add_handlers(s->chr, uart_can_rx, uart_rx, uart_event, s);
} }
@ -229,6 +227,11 @@ static const VMStateDescription vmstate_milkymist_uart = {
} }
}; };
static Property milkymist_uart_properties[] = {
DEFINE_PROP_CHR("chardev", MilkymistUartState, chr),
DEFINE_PROP_END_OF_LIST(),
};
static void milkymist_uart_class_init(ObjectClass *klass, void *data) static void milkymist_uart_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
@ -236,8 +239,7 @@ static void milkymist_uart_class_init(ObjectClass *klass, void *data)
dc->realize = milkymist_uart_realize; dc->realize = milkymist_uart_realize;
dc->reset = milkymist_uart_reset; dc->reset = milkymist_uart_reset;
dc->vmsd = &vmstate_milkymist_uart; dc->vmsd = &vmstate_milkymist_uart;
/* Reason: realize() method uses qemu_char_get_next_serial() */ dc->props = milkymist_uart_properties;
dc->cannot_instantiate_with_device_add_yet = true;
} }
static const TypeInfo milkymist_uart_info = { static const TypeInfo milkymist_uart_info = {

4
hw/lm32/milkymist-hw.h
View File

@ -5,11 +5,13 @@
#include "net/net.h" #include "net/net.h"
static inline DeviceState *milkymist_uart_create(hwaddr base, static inline DeviceState *milkymist_uart_create(hwaddr base,
qemu_irq irq) qemu_irq irq,
CharDriverState *chr)
{ {
DeviceState *dev; DeviceState *dev;
dev = qdev_create(NULL, "milkymist-uart"); dev = qdev_create(NULL, "milkymist-uart");
qdev_prop_set_chr(dev, "chardev", chr);
qdev_init_nofail(dev); qdev_init_nofail(dev);
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);

2
hw/lm32/milkymist.c
View File

@ -159,7 +159,7 @@ milkymist_init(MachineState *machine)
} }
g_free(bios_filename); g_free(bios_filename);
milkymist_uart_create(0x60000000, irq[0]); milkymist_uart_create(0x60000000, irq[0], serial_hds[0]);
milkymist_sysctl_create(0x60001000, irq[1], irq[2], irq[3], milkymist_sysctl_create(0x60001000, irq[1], irq[2], irq[3],
80000000, 0x10014d31, 0x0000041f, 0x00000001); 80000000, 0x10014d31, 0x0000041f, 0x00000001);
milkymist_hpdmc_create(0x60002000); milkymist_hpdmc_create(0x60002000);