From nobody Fri Nov 1 04:32:07 2024 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=1685446945; cv=none; d=zohomail.com; s=zohoarc; b=NJS20VOIrf6l/FQsY4QR6LBYtIvDRLIvSZcq1zdriUWLa1PcZKEst/w3JE89G1Kz95apWwM2V2cQMQz7KaOWtlyvsCSEDxDFT3ZSMw8dAW5R4kIGOgHjq+0XKkF6vOwftfU+4DXY9YZE7+jD2rxcvjXUODCx1TyqMAW4ltVonCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685446945; h=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=LO6y5tkfgNged57O731G9ECwYnoNXu48Izp7SYxqk34=; b=gttaV0qAPVc+CK50qnc/LV5LrHr3UAWJoDaNuNPIL94WJqZFuxwxBD9FbQGozDx+snpWWdNsO3QIGqLpaGWFq2qWAlkzrK0YERIp00yTxQ5nxzQgZV9d8SDIAbUsQpCPmGMRNAmpO8yfK8wzzKh9wQCDLbcrSZTBi6/2Sk9InHY= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1685446945010185.20339846537524; Tue, 30 May 2023 04:42:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3xgu-0007t8-9X; Tue, 30 May 2023 07:39:04 -0400 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 1q3xgo-0007rc-5j for qemu-devel@nongnu.org; Tue, 30 May 2023 07:38:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3xgk-0003zH-Qp for qemu-devel@nongnu.org; Tue, 30 May 2023 07:38:57 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-103-rjPf2xe3Oo6cI8Z-FOWwzA-1; Tue, 30 May 2023 07:38:49 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 496ED1C03DA3; Tue, 30 May 2023 11:38:48 +0000 (UTC) Received: from t480s.redhat.com (unknown [10.39.194.167]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0D0F40CFD45; Tue, 30 May 2023 11:38:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685446734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LO6y5tkfgNged57O731G9ECwYnoNXu48Izp7SYxqk34=; b=C9vy/1wkGxWQaP7PerVuoMpbKWzoe+2b2zKXCj2tOKP14WR6g5Rk7iDod+uvF3TuEHQWMV 82Q+Uq/DTZyvjiS0mOQcMmAR/KlJoIbzL05O6Gin+nVIpI/MqEc4qlr8CvgjUU4AI51kcw okW/TbkKX7Ha/n/L4eD0eSaerWW5Npo= X-MC-Unique: rjPf2xe3Oo6cI8Z-FOWwzA-1 From: David Hildenbrand To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiao Guangrong , David Hildenbrand , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Daniel Henrique Barboza , David Gibson , Eduardo Habkost , Greg Kurz , Harsh Prateek Bora , Marcel Apfelbaum , "Michael S. Tsirkin" , Paolo Bonzini , Peter Maydell , Richard Henderson , Song Gao , Xiaojuan Yang Subject: [PATCH 01/10] memory-device: Unify enabled vs. supported error messages Date: Tue, 30 May 2023 13:38:29 +0200 Message-Id: <20230530113838.257755-2-david@redhat.com> In-Reply-To: <20230530113838.257755-1-david@redhat.com> References: <20230530113838.257755-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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=170.10.129.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1685446945892100001 Content-Type: text/plain; charset="utf-8" Let's unify the error messages, such that we can simply stop allocating ms->device_memory if the size would be 0 (and there are no memory devices ever). The case of "not supported by the machine" should barely pop up either way: if the machine doesn't support memory devices, it usually doesn't call the pre_plug handler ... Signed-off-by: David Hildenbrand Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/mem/memory-device.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index 1636db9679..49f86ec8a8 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -104,15 +104,10 @@ static uint64_t memory_device_get_free_addr(MachineSt= ate *ms, GSList *list =3D NULL, *item; Range as, new =3D range_empty; =20 - if (!ms->device_memory) { - error_setg(errp, "memory devices (e.g. for memory hotplug) are not= " - "supported by the machine"); - return 0; - } - - if (!memory_region_size(&ms->device_memory->mr)) { - error_setg(errp, "memory devices (e.g. for memory hotplug) are not= " - "enabled, please specify the maxmem option"); + if (!ms->device_memory || !memory_region_size(&ms->device_memory->mr))= { + error_setg(errp, "the configuration is not prepared for memory dev= ices" + " (e.g., for memory hotplug), consider specifying= the" + " maxmem option"); return 0; } range_init_nofail(&as, ms->device_memory->base, --=20 2.40.1