diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-10-22 12:52:51 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-10-24 15:27:20 +0200 |
| commit | becdfa00cfa2995e859ccefa4b7d72a72eb96581 (patch) | |
| tree | 8973236c181dcde0dbcd9fd36d122fc7a4bac6d7 /hw/char/xilinx_uartlite.c | |
| parent | ecb672d14f092f481000ac9cd9d7dc0500692eba (diff) | |
| download | focaccia-qemu-becdfa00cfa2995e859ccefa4b7d72a72eb96581.tar.gz focaccia-qemu-becdfa00cfa2995e859ccefa4b7d72a72eb96581.zip | |
char: replace PROP_CHR with CharBackend
Store the property in a CharBackend instead of CharDriverState*. This also replace systematically chr by chr.chr to access the CharDriverState*. The following patches will replace it with calls to qemu_chr_fe CharBackend functions. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20161022095318.17775-12-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/char/xilinx_uartlite.c')
| -rw-r--r-- | hw/char/xilinx_uartlite.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index 3766dc2c5b..0e809d52fe 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -55,7 +55,7 @@ typedef struct XilinxUARTLite { SysBusDevice parent_obj; MemoryRegion mmio; - CharDriverState *chr; + CharBackend chr; qemu_irq irq; uint8_t rx_fifo[8]; @@ -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_accept_input(s->chr); + qemu_chr_accept_input(s->chr.chr); break; default: @@ -143,11 +143,11 @@ uart_write(void *opaque, hwaddr addr, break; case R_TX: - if (s->chr) + 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, &ch, 1); - + qemu_chr_fe_write_all(s->chr.chr, &ch, 1); + } s->regs[addr] = value; /* hax. */ @@ -213,8 +213,9 @@ static void xilinx_uartlite_realize(DeviceState *dev, Error **errp) { XilinxUARTLite *s = XILINX_UARTLITE(dev); - if (s->chr) - qemu_chr_add_handlers(s->chr, uart_can_rx, uart_rx, uart_event, s); + if (s->chr.chr) { + qemu_chr_add_handlers(s->chr.chr, uart_can_rx, uart_rx, uart_event, s); + } } static void xilinx_uartlite_init(Object *obj) |