mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 16:53:55 -06:00
char: use qemu_chr_fe* functions with CharBackend argument
This also switches from qemu_chr_add_handlers() to qemu_chr_fe_set_handlers(). Note that qemu_chr_fe_set_handlers() now takes the focus when fe_open (qemu_chr_add_handlers() did take the focus) Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20161022095318.17775-16-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
fbf3cc3a67
commit
5345fdb446
47 changed files with 437 additions and 409 deletions
|
@ -107,7 +107,7 @@ uart_read(void *opaque, hwaddr addr, unsigned int size)
|
|||
s->rx_fifo_len--;
|
||||
uart_update_status(s);
|
||||
uart_update_irq(s);
|
||||
qemu_chr_fe_accept_input(s->chr.chr);
|
||||
qemu_chr_fe_accept_input(&s->chr);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -146,7 +146,7 @@ uart_write(void *opaque, hwaddr addr,
|
|||
if (s->chr.chr) {
|
||||
/* XXX this blocks entire thread. Rewrite to use
|
||||
* qemu_chr_fe_write and background I/O callbacks */
|
||||
qemu_chr_fe_write_all(s->chr.chr, &ch, 1);
|
||||
qemu_chr_fe_write_all(&s->chr, &ch, 1);
|
||||
}
|
||||
s->regs[addr] = value;
|
||||
|
||||
|
@ -214,7 +214,8 @@ static void xilinx_uartlite_realize(DeviceState *dev, Error **errp)
|
|||
XilinxUARTLite *s = XILINX_UARTLITE(dev);
|
||||
|
||||
if (s->chr.chr) {
|
||||
qemu_chr_add_handlers(s->chr.chr, uart_can_rx, uart_rx, uart_event, s);
|
||||
qemu_chr_fe_set_handlers(&s->chr, uart_can_rx, uart_rx,
|
||||
uart_event, s, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue