Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180903-pull-request' into...

[qemu.git] / hw / char / milkymist-uart.c

diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c
index ae8e2f35546af398940bce9a134c9c89dc37397f..548ee27bca278aa174f4507e4ffeb7666f7fd298 100644 (file)
--- a/hw/char/milkymist-uart.c
+++ b/hw/char/milkymist-uart.c
@@ -25,7 +25,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "trace.h"
-#include "sysemu/char.h"
+#include "chardev/char-fe.h"
 #include "qemu/error-report.h"
 
 enum {
@@ -199,7 +199,7 @@ static void milkymist_uart_realize(DeviceState *dev, Error **errp)
     MilkymistUartState *s = MILKYMIST_UART(dev);
 
     qemu_chr_fe_set_handlers(&s->chr, uart_can_rx, uart_rx,
-                             uart_event, s, NULL, true);
+                             uart_event, NULL, s, NULL, true);
 }
 
 static void milkymist_uart_init(Object *obj)