From nobody Mon Nov 17 09:53:04 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1603716209; cv=none; d=zohomail.com; s=zohoarc; b=HjgomvFgZk9nNWruquGcxFTiIcwIUY2Yms4joRXC+N+wv+CAqWtl5UuUF1jo52VaYVf4GSb8nnIGQTltVDlKP8s6p22+vCbXntDqpwtLOIJfWPaMkgE9ntGVl9UHyjkC0Y6rISUj+MGBeg4IULw8fZJbJb/lGNryUxonE+BznNg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603716209; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u9ZGRpDcwXHjFK650WORGuFWXhdNir50IFKQr1TQiyE=; b=gxxOMMILQwy0xJEAkg5MX1WsGf1mQXz99nMMxJCU6HnO2SDYZziXsWA1+8lkQwzxBTx40DqmYL4RL+MFfVE25Q+2w5CfbqnUMJ5+SijE367EiZfBJjgDXDS5dttV9zcJGqoTjkyraTgam9eW7MqkszF9HwrxozXpSH7O1K5cENQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603716209433689.0403510387715; Mon, 26 Oct 2020 05:43:29 -0700 (PDT) Received: from localhost ([::1]:39462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX1qS-00010H-9e for importer@patchew.org; Mon, 26 Oct 2020 08:43:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX1nt-0007Rv-Ae for qemu-devel@nongnu.org; Mon, 26 Oct 2020 08:40:49 -0400 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:46893) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kX1nr-0007O5-QZ for qemu-devel@nongnu.org; Mon, 26 Oct 2020 08:40:48 -0400 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-386-qjS5u66jOH6oKD70H9xtFw-1; Mon, 26 Oct 2020 08:40:43 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDD2810E2186; Mon, 26 Oct 2020 12:40:41 +0000 (UTC) Received: from bahia.lan (ovpn-112-70.ams2.redhat.com [10.36.112.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 368C710013D9; Mon, 26 Oct 2020 12:40:41 +0000 (UTC) X-MC-Unique: qjS5u66jOH6oKD70H9xtFw-1 Subject: [PATCH 2/4] spapr: Use error_append_hint() in spapr_reallocate_hpt() From: Greg Kurz To: David Gibson Date: Mon, 26 Oct 2020 13:40:40 +0100 Message-ID: <160371604030.305923.17464161378167312662.stgit@bahia.lan> In-Reply-To: <160371602625.305923.7832478283946753271.stgit@bahia.lan> References: <160371602625.305923.7832478283946753271.stgit@bahia.lan> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/26 08:40:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no 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: , Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Hints should be added with the dedicated error_append_hint() API because we don't want to print them when using QMP. This requires to insert ERRP_GUARD as explained in "qapi/error.h". Signed-off-by: Greg Kurz --- hw/ppc/spapr.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f098d0ee6d98..f51b663f7dcb 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1486,6 +1486,7 @@ void spapr_free_hpt(SpaprMachineState *spapr) void spapr_reallocate_hpt(SpaprMachineState *spapr, int shift, Error **errp) { + ERRP_GUARD(); long rc; =20 /* Clean up any HPT info from a previous boot */ @@ -1500,17 +1501,18 @@ void spapr_reallocate_hpt(SpaprMachineState *spapr,= int shift, =20 if (rc < 0) { /* kernel-side HPT needed, but couldn't allocate one */ - error_setg_errno(errp, errno, - "Failed to allocate KVM HPT of order %d (try smal= ler maxmem?)", + error_setg_errno(errp, errno, "Failed to allocate KVM HPT of order= %d", shift); + error_append_hint(errp, "Try smaller maxmem?\n"); /* This is almost certainly fatal, but if the caller really * wants to carry on with shift =3D=3D 0, it's welcome to try */ } else if (rc > 0) { /* kernel-side HPT allocated */ if (rc !=3D shift) { error_setg(errp, - "Requested order %d HPT, but kernel allocated order= %ld (try smaller maxmem?)", + "Requested order %d HPT, but kernel allocated order= %ld", shift, rc); + error_append_hint(errp, "Try smaller maxmem?\n"); } =20 spapr->htab_shift =3D shift;