haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
stable-2.8
Marc-André Lureau 2016-10-22 12:52:53 +03:00 committed by Paolo Bonzini
parent 32a6ebecd2
commit 7fa47e2a80
18 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/char/bcm2835_aux.c
View File

@ -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;

4
hw/char/cadence_uart.c
View File

@ -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;

2
hw/char/escc.c
View File

@ -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:

4
hw/char/imx_serial.c
View File

@ -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);
}
}
}

2
hw/char/ipoctal232.c
View File

@ -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;

2
hw/char/lm32_uart.c
View File

@ -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:

2
hw/char/mcf_uart.c
View File

@ -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:

2
hw/char/milkymist-uart.c
View File

@ -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:

2
hw/char/pl011.c
View File

@ -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;

2
hw/char/serial.c
View File

@ -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;

2
hw/char/spapr_vty.c
View File

@ -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;
}

4
hw/char/stm32f2xx_usart.c
View File

@ -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;

2
hw/char/virtio-console.c
View File

@ -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);
}
}

2
hw/char/xilinx_uartlite.c
View File

@ -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:

6
include/sysemu/char.h
View File

@ -165,11 +165,11 @@ CharDriverState *qemu_chr_new(const char *label, const char *filename);
/**
* @qemu_chr_disconnect:
* @qemu_chr_fe_disconnect:
*
* Close a fd accpeted by character backend.
*/
void qemu_chr_disconnect(CharDriverState *chr);
void qemu_chr_fe_disconnect(CharDriverState *chr);
/**
* @qemu_chr_cleanup:
@ -490,7 +490,7 @@ void qemu_chr_add_handlers_full(CharDriverState *s,
GMainContext *context);
void qemu_chr_be_generic_open(CharDriverState *s);
void qemu_chr_accept_input(CharDriverState *s);
void qemu_chr_fe_accept_input(CharDriverState *s);
int qemu_chr_add_client(CharDriverState *s, int fd);
CharDriverState *qemu_chr_find(const char *name);
bool chr_is_ringbuf(const CharDriverState *chr);

4
net/vhost-user.c
View File

@ -187,7 +187,7 @@ static gboolean net_vhost_user_watch(GIOChannel *chan, GIOCondition cond,
{
VhostUserState *s = opaque;
qemu_chr_disconnect(s->chr.chr);
qemu_chr_fe_disconnect(s->chr.chr);
return FALSE;
}
@ -212,7 +212,7 @@ static void net_vhost_user_event(void *opaque, int event)
s->watch = qemu_chr_fe_add_watch(s->chr.chr, G_IO_HUP,
net_vhost_user_watch, s);
if (vhost_user_start(queues, ncs) < 0) {
qemu_chr_disconnect(s->chr.chr);
qemu_chr_fe_disconnect(s->chr.chr);
return;
}
qmp_set_link(name, true, &err);

4
qemu-char.c
View File

@ -430,7 +430,7 @@ int qemu_chr_add_client(CharDriverState *s, int fd)
return s->chr_add_client ? s->chr_add_client(s, fd) : -1;
}
void qemu_chr_accept_input(CharDriverState *s)
void qemu_chr_fe_accept_input(CharDriverState *s)
{
if (s->chr_accept_input)
s->chr_accept_input(s);
@ -4225,7 +4225,7 @@ void qemu_chr_fe_release(CharDriverState *s)
s->avail_connections++;
}
void qemu_chr_disconnect(CharDriverState *chr)
void qemu_chr_fe_disconnect(CharDriverState *chr)
{
if (chr->chr_disconnect) {
chr->chr_disconnect(chr);

6
tests/vhost-user-test.c
View File

@ -268,7 +268,7 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
int fd;
if (s->test_fail) {
qemu_chr_disconnect(chr->chr);
qemu_chr_fe_disconnect(chr->chr);
/* now switch to non-failure */
s->test_fail = false;
}
@ -313,7 +313,7 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
g_assert_cmpint(msg.payload.u64 & (0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES),
!=, 0ULL);
if (s->test_flags == TEST_FLAGS_DISCONNECT) {
qemu_chr_disconnect(chr->chr);
qemu_chr_fe_disconnect(chr->chr);
s->test_flags = TEST_FLAGS_BAD;
}
break;
@ -724,7 +724,7 @@ reconnect_cb(gpointer user_data)
{
TestServer *s = user_data;
qemu_chr_disconnect(s->chr.chr);
qemu_chr_fe_disconnect(s->chr.chr);
return FALSE;
}