From patchwork Fri Oct 12 00:22:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 982799 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42WTHV2jS4z9sBq for ; Fri, 12 Oct 2018 11:29:42 +1100 (AEDT) Received: from localhost ([::1]:37723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAlKm-0002KP-0o for incoming@patchwork.ozlabs.org; Thu, 11 Oct 2018 20:29:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAlFF-0006WN-PO for qemu-devel@nongnu.org; Thu, 11 Oct 2018 20:23:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAlFD-0006hD-JG for qemu-devel@nongnu.org; Thu, 11 Oct 2018 20:23:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42310) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gAlF7-0006du-Iw; Thu, 11 Oct 2018 20:23:49 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 37554C050E0D; Fri, 12 Oct 2018 00:23:48 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-29.brq.redhat.com [10.40.204.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 21BCC60557; Fri, 12 Oct 2018 00:23:18 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Prasad J Pandit Date: Fri, 12 Oct 2018 02:22:14 +0200 Message-Id: <20181012002217.2864-9-philmd@redhat.com> In-Reply-To: <20181012002217.2864-1-philmd@redhat.com> References: <20181012002217.2864-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 12 Oct 2018 00:23:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 08/11] chardev: Let IOCanReadHandler use unsigned type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Sagar Karandikar , "Michael S. Tsirkin" , Jan Kiszka , Jason Wang , Palmer Dabbelt , qemu-devel@nongnu.org, Markus Armbruster , Max Filippov , Michael Clark , Gerd Hoffmann , "Edgar E. Iglesias" , Stefano Stabellini , Alberto Garcia , Li Zhijian , Alexander Graf , Christian Borntraeger , Antony Pavlov , Anthony Perard , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier , Corey Minyard , Amit Shah , Alistair Francis , "Dr. David Alan Gilbert" , Fabien Chouteau , Zhang Chen , "open list:PXA2XX" , Peter Chubb , Samuel Thibault , "open list:X86" , David Gibson , Igor Mitsyanko , Cornelia Huck , "open list:S390" , Thomas Huth , Michael Walle , "open list:sPAPR" , Bastian Koppelmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- backends/rng-egd.c | 4 ++-- chardev/char-mux.c | 2 +- gdbstub.c | 2 +- hw/arm/pxa2xx.c | 2 +- hw/arm/strongarm.c | 2 +- hw/char/bcm2835_aux.c | 2 +- hw/char/cadence_uart.c | 4 ++-- hw/char/cmsdk-apb-uart.c | 2 +- hw/char/digic-uart.c | 2 +- hw/char/escc.c | 6 +++--- hw/char/etraxfs_ser.c | 2 +- hw/char/exynos4210_uart.c | 2 +- hw/char/grlib_apbuart.c | 2 +- hw/char/imx_serial.c | 2 +- hw/char/ipoctal232.c | 4 ++-- hw/char/lm32_juart.c | 2 +- hw/char/lm32_uart.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/milkymist-uart.c | 2 +- hw/char/parallel.c | 2 +- hw/char/pl011.c | 4 ++-- hw/char/sclpconsole-lm.c | 2 +- hw/char/sclpconsole.c | 4 ++-- hw/char/serial.c | 4 ++-- hw/char/sh_serial.c | 4 ++-- hw/char/spapr_vty.c | 2 +- hw/char/stm32f2xx_usart.c | 2 +- hw/char/terminal3270.c | 2 +- hw/char/virtio-console.c | 2 +- hw/char/xen_console.c | 2 +- hw/char/xilinx_uartlite.c | 2 +- hw/ipmi/ipmi_bmc_extern.c | 2 +- hw/misc/ivshmem.c | 2 +- hw/riscv/riscv_htif.c | 2 +- hw/riscv/sifive_uart.c | 2 +- hw/usb/ccid-card-passthru.c | 2 +- hw/usb/dev-serial.c | 2 +- hw/usb/redirect.c | 2 +- include/qemu/main-loop.h | 2 +- monitor.c | 2 +- net/colo-compare.c | 2 +- net/filter-mirror.c | 2 +- net/slirp.c | 2 +- qtest.c | 2 +- target/xtensa/xtensa-semi.c | 2 +- 45 files changed, 54 insertions(+), 54 deletions(-) diff --git a/backends/rng-egd.c b/backends/rng-egd.c index b51c01f664..4a9a92a8e7 100644 --- a/backends/rng-egd.c +++ b/backends/rng-egd.c @@ -48,11 +48,11 @@ static void rng_egd_request_entropy(RngBackend *b, RngRequest *req) } } -static int rng_egd_chr_can_read(void *opaque) +static size_t rng_egd_chr_can_read(void *opaque) { RngEgd *s = RNG_EGD(opaque); RngRequest *req; - int size = 0; + size_t size = 0; QSIMPLEQ_FOREACH(req, &s->parent.requests, next) { size += req->size - req->offset; diff --git a/chardev/char-mux.c b/chardev/char-mux.c index d8d6eaa646..98db12cf77 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -192,7 +192,7 @@ static void mux_chr_accept_input(Chardev *chr) } } -static int mux_chr_can_read(void *opaque) +static size_t mux_chr_can_read(void *opaque) { MuxChardev *d = MUX_CHARDEV(opaque); int m = d->focus; diff --git a/gdbstub.c b/gdbstub.c index a2fc3682ce..86d1fa62f8 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1916,7 +1916,7 @@ void gdbserver_fork(CPUState *cpu) cpu_watchpoint_remove_all(cpu, BP_GDB); } #else -static int gdb_chr_can_receive(void *opaque) +static size_t gdb_chr_can_receive(void *opaque) { /* We can handle an arbitrarily large amount of data. Pick the maximum packet size, which is as good as anything. */ diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index 75b6aa2772..a72d9bd4fe 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -1923,7 +1923,7 @@ static const MemoryRegionOps pxa2xx_fir_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static int pxa2xx_fir_is_empty(void *opaque) +static size_t pxa2xx_fir_is_empty(void *opaque) { PXA2xxFIrState *s = (PXA2xxFIrState *) opaque; return (s->rx_len < 64); diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 40db4e5e0a..6fdd4da3d0 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -1058,7 +1058,7 @@ static void strongarm_uart_rx_push(StrongARMUARTState *s, uint16_t c) s->rx_fifo[(s->rx_start + 11) % 12] |= RX_FIFO_ROR; } -static int strongarm_uart_can_receive(void *opaque) +static size_t strongarm_uart_can_receive(void *opaque) { StrongARMUARTState *s = opaque; diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c index cb26df40f8..5dd1b652c0 100644 --- a/hw/char/bcm2835_aux.c +++ b/hw/char/bcm2835_aux.c @@ -211,7 +211,7 @@ static void bcm2835_aux_write(void *opaque, hwaddr offset, uint64_t value, bcm2835_aux_update(s); } -static int bcm2835_aux_can_receive(void *opaque) +static size_t bcm2835_aux_can_receive(void *opaque) { BCM2835AuxState *s = opaque; diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index eb5cc974a1..5835362038 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -216,10 +216,10 @@ static void uart_parameters_setup(CadenceUARTState *s) qemu_chr_fe_ioctl(&s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp); } -static int uart_can_receive(void *opaque) +static size_t uart_can_receive(void *opaque) { CadenceUARTState *s = opaque; - int ret = MAX(CADENCE_UART_RX_FIFO_SIZE, CADENCE_UART_TX_FIFO_SIZE); + size_t ret = MAX(CADENCE_UART_RX_FIFO_SIZE, CADENCE_UART_TX_FIFO_SIZE); uint32_t ch_mode = s->r[R_MR] & UART_MR_CHMODE; if (ch_mode == NORMAL_MODE || ch_mode == ECHO_MODE) { diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c index 774986d88d..c1437674a5 100644 --- a/hw/char/cmsdk-apb-uart.c +++ b/hw/char/cmsdk-apb-uart.c @@ -108,7 +108,7 @@ static void cmsdk_apb_uart_update(CMSDKAPBUART *s) qemu_set_irq(s->uartint, !!(s->intstatus)); } -static int uart_can_receive(void *opaque) +static size_t uart_can_receive(void *opaque) { CMSDKAPBUART *s = CMSDK_APB_UART(opaque); diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c index 0f41a23b54..f805ee5766 100644 --- a/hw/char/digic-uart.c +++ b/hw/char/digic-uart.c @@ -112,7 +112,7 @@ static const MemoryRegionOps uart_mmio_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static int uart_can_rx(void *opaque) +static size_t uart_can_rx(void *opaque) { DigicUartState *s = opaque; diff --git a/hw/char/escc.c b/hw/char/escc.c index e655b86273..decc35b990 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -166,7 +166,7 @@ #define R_EXTINT 15 static void handle_kbd_command(ESCCChannelState *s, int val); -static int serial_can_receive(void *opaque); +static size_t serial_can_receive(void *opaque); static void serial_receive_byte(ESCCChannelState *s, int ch); static void clear_queue(void *opaque) @@ -573,10 +573,10 @@ static const MemoryRegionOps escc_mem_ops = { }, }; -static int serial_can_receive(void *opaque) +static size_t serial_can_receive(void *opaque) { ESCCChannelState *s = opaque; - int ret; + size_t ret; if (((s->wregs[W_RXCTRL] & RXCTRL_RXEN) == 0) // Rx not enabled || ((s->rregs[R_STATUS] & STATUS_RXAV) == STATUS_RXAV)) diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c index 79cd8d2dc1..970f6a6e90 100644 --- a/hw/char/etraxfs_ser.c +++ b/hw/char/etraxfs_ser.c @@ -187,7 +187,7 @@ static void serial_receive(void *opaque, const uint8_t *buf, size_t size) ser_update_irq(s); } -static int serial_can_receive(void *opaque) +static size_t serial_can_receive(void *opaque) { ETRAXSerial *s = opaque; diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index 5fdf5b1f37..b93edec08a 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -487,7 +487,7 @@ static const MemoryRegionOps exynos4210_uart_ops = { }, }; -static int exynos4210_uart_can_receive(void *opaque) +static size_t exynos4210_uart_can_receive(void *opaque) { Exynos4210UartState *s = (Exynos4210UartState *)opaque; diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index d370609a52..7b57dce7fb 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -130,7 +130,7 @@ static void uart_add_to_fifo(UART *uart, uart->len += length; } -static int grlib_apbuart_can_receive(void *opaque) +static size_t grlib_apbuart_can_receive(void *opaque) { UART *uart = opaque; diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index b9fdfaeb38..abbe68571d 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -293,7 +293,7 @@ static void imx_serial_write(void *opaque, hwaddr offset, } } -static int imx_can_receive(void *opaque) +static size_t imx_can_receive(void *opaque) { IMXSerialState *s = (IMXSerialState *)opaque; return !(s->usr1 & USR1_RRDY); diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 08e3f9e45f..be21303dcd 100644 --- a/hw/char/ipoctal232.c +++ b/hw/char/ipoctal232.c @@ -461,10 +461,10 @@ static void mem_write8(IPackDevice *ip, uint32_t addr, uint8_t val) } } -static int hostdev_can_receive(void *opaque) +static size_t hostdev_can_receive(void *opaque) { SCC2698Channel *ch = opaque; - int available_bytes = RX_FIFO_SIZE - ch->rx_pending; + size_t available_bytes = RX_FIFO_SIZE - ch->rx_pending; return ch->rx_enabled ? available_bytes : 0; } diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c index ecb61ee086..51e598c570 100644 --- a/hw/char/lm32_juart.c +++ b/hw/char/lm32_juart.c @@ -95,7 +95,7 @@ static void juart_rx(void *opaque, const uint8_t *buf, size_t size) s->jrx = *buf | JRX_FULL; } -static int juart_can_rx(void *opaque) +static size_t juart_can_rx(void *opaque) { LM32JuartState *s = opaque; diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c index ee0bf8e117..2593434f8f 100644 --- a/hw/char/lm32_uart.c +++ b/hw/char/lm32_uart.c @@ -225,7 +225,7 @@ static void uart_rx(void *opaque, const uint8_t *buf, size_t size) uart_update_irq(s); } -static int uart_can_rx(void *opaque) +static size_t uart_can_rx(void *opaque) { LM32UartState *s = opaque; diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index e126860b46..cd9c499a51 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -267,7 +267,7 @@ static void mcf_uart_event(void *opaque, int event) } } -static int mcf_uart_can_receive(void *opaque) +static size_t mcf_uart_can_receive(void *opaque) { mcf_uart_state *s = (mcf_uart_state *)opaque; diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index a10c0957ff..0efcd829ce 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -170,7 +170,7 @@ static void uart_rx(void *opaque, const uint8_t *buf, size_t size) uart_update_irq(s); } -static int uart_can_rx(void *opaque) +static size_t uart_can_rx(void *opaque) { MilkymistUartState *s = opaque; diff --git a/hw/char/parallel.c b/hw/char/parallel.c index a80da47ecf..fe0e5c8756 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -513,7 +513,7 @@ static const VMStateDescription vmstate_parallel_isa = { } }; -static int parallel_can_receive(void *opaque) +static size_t parallel_can_receive(void *opaque) { return 1; } diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 37973c32ce..10195679b4 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -224,10 +224,10 @@ static void pl011_write(void *opaque, hwaddr offset, } } -static int pl011_can_receive(void *opaque) +static size_t pl011_can_receive(void *opaque) { PL011State *s = (PL011State *)opaque; - int r; + size_t r; if (s->lcr & 0x10) { r = s->read_count < 16; diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c index a04a2a9d80..ad5f791227 100644 --- a/hw/char/sclpconsole-lm.c +++ b/hw/char/sclpconsole-lm.c @@ -61,7 +61,7 @@ typedef struct SCLPConsoleLM { * truncated to the guest in case it doesn't fit into the SCCB. */ -static int chr_can_read(void *opaque) +static size_t chr_can_read(void *opaque) { SCLPConsoleLM *scon = opaque; diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index 62395c19f4..5ec1c4b607 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -47,10 +47,10 @@ typedef struct SCLPConsole { /* character layer call-back functions */ /* Return number of bytes that fit into iov buffer */ -static int chr_can_read(void *opaque) +static size_t chr_can_read(void *opaque) { SCLPConsole *scon = opaque; - int avail = SIZE_BUFFER_VT220 - scon->iov_data_len; + size_t avail = SIZE_BUFFER_VT220 - scon->iov_data_len; if (avail == 0) { scon->notify = true; diff --git a/hw/char/serial.c b/hw/char/serial.c index 69baed105b..f83bb8ee4e 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -561,7 +561,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr addr, unsigned size) return ret; } -static int serial_can_receive(SerialState *s) +static size_t serial_can_receive(SerialState *s) { if(s->fcr & UART_FCR_FE) { if (s->recv_fifo.num < UART_FIFO_LENGTH) { @@ -600,7 +600,7 @@ static void fifo_timeout_int (void *opaque) { } } -static int serial_can_receive1(void *opaque) +static size_t serial_can_receive1(void *opaque) { SerialState *s = opaque; return serial_can_receive(s); diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index 04fdcee328..f5402d3b5c 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -300,7 +300,7 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs, return ret; } -static int sh_serial_can_receive(sh_serial_state *s) +static size_t sh_serial_can_receive(sh_serial_state *s) { return s->scr & (1 << 4); } @@ -311,7 +311,7 @@ static void sh_serial_receive_break(sh_serial_state *s) s->sr |= (1 << 4); } -static int sh_serial_can_receive1(void *opaque) +static size_t sh_serial_can_receive1(void *opaque) { sh_serial_state *s = opaque; return sh_serial_can_receive(s); diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index 42b4b61cce..0ac9dc8448 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -21,7 +21,7 @@ typedef struct VIOsPAPRVTYDevice { #define VIO_SPAPR_VTY_DEVICE(obj) \ OBJECT_CHECK(VIOsPAPRVTYDevice, (obj), TYPE_VIO_SPAPR_VTY_DEVICE) -static int vty_can_receive(void *opaque) +static size_t vty_can_receive(void *opaque) { VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(opaque); diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c index 78bf142678..63256da77b 100644 --- a/hw/char/stm32f2xx_usart.c +++ b/hw/char/stm32f2xx_usart.c @@ -38,7 +38,7 @@ #define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) -static int stm32f2xx_usart_can_receive(void *opaque) +static size_t stm32f2xx_usart_can_receive(void *opaque) { STM32F2XXUsartState *s = opaque; diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index 076516991e..a9db0a3401 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -38,7 +38,7 @@ typedef struct Terminal3270 { #define TERMINAL_3270(obj) \ OBJECT_CHECK(Terminal3270, (obj), TYPE_TERMINAL_3270) -static int terminal_can_read(void *opaque) +static size_t terminal_can_read(void *opaque) { Terminal3270 *t = opaque; diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index e3d368b976..b942159d82 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -126,7 +126,7 @@ static void guest_writable(VirtIOSerialPort *port) } /* Readiness of the guest to accept data on a port */ -static int chr_can_read(void *opaque) +static size_t chr_can_read(void *opaque) { VirtConsole *vcon = opaque; diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index ca90c5c17e..0a1cbaeafa 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -116,7 +116,7 @@ static int ring_free_bytes(struct XenConsole *con) return (sizeof(intf->in) - space); } -static int xencons_can_receive(void *opaque) +static size_t xencons_can_receive(void *opaque) { struct XenConsole *con = opaque; return ring_free_bytes(con); diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index b1abf8b604..2473cb0ad7 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -195,7 +195,7 @@ static void uart_rx(void *opaque, const uint8_t *buf, size_t size) uart_update_irq(s); } -static int uart_can_rx(void *opaque) +static size_t uart_can_rx(void *opaque) { XilinxUARTLite *s = opaque; diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index c52f80f771..7107d2fe9f 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -307,7 +307,7 @@ static void handle_msg(IPMIBmcExtern *ibe) k->handle_rsp(ibe->parent.intf, ibe->inbuf[0], ibe->inbuf + 1, ibe->inpos - 1); } -static int can_receive(void *opaque) +static size_t can_receive(void *opaque) { return 1; } diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index f506479845..01b331aaab 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -620,7 +620,7 @@ static void process_msg(IVShmemState *s, int64_t msg, int fd, Error **errp) } } -static int ivshmem_can_receive(void *opaque) +static size_t ivshmem_can_receive(void *opaque) { IVShmemState *s = opaque; diff --git a/hw/riscv/riscv_htif.c b/hw/riscv/riscv_htif.c index 2625f5e9e8..565120df7d 100644 --- a/hw/riscv/riscv_htif.c +++ b/hw/riscv/riscv_htif.c @@ -65,7 +65,7 @@ void htif_symbol_callback(const char *st_name, int st_info, uint64_t st_value, /* * Called by the char dev to see if HTIF is ready to accept input. */ -static int htif_can_recv(void *opaque) +static size_t htif_can_recv(void *opaque) { return 1; } diff --git a/hw/riscv/sifive_uart.c b/hw/riscv/sifive_uart.c index d4cbf91b9f..c6a8f5fbc4 100644 --- a/hw/riscv/sifive_uart.c +++ b/hw/riscv/sifive_uart.c @@ -137,7 +137,7 @@ static void uart_rx(void *opaque, const uint8_t *buf, size_t size) update_irq(s); } -static int uart_can_rx(void *opaque) +static size_t uart_can_rx(void *opaque) { SiFiveUARTState *s = opaque; diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index b6fa35a4b4..5dc10ef850 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -112,7 +112,7 @@ static void ccid_card_vscard_send_init(PassthruState *s) (uint8_t *)&msg, sizeof(msg)); } -static int ccid_card_vscard_can_read(void *opaque) +static size_t ccid_card_vscard_can_read(void *opaque) { PassthruState *card = opaque; diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index efaeab484d..e9735d4b5d 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -421,7 +421,7 @@ static void usb_serial_handle_data(USBDevice *dev, USBPacket *p) } } -static int usb_serial_can_read(void *opaque) +static size_t usb_serial_can_read(void *opaque) { USBSerialState *s = opaque; diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index a73076ba78..f025c91d28 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1284,7 +1284,7 @@ static void usbredir_do_attach(void *opaque) * chardev callbacks */ -static int usbredir_chardev_can_read(void *opaque) +static size_t usbredir_chardev_can_read(void *opaque) { USBRedirDevice *dev = opaque; diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index c5a7299266..b51f9a5267 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -182,7 +182,7 @@ typedef void IOReadHandler(void *opaque, const uint8_t *buf, size_t size); * is called again. aio_notify() or qemu_notify_event() can be used to kick * the event loop. */ -typedef int IOCanReadHandler(void *opaque); +typedef size_t IOCanReadHandler(void *opaque); /** * qemu_set_fd_handler: Register a file descriptor with the main loop diff --git a/monitor.c b/monitor.c index 12401ec60b..3417c5f044 100644 --- a/monitor.c +++ b/monitor.c @@ -4038,7 +4038,7 @@ cleanup: free_cmdline_args(args, nb_args); } -static int monitor_can_read(void *opaque) +static size_t monitor_can_read(void *opaque) { Monitor *mon = opaque; diff --git a/net/colo-compare.c b/net/colo-compare.c index 433e9ba287..9321d81a98 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -683,7 +683,7 @@ err: return ret < 0 ? ret : -EIO; } -static int compare_chr_can_read(void *opaque) +static size_t compare_chr_can_read(void *opaque) { return COMPARE_READ_LEN_MAX; } diff --git a/net/filter-mirror.c b/net/filter-mirror.c index 27b6e52a1d..8e16535fad 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -114,7 +114,7 @@ static void redirector_to_filter(NetFilterState *nf, } } -static int redirector_chr_can_read(void *opaque) +static size_t redirector_chr_can_read(void *opaque) { return REDIRECTOR_MAX_LEN; } diff --git a/net/slirp.c b/net/slirp.c index 5e864f4a4f..9dbcaffb07 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -712,7 +712,7 @@ struct GuestFwd { Slirp *slirp; }; -static int guestfwd_can_read(void *opaque) +static size_t guestfwd_can_read(void *opaque) { struct GuestFwd *fwd = opaque; return slirp_socket_can_recv(fwd->slirp, fwd->server, fwd->port); diff --git a/qtest.c b/qtest.c index 0494afdfb3..bc685700cd 100644 --- a/qtest.c +++ b/qtest.c @@ -665,7 +665,7 @@ static void qtest_read(void *opaque, const uint8_t *buf, size_t size) qtest_process_inbuf(chr, inbuf); } -static int qtest_can_read(void *opaque) +static size_t qtest_can_read(void *opaque) { return 1024; } diff --git a/target/xtensa/xtensa-semi.c b/target/xtensa/xtensa-semi.c index 241874ea4e..a57e61ef4a 100644 --- a/target/xtensa/xtensa-semi.c +++ b/target/xtensa/xtensa-semi.c @@ -161,7 +161,7 @@ typedef struct XtensaSimConsole { static XtensaSimConsole *sim_console; -static int sim_console_can_read(void *opaque) +static size_t sim_console_can_read(void *opaque) { XtensaSimConsole *p = opaque;