From nobody Tue Feb 10 03:44:39 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612275546; cv=none; d=zohomail.com; s=zohoarc; b=icSMuHB91pKxTrVuD5yizAIJil/sTG5RxC1BTzHQX5mAP2S/fS4/7k1u7daFDgSPczwRj69rAmXraFknhJfYYz9A4BVv7/FkkwFeI1lAC4x8OZMVJoXfZa1fCF10g8QkUz6MpqZeWuC06sYm5u1qk4WtWYxtOWD7TNh9gs98nHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612275546; 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=BIdyn9yx+1z/a/3059Ovl9kwho4b9sEXJ078QUJyfbE=; b=PlGTBVc2HaliJNa6YDW9dpI5AKywkVsgw7Yf2PJTtVKNml2gd9RLtDt5sMH1QxYaGH0NT8f/RuXJg9s0BLX99SsKA4wvBwaBOoNTarnBy0vv1WoKh9WYkRYgA376ErAq9ElqJKRm1IqaCkavvoOFlAmmrUSCr4SntxwryeZYpyk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1612275546209230.0981081846279; Tue, 2 Feb 2021 06:19:06 -0800 (PST) Received: from localhost ([::1]:58996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6wWG-0005PY-L0 for importer@patchew.org; Tue, 02 Feb 2021 09:19:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6wUy-00046p-82 for qemu-devel@nongnu.org; Tue, 02 Feb 2021 09:17:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45455) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6wUw-0006mz-38 for qemu-devel@nongnu.org; Tue, 02 Feb 2021 09:17:43 -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-361-vIrCsEfLMKuyap3ug6MSjg-1; Tue, 02 Feb 2021 09:17:36 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 036A71800D50 for ; Tue, 2 Feb 2021 14:17:36 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-115-51.ams2.redhat.com [10.36.115.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C808A5D9C6; Tue, 2 Feb 2021 14:17:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 46DCC1138468; Tue, 2 Feb 2021 15:17:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612275461; h=from:from: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=BIdyn9yx+1z/a/3059Ovl9kwho4b9sEXJ078QUJyfbE=; b=GJThuruboNzpwN4LuRvRb22XBUihtZ8vbmN+2A0J5YbEZujLUo1DkAeaqtpaYSyCke7SQJ 6JHAVWqhe5NGmmzqHJ7T5wP8zv8lOnwDHX1A9stfSpEBKo/qYNbL/PPqEadEcOx4sLaQpP eqU9UovE4FzurPspPBBsO98irVlXGRo= X-MC-Unique: vIrCsEfLMKuyap3ug6MSjg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 3/4] migration: Fix cache_init()'s "Failed to allocate" error messages Date: Tue, 2 Feb 2021 15:17:33 +0100 Message-Id: <20210202141734.2488076-4-armbru@redhat.com> In-Reply-To: <20210202141734.2488076-1-armbru@redhat.com> References: <20210202141734.2488076-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.386, 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: , Cc: berrange@redhat.com, dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 --- 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.26.2