From nobody Tue Nov 18 22:49:00 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612807489; cv=none; d=zohomail.com; s=zohoarc; b=aZMxBe9ZExwvDTVi8TQws2u+ZmTPFIeVVQpi348BRkzPTdYD864jlPiep4Td07g5jlWZaYjAnPU3dU18g/v5dD7H0EvJ9YjVD6KgsdfM1oNuLOdwfiA2dTYAUjBZiODpuPFaEPHDTjTcZtTm55J5yCnSE3WxgRlMRJNeeOEB0go= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612807489; h=Content-Type:Content-Transfer-Encoding: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=HjLOWmZArq6FQ4QbVsGRrFuusXByKswK9vWyVZhQ+2g=; b=ALcsly4OLBqS6xHKJ0CPQQDMuIHGJ1Qof/6gADzbTC2qo8Olf0rMopBDZZF/+gff7deSJcBci7b2Tk+lrp9R7bVG/xsr5MXnwPYR0qtgzm+9hONl5a3RzZPI81BPRfJI9GAeKvpJU9c1xcnsBEunSYIC4Noe5fnBT+5jJq+8+lI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612807489018435.0397225558494; Mon, 8 Feb 2021 10:04:49 -0800 (PST) Received: from localhost ([::1]:49250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Atz-0005kj-U8 for importer@patchew.org; Mon, 08 Feb 2021 13:04:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l94kK-0001nP-Ak for qemu-devel@nongnu.org; Mon, 08 Feb 2021 06:30:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39162) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l94kG-0002O0-G0 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 06:30:24 -0500 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-368-szLyQgACOWSAEO_Ge0GHQA-1; Mon, 08 Feb 2021 06:30:17 -0500 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 9A6CF804036; Mon, 8 Feb 2021 11:30:16 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-115-22.ams2.redhat.com [10.36.115.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 801321002393; Mon, 8 Feb 2021 11:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612783819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HjLOWmZArq6FQ4QbVsGRrFuusXByKswK9vWyVZhQ+2g=; b=RF0RlpRnaX0NxOhuxlWUHdbQKuNG33gbIGTSkFH/9NCaDZgol0DrJkBHBbvtGmDdy8xpZb CE5zQ1ENaBYPiMzKjGDaWU0iiqJNTCrUmCN8Eul2dxO91Epi/EC5gIwlAFa+NzLfx6Cxw0 +wRaBVbRy8pNqT09RVBJkJdCSWHaSYA= X-MC-Unique: szLyQgACOWSAEO_Ge0GHQA-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, andrey.gruzdev@virtuozzo.com, berrange@redhat.com, gaojinhao@huawei.com, armbru@redhat.com, mst@redhat.com, philmd@redhat.com, wainersm@redhat.com, s.reiter@proxmox.com Subject: [PULL 11/27] migration: Fix cache_init()'s "Failed to allocate" error messages Date: Mon, 8 Feb 2021 11:29:02 +0000 Message-Id: <20210208112918.185058-12-dgilbert@redhat.com> In-Reply-To: <20210208112918.185058-1-dgilbert@redhat.com> References: <20210208112918.185058-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: pass client-ip=63.128.21.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.569, 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Markus Armbruster cache_init() attempts to handle allocation failure. The two error messages are garbage, as untested error messages commonly are: Parameter 'cache size' expects Failed to allocate cache Parameter 'cache size' expects Failed to allocate page cache Fix them to just Failed to allocate cache Failed to allocate page cache Signed-off-by: Markus Armbruster Reviewed-by: Dr. David Alan Gilbert Message-Id: <20210202141734.2488076-4-armbru@redhat.com> Signed-off-by: Dr. David Alan Gilbert --- migration/page_cache.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/migration/page_cache.c b/migration/page_cache.c index b384f265fb..6d4f7a9bbc 100644 --- a/migration/page_cache.c +++ b/migration/page_cache.c @@ -60,8 +60,7 @@ PageCache *cache_init(uint64_t new_size, size_t page_size= , Error **errp) /* We prefer not to abort if there is no memory */ cache =3D g_try_malloc(sizeof(*cache)); if (!cache) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", - "Failed to allocate cache"); + error_setg(errp, "Failed to allocate cache"); return NULL; } cache->page_size =3D page_size; @@ -74,8 +73,7 @@ PageCache *cache_init(uint64_t new_size, size_t page_size= , Error **errp) cache->page_cache =3D g_try_malloc((cache->max_num_items) * sizeof(*cache->page_cache)); if (!cache->page_cache) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", - "Failed to allocate page cache"); + error_setg(errp, "Failed to allocate page cache"); g_free(cache); return NULL; } --=20 2.29.2