From e269fbe23163661c3147dee04c01bbb3b2550d42 Mon Sep 17 00:00:00 2001 From: xiaoqiang zhao Date: Wed, 25 May 2016 14:39:04 +0800 Subject: hw/char: QOM'ify milkymist-uart.c drop the qemu_char_get_next_serial and use chardev prop instead Signed-off-by: xiaoqiang zhao Message-Id: <1464158344-12266-6-git-send-email-zxq_yx_007@163.com> Tested-by: Michael Walle Acked-by: Michael Walle Signed-off-by: Paolo Bonzini --- hw/lm32/milkymist-hw.h | 4 +++- hw/lm32/milkymist.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'hw/lm32') diff --git a/hw/lm32/milkymist-hw.h b/hw/lm32/milkymist-hw.h index f857d28..eb6a3a2 100644 --- a/hw/lm32/milkymist-hw.h +++ b/hw/lm32/milkymist-hw.h @@ -5,11 +5,13 @@ #include "net/net.h" static inline DeviceState *milkymist_uart_create(hwaddr base, - qemu_irq irq) + qemu_irq irq, + CharDriverState *chr) { DeviceState *dev; dev = qdev_create(NULL, "milkymist-uart"); + qdev_prop_set_chr(dev, "chardev", chr); qdev_init_nofail(dev); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq); diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index ebd8a3c..5cae0f1 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -159,7 +159,7 @@ milkymist_init(MachineState *machine) } 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], 80000000, 0x10014d31, 0x0000041f, 0x00000001); milkymist_hpdmc_create(0x60002000); -- cgit v1.1