From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4A8AC4338F for ; Thu, 5 Aug 2021 10:38:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 35B9660F02 for ; Thu, 5 Aug 2021 10:38:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 35B9660F02 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:44280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mBalJ-0005HD-IK for qemu-devel@archiver.kernel.org; Thu, 05 Aug 2021 06:38:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBakE-00041e-UQ for qemu-devel@nongnu.org; Thu, 05 Aug 2021 06:36:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37982) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBakC-0004dv-F3 for qemu-devel@nongnu.org; Thu, 05 Aug 2021 06:36:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628159815; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L591EBIk/lSkEsRpJrj3swZ7gCJr/ZTUzcl/z8TqGjk=; b=IALVxP9QQ4XMu7gtLI/AzSAMTu0EeuGcwBq47g8cFvgdrO9QGoSi8LcPJvzfQQpvQpKy/l U58an5AzoUuVDFcYfvCsOnZOmEAV3QrlMaeve2VWytSLvML3ldLaZNGsd4v2EWjWoWLKHg F0JYUos+8Gj6qORttPVaqr3uDBycbFU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-337-IDGv0BYkOkiv3ZX7md3cjg-1; Thu, 05 Aug 2021 06:36:54 -0400 X-MC-Unique: IDGv0BYkOkiv3ZX7md3cjg-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 23AA7801AC0 for ; Thu, 5 Aug 2021 10:36:53 +0000 (UTC) Received: from redhat.com (unknown [10.39.194.147]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 47F4318B42; Thu, 5 Aug 2021 10:36:47 +0000 (UTC) Date: Thu, 5 Aug 2021 11:36:45 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: marcandre.lureau@redhat.com Subject: Re: [PATCH v2 05/11] chardev: mark explicitly first argument as poisoned Message-ID: References: <20210804154848.557328-1-marcandre.lureau@redhat.com> <20210804154848.557328-6-marcandre.lureau@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210804154848.557328-6-marcandre.lureau@redhat.com> User-Agent: Mutt/2.0.7 (2021-05-04) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Paolo Bonzini , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, Aug 04, 2021 at 07:48:42PM +0400, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > Since commit 9894dc0cdcc397ee5b26370bc53da6d360a363c2 "char: convert > from GIOChannel to QIOChannel", the first argument to the watch callback > can actually be a QIOChannel, which is not a GIOChannel (but a QEMU > Object). > > Even though we never used that pointer, change the callback type to warn > the users. Possibly a better fix later, we may want to store the > callback and call it from intermediary functions. > > Signed-off-by: Marc-André Lureau > --- > include/chardev/char-fe.h | 8 +++++++- > chardev/char-fe.c | 2 +- > hw/char/cadence_uart.c | 2 +- > hw/char/cmsdk-apb-uart.c | 2 +- > hw/char/ibex_uart.c | 2 +- > hw/char/nrf51_uart.c | 2 +- > hw/char/serial.c | 2 +- > hw/char/virtio-console.c | 2 +- > hw/usb/redirect.c | 2 +- > hw/virtio/vhost-user.c | 2 +- > monitor/monitor.c | 2 +- > net/vhost-user.c | 4 ++-- > 12 files changed, 19 insertions(+), 13 deletions(-) > > diff --git a/include/chardev/char-fe.h b/include/chardev/char-fe.h > index a553843364..867ef1b3b2 100644 > --- a/include/chardev/char-fe.h > +++ b/include/chardev/char-fe.h > @@ -174,6 +174,9 @@ void qemu_chr_fe_set_open(CharBackend *be, int fe_open); > void qemu_chr_fe_printf(CharBackend *be, const char *fmt, ...) > GCC_FMT_ATTR(2, 3); > > + > +typedef gboolean (*FEWatchFunc)(void *do_not_use, GIOCondition condition, void *data); > + > /** > * qemu_chr_fe_add_watch: > * @cond: the condition to poll for > @@ -188,10 +191,13 @@ void qemu_chr_fe_printf(CharBackend *be, const char *fmt, ...) > * Note that you are responsible to update the front-end sources if > * you are switching the main context with qemu_chr_fe_set_handlers(). > * > + * Warning: DO NOT use the first callback argument (it may be either > + * a GIOChannel or a QIOChannel, depending on the underlying chardev) > + * > * Returns: the source tag > */ > guint qemu_chr_fe_add_watch(CharBackend *be, GIOCondition cond, > - GIOFunc func, void *user_data); > + FEWatchFunc func, void *user_data); > > /** > * qemu_chr_fe_write: > diff --git a/chardev/char-fe.c b/chardev/char-fe.c > index 474715c5a9..7789f7be9c 100644 > --- a/chardev/char-fe.c > +++ b/chardev/char-fe.c > @@ -354,7 +354,7 @@ void qemu_chr_fe_set_open(CharBackend *be, int fe_open) > } > > guint qemu_chr_fe_add_watch(CharBackend *be, GIOCondition cond, > - GIOFunc func, void *user_data) > + FEWatchFunc func, void *user_data) > { > Chardev *s = be->chr; > GSource *src; > diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c > index ceb677bc5a..8ee6f74b8c 100644 > --- a/hw/char/cadence_uart.c > +++ b/hw/char/cadence_uart.c > @@ -288,7 +288,7 @@ static void uart_write_rx_fifo(void *opaque, const uint8_t *buf, int size) > uart_update_status(s); > } > > -static gboolean cadence_uart_xmit(GIOChannel *chan, GIOCondition cond, > +static gboolean cadence_uart_xmit(GIOChannel *do_not_use, GIOCondition cond, > void *opaque) Why is this (and the next 3) left as GIOCondition, when you change others later on to be void ? > { > CadenceUARTState *s = opaque; > diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c > index ba2cbbee3d..b07a9dee4f 100644 > --- a/hw/char/cmsdk-apb-uart.c > +++ b/hw/char/cmsdk-apb-uart.c > @@ -191,7 +191,7 @@ static uint64_t uart_read(void *opaque, hwaddr offset, unsigned size) > /* Try to send tx data, and arrange to be called back later if > * we can't (ie the char backend is busy/blocking). > */ > -static gboolean uart_transmit(GIOChannel *chan, GIOCondition cond, void *opaque) > +static gboolean uart_transmit(GIOChannel *do_not_use, GIOCondition cond, void *opaque) > { > CMSDKAPBUART *s = CMSDK_APB_UART(opaque); > int ret; > diff --git a/hw/char/ibex_uart.c b/hw/char/ibex_uart.c > index 6b0c9330bf..e493ea08c0 100644 > --- a/hw/char/ibex_uart.c > +++ b/hw/char/ibex_uart.c > @@ -135,7 +135,7 @@ static void ibex_uart_receive(void *opaque, const uint8_t *buf, int size) > ibex_uart_update_irqs(s); > } > > -static gboolean ibex_uart_xmit(GIOChannel *chan, GIOCondition cond, > +static gboolean ibex_uart_xmit(GIOChannel *do_not_use, GIOCondition cond, > void *opaque) > { > IbexUartState *s = opaque; > diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c > index 045ca5fa40..0b89b0eae4 100644 > --- a/hw/char/nrf51_uart.c > +++ b/hw/char/nrf51_uart.c > @@ -75,7 +75,7 @@ static uint64_t uart_read(void *opaque, hwaddr addr, unsigned int size) > return r; > } > > -static gboolean uart_transmit(GIOChannel *chan, GIOCondition cond, void *opaque) > +static gboolean uart_transmit(GIOChannel *do_not_use, GIOCondition cond, void *opaque) > { > NRF51UARTState *s = NRF51_UART(opaque); > int r; > diff --git a/hw/char/serial.c b/hw/char/serial.c > index bc2e322970..7061aacbce 100644 > --- a/hw/char/serial.c > +++ b/hw/char/serial.c > @@ -220,7 +220,7 @@ static void serial_update_msl(SerialState *s) > } > } > > -static gboolean serial_watch_cb(GIOChannel *chan, GIOCondition cond, > +static gboolean serial_watch_cb(void *do_not_use, GIOCondition cond, > void *opaque) > { > SerialState *s = opaque; > diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c > index 6b132caa29..dd5a02e339 100644 > --- a/hw/char/virtio-console.c > +++ b/hw/char/virtio-console.c > @@ -38,7 +38,7 @@ struct VirtConsole { > * Callback function that's called from chardevs when backend becomes > * writable. > */ > -static gboolean chr_write_unblocked(GIOChannel *chan, GIOCondition cond, > +static gboolean chr_write_unblocked(void *do_not_use, GIOCondition cond, > void *opaque) > { > VirtConsole *vcon = opaque; > diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c > index 1ec909a63a..5f0ef9cb3b 100644 > --- a/hw/usb/redirect.c > +++ b/hw/usb/redirect.c > @@ -270,7 +270,7 @@ static int usbredir_read(void *priv, uint8_t *data, int count) > return count; > } > > -static gboolean usbredir_write_unblocked(GIOChannel *chan, GIOCondition cond, > +static gboolean usbredir_write_unblocked(void *do_not_use, GIOCondition cond, > void *opaque) > { > USBRedirDevice *dev = opaque; > diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c > index 29ea2b4fce..aec6cc1990 100644 > --- a/hw/virtio/vhost-user.c > +++ b/hw/virtio/vhost-user.c > @@ -303,7 +303,7 @@ struct vhost_user_read_cb_data { > int ret; > }; > > -static gboolean vhost_user_read_cb(GIOChannel *source, GIOCondition condition, > +static gboolean vhost_user_read_cb(void *do_not_use, GIOCondition condition, > gpointer opaque) > { > struct vhost_user_read_cb_data *data = opaque; > diff --git a/monitor/monitor.c b/monitor/monitor.c > index b90c0f4051..46a171bca6 100644 > --- a/monitor/monitor.c > +++ b/monitor/monitor.c > @@ -156,7 +156,7 @@ static inline bool monitor_is_hmp_non_interactive(const Monitor *mon) > > static void monitor_flush_locked(Monitor *mon); > > -static gboolean monitor_unblocked(GIOChannel *chan, GIOCondition cond, > +static gboolean monitor_unblocked(void *do_not_use, GIOCondition cond, > void *opaque) > { > Monitor *mon = opaque; > diff --git a/net/vhost-user.c b/net/vhost-user.c > index ffbd94d944..6adfcd623a 100644 > --- a/net/vhost-user.c > +++ b/net/vhost-user.c > @@ -208,8 +208,8 @@ static NetClientInfo net_vhost_user_info = { > .set_vnet_le = vhost_user_set_vnet_endianness, > }; > > -static gboolean net_vhost_user_watch(GIOChannel *chan, GIOCondition cond, > - void *opaque) > +static gboolean net_vhost_user_watch(void *do_not_use, GIOCondition cond, > + void *opaque) > { > NetVhostUserState *s = opaque; > > -- > 2.32.0.264.g75ae10bc75 > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|