diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-10-22 12:52:53 +0300 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-10-24 15:27:20 +0200 |
commit | 7fa47e2a80e1c204533340f65909b7fc7c6b276f (patch) | |
tree | 06fa4c2de9409c5d1b3f1ec934f8f1234d4de949 /hw | |
parent | 32a6ebecd2ffe82ffade5edf9e054e20cb48f281 (diff) |
char: rename some frontend functions
qemu_chr_accept_input() and qemu_chr_disconnect() are only used by
frontend, so use qemu_chr_fe prefix.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20161022095318.17775-14-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/char/bcm2835_aux.c | 2 | ||||
-rw-r--r-- | hw/char/cadence_uart.c | 4 | ||||
-rw-r--r-- | hw/char/escc.c | 2 | ||||
-rw-r--r-- | hw/char/imx_serial.c | 4 | ||||
-rw-r--r-- | hw/char/ipoctal232.c | 2 | ||||
-rw-r--r-- | hw/char/lm32_uart.c | 2 | ||||
-rw-r--r-- | hw/char/mcf_uart.c | 2 | ||||
-rw-r--r-- | hw/char/milkymist-uart.c | 2 | ||||
-rw-r--r-- | hw/char/pl011.c | 2 | ||||
-rw-r--r-- | hw/char/serial.c | 2 | ||||
-rw-r--r-- | hw/char/spapr_vty.c | 2 | ||||
-rw-r--r-- | hw/char/stm32f2xx_usart.c | 4 | ||||
-rw-r--r-- | hw/char/virtio-console.c | 2 | ||||
-rw-r--r-- | hw/char/xilinx_uartlite.c | 2 |
14 files changed, 17 insertions, 17 deletions
diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c index 4bc5d02135..30f4ea546b 100644 --- a/hw/char/bcm2835_aux.c +++ b/hw/char/bcm2835_aux.c @@ -80,7 +80,7 @@ static uint64_t bcm2835_aux_read(void *opaque, hwaddr offset, unsigned size) } } if (s->chr.chr) { - qemu_chr_accept_input(s->chr.chr); + qemu_chr_fe_accept_input(s->chr.chr); } bcm2835_aux_update(s); return c; diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index d5687dd61f..c02723502c 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -143,7 +143,7 @@ static void uart_rx_reset(CadenceUARTState *s) s->rx_wpos = 0; s->rx_count = 0; if (s->chr.chr) { - qemu_chr_accept_input(s->chr.chr); + qemu_chr_fe_accept_input(s->chr.chr); } } @@ -369,7 +369,7 @@ static void uart_read_rx_fifo(CadenceUARTState *s, uint32_t *c) s->rx_count--; if (s->chr.chr) { - qemu_chr_accept_input(s->chr.chr); + qemu_chr_fe_accept_input(s->chr.chr); } } else { *c = 0; diff --git a/hw/char/escc.c b/hw/char/escc.c index ae69b392a4..f1e8fac6f3 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -600,7 +600,7 @@ static uint64_t escc_mem_read(void *opaque, hwaddr addr, ret = s->rx; trace_escc_mem_readb_data(CHN_C(s), ret); if (s->chr.chr) { - qemu_chr_accept_input(s->chr.chr); + qemu_chr_fe_accept_input(s->chr.chr); } return ret; default: diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index 5c11de2cbe..2e39d319fe 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -122,7 +122,7 @@ static uint64_t imx_serial_read(void *opaque, hwaddr offset, s->uts1 |= UTS1_RXEMPTY; imx_update(s); if (s->chr.chr) { - qemu_chr_accept_input(s->chr.chr); + qemu_chr_fe_accept_input(s->chr.chr); } } return c; @@ -216,7 +216,7 @@ static void imx_serial_write(void *opaque, hwaddr offset, if (value & UCR2_RXEN) { if (!(s->ucr2 & UCR2_RXEN)) { if (s->chr.chr) { - qemu_chr_accept_input(s->chr.chr); + qemu_chr_fe_accept_input(s->chr.chr); } } } diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 0c9dea322e..875fe3b22a 100644 --- a/hw/char/ipoctal232.c +++ b/hw/char/ipoctal232.c @@ -289,7 +289,7 @@ static uint16_t io_read(IPackDevice *ip, uint8_t addr) ch->sr &= ~SR_RXRDY; blk->isr &= ~ISR_RXRDY(channel); if (ch->dev.chr) { - qemu_chr_accept_input(ch->dev.chr); + qemu_chr_fe_accept_input(ch->dev.chr); } } else { ch->rhr_idx = (ch->rhr_idx + 1) % RX_FIFO_SIZE; diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c index 72fc41c90f..a8d4a2db70 100644 --- a/hw/char/lm32_uart.c +++ b/hw/char/lm32_uart.c @@ -142,7 +142,7 @@ static uint64_t uart_read(void *opaque, hwaddr addr, r = s->regs[R_RXTX]; s->regs[R_LSR] &= ~LSR_DR; uart_update_irq(s); - qemu_chr_accept_input(s->chr.chr); + qemu_chr_fe_accept_input(s->chr.chr); break; case R_IIR: case R_LSR: diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 436e1b0228..57b47c6690 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -93,7 +93,7 @@ uint64_t mcf_uart_read(void *opaque, hwaddr addr, if (s->fifo_len == 0) s->sr &= ~MCF_UART_RxRDY; mcf_uart_update(s); - qemu_chr_accept_input(s->chr.chr); + qemu_chr_fe_accept_input(s->chr.chr); return val; } case 0x10: diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index a6518e62b0..c75bcb57fd 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -138,7 +138,7 @@ static void uart_write(void *opaque, hwaddr addr, uint64_t value, case R_STAT: /* write one to clear bits */ s->regs[addr] &= ~(value & (STAT_RX_EVT | STAT_TX_EVT)); - qemu_chr_accept_input(s->chr.chr); + qemu_chr_fe_accept_input(s->chr.chr); break; default: diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 9645195f90..29fb7251a1 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -88,7 +88,7 @@ static uint64_t pl011_read(void *opaque, hwaddr offset, s->rsr = c >> 8; pl011_update(s); if (s->chr.chr) { - qemu_chr_accept_input(s->chr.chr); + qemu_chr_fe_accept_input(s->chr.chr); } r = c; break; diff --git a/hw/char/serial.c b/hw/char/serial.c index 18c748231c..4489bf168f 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -490,7 +490,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr addr, unsigned size) serial_update_irq(s); if (!(s->mcr & UART_MCR_LOOP)) { /* in loopback mode, don't receive any data */ - qemu_chr_accept_input(s->chr.chr); + qemu_chr_fe_accept_input(s->chr.chr); } } break; diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index dcb4a85d97..7afc6a5094 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -51,7 +51,7 @@ static int vty_getchars(VIOsPAPRDevice *sdev, uint8_t *buf, int max) buf[n++] = dev->buf[dev->out++ % VTERM_BUFSIZE]; } - qemu_chr_accept_input(dev->chardev.chr); + qemu_chr_fe_accept_input(dev->chardev.chr); return n; } diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c index 8cc27372f0..8619d10e04 100644 --- a/hw/char/stm32f2xx_usart.c +++ b/hw/char/stm32f2xx_usart.c @@ -98,7 +98,7 @@ static uint64_t stm32f2xx_usart_read(void *opaque, hwaddr addr, retvalue = s->usart_sr; s->usart_sr &= ~USART_SR_TC; if (s->chr.chr) { - qemu_chr_accept_input(s->chr.chr); + qemu_chr_fe_accept_input(s->chr.chr); } return retvalue; case USART_DR: @@ -106,7 +106,7 @@ static uint64_t stm32f2xx_usart_read(void *opaque, hwaddr addr, s->usart_sr |= USART_SR_TXE; s->usart_sr &= ~USART_SR_RXNE; if (s->chr.chr) { - qemu_chr_accept_input(s->chr.chr); + qemu_chr_fe_accept_input(s->chr.chr); } qemu_set_irq(s->irq, 0); return s->usart_dr & 0x3FF; diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index a4730baafb..93acbeccf4 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -123,7 +123,7 @@ static void guest_writable(VirtIOSerialPort *port) VirtConsole *vcon = VIRTIO_CONSOLE(port); if (vcon->chr.chr) { - qemu_chr_accept_input(vcon->chr.chr); + qemu_chr_fe_accept_input(vcon->chr.chr); } } diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index 0e809d52fe..185c63baf3 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -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.chr); + qemu_chr_fe_accept_input(s->chr.chr); break; default: |