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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 63632D29FEF for ; Wed, 14 Jan 2026 12:02:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfzaD-0000Vi-5v; Wed, 14 Jan 2026 07:02:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfzZb-0000Ij-OF for qemu-rust@nongnu.org; Wed, 14 Jan 2026 07:02:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfzZV-0006W7-Tc for qemu-rust@nongnu.org; Wed, 14 Jan 2026 07:02:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768392113; 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=pZEiG1FIhHpDloP1V3wMTDX0uQU82tzQRYJYkpsV/4Q=; b=ffjgz/ane7NFJdksrgH6x+Ricf/4ubM5jwl7syHs9jtQ+xwJKF9rLZwag/f45nscIY1CR9 z7yTnVmQPpzk78Rz/1L+P7e96tSBVsj109ERBu1kxTh8dYwDqRAlGInJMPSi+qU5R/qhtV AG9rb0hL3H2PTMFUOIS1UKXOMmcFKYI= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-418-x4c5nmmMNWOnjnupaLY3tg-1; Wed, 14 Jan 2026 07:01:50 -0500 X-MC-Unique: x4c5nmmMNWOnjnupaLY3tg-1 X-Mimecast-MFC-AGG-ID: x4c5nmmMNWOnjnupaLY3tg_1768392108 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 02C1C1954B0C; Wed, 14 Jan 2026 12:01:48 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.41]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8C6FA30002DA; Wed, 14 Jan 2026 12:01:43 +0000 (UTC) Date: Wed, 14 Jan 2026 12:01:40 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Markus Armbruster Cc: qemu-devel@nongnu.org, Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Manos Pitsidianakis , Hanna Reitz , Gerd Hoffmann , Paolo Bonzini , Christian Schoenebeck , "Dr. David Alan Gilbert" , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , devel@lists.libvirt.org, qemu-block@nongnu.org, qemu-rust@nongnu.org, Stefan Weil , Kevin Wolf , Richard Henderson Subject: Re: [PATCH v5 13/24] monitor: refactor error_vprintf() Message-ID: References: <20260108170338.2693853-1-berrange@redhat.com> <20260108170338.2693853-14-berrange@redhat.com> <87sec82zt5.fsf@pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87sec82zt5.fsf@pond.sub.org> User-Agent: Mutt/2.2.14 (2025-02-20) X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-rust@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: QEMU Rust-related patches and discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-rust-bounces+qemu-rust=archiver.kernel.org@nongnu.org Sender: qemu-rust-bounces+qemu-rust=archiver.kernel.org@nongnu.org On Wed, Jan 14, 2026 at 12:34:14PM +0100, Markus Armbruster wrote: > Daniel P. Berrangé writes: > > > The monitor_vprintf() code will return -1 if either the monitor > > is NULL, or the monitor is QMP. The error_vprintf() code can > > take advantage of this to avoid having to duplicate the same > > checks, and instead simply look at the return value. > > > > Reviewed-by: Richard Henderson > > Signed-off-by: Daniel P. Berrangé > > --- > > monitor/monitor.c | 16 +++++++++------- > > 1 file changed, 9 insertions(+), 7 deletions(-) > > > > diff --git a/monitor/monitor.c b/monitor/monitor.c > > index 4d26cd9496..627a59b23e 100644 > > --- a/monitor/monitor.c > > +++ b/monitor/monitor.c > > @@ -268,17 +268,19 @@ void monitor_printc(Monitor *mon, int c) > > monitor_printf(mon, "'"); > > } > > > > -/* > > - * Print to current monitor if we have one, else to stderr. > > - */ > > Keep the comment, please. I'll change it to say "...to the current human monitor..." > > > int error_vprintf(const char *fmt, va_list ap) > > { > > Monitor *cur_mon = monitor_cur(); > > - > > - if (cur_mon && !monitor_cur_is_qmp()) { > > - return monitor_vprintf(cur_mon, fmt, ap); > > + /* > > + * This will return -1 if 'cur_mon' is NULL, or is QMP. > > + * IOW this will only print if in HMP, otherwise we > > + * fallback to stderr for QMP / no-monitor scenarios. > > + */ > > + int ret = monitor_vprintf(cur_mon, fmt, ap); > > + if (ret == -1) { > > + ret = vfprintf(stderr, fmt, ap); > > } > > - return vfprintf(stderr, fmt, ap); > > + return ret; > > } > > > > static MonitorQAPIEventConf monitor_qapi_event_conf[QAPI_EVENT__MAX] = { > With 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 :|