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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E14FC433F5 for ; Mon, 1 Nov 2021 15:56:08 +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 83FC260ED5 for ; Mon, 1 Nov 2021 15:56:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 83FC260ED5 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]:50148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhZfK-0003Iz-A0 for qemu-devel@archiver.kernel.org; Mon, 01 Nov 2021 11:56:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhZeh-0002Vo-CZ for qemu-devel@nongnu.org; Mon, 01 Nov 2021 11:55:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhZed-0008Rl-N0 for qemu-devel@nongnu.org; Mon, 01 Nov 2021 11:55:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635782122; 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=HGcDI5OMeQs/EyJWqbmnu4FgqJPb/UKulo4ju38nZk4=; b=FMBaA+YBySpvW+UfKQPpz161BNUxWnnSrrO2wibMf2UB6lXqvKuI5rVIEcwJ3rvQ12NAWf E2Ni6yjvEIpKNV7E5YQaZ1EJaByttrARXpQTvambzEKfF1v9LBV6MFVyxVLQ+OM4IVmyhL 8xL9vDYE0jCPYCzjR3WVmwipAedINTc= 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-255-yAaE2Nr-PuSIm_BUxnHh0g-1; Mon, 01 Nov 2021 11:55:09 -0400 X-MC-Unique: yAaE2Nr-PuSIm_BUxnHh0g-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD6ADBD522; Mon, 1 Nov 2021 15:55:07 +0000 (UTC) Received: from redhat.com (unknown [10.39.193.164]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B1AFC19C59; Mon, 1 Nov 2021 15:54:44 +0000 (UTC) Date: Mon, 1 Nov 2021 15:54:42 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: Re: [PATCH v4 02/22] monitor: make hmp_handle_error return a boolean Message-ID: References: <20211028155457.967291-1-berrange@redhat.com> <20211028155457.967291-3-berrange@redhat.com> <1d7c3797-59cb-0021-8266-30dc7c2c907c@redhat.com> MIME-Version: 1.0 In-Reply-To: <1d7c3797-59cb-0021-8266-30dc7c2c907c@redhat.com> User-Agent: Mutt/2.0.7 (2021-05-04) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.734, 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Laurent Vivier , Thomas Huth , Eduardo Habkost , David Hildenbrand , Michael Roth , Cornelia Huck , Yuval Shaia , qemu-devel@nongnu.org, Peter Xu , "Dr. David Alan Gilbert" , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Gerd Hoffmann , Paolo Bonzini , Richard Henderson , Eric Blake , Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Oct 28, 2021 at 06:47:38PM +0200, Philippe Mathieu-Daudé wrote: > On 10/28/21 17:54, Daniel P. Berrangé wrote: > > This turns the pattern > > > > if (err) { > > hmp_handle_error(mon, err); > > return; > > } > > > > into > > > > if (hmp_handle_error(mon, err); > > return; > > } > > > > Signed-off-by: Daniel P. Berrangé > > --- > > hw/core/machine-hmp-cmds.c | 3 +-- > > include/monitor/hmp.h | 2 +- > > monitor/hmp-cmds.c | 28 +++++++++++----------------- > > 3 files changed, 13 insertions(+), 20 deletions(-) > > > > diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c > > index 76b22b00d6..c356783ab9 100644 > > --- a/hw/core/machine-hmp-cmds.c > > +++ b/hw/core/machine-hmp-cmds.c > > @@ -53,8 +53,7 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) > > HotpluggableCPUList *saved = l; > > CpuInstanceProperties *c; > > > > - if (err != NULL) { > > - hmp_handle_error(mon, err); > > + if (hmp_handle_error(mon, err)) { > > return; > > } > > > > diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h > > index 6bc27639e0..a2cb002a3a 100644 > > --- a/include/monitor/hmp.h > > +++ b/include/monitor/hmp.h > > @@ -16,7 +16,7 @@ > > > > #include "qemu/readline.h" > > > > -void hmp_handle_error(Monitor *mon, Error *err); > > +bool hmp_handle_error(Monitor *mon, Error *err); > > > > void hmp_info_name(Monitor *mon, const QDict *qdict); > > void hmp_info_version(Monitor *mon, const QDict *qdict); > > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c > > index bcaa41350e..9031cea881 100644 > > --- a/monitor/hmp-cmds.c > > +++ b/monitor/hmp-cmds.c > > @@ -62,11 +62,13 @@ > > #include > > #endif > > > > -void hmp_handle_error(Monitor *mon, Error *err) > > +bool hmp_handle_error(Monitor *mon, Error *err) > > { > > if (err) { > > error_reportf_err(err, "Error: "); > > + return true; > > } > > + return false; > > } > > The usual pattern is to return false on error. Anyhow, NB That pattern is for functions which are setting errors via an Error **errp output parameter. This function is for checking whether an error is set and reporting message to console, via an Error *err input parameter. > Reviewed-by: Philippe Mathieu-Daudé > 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 :|