From nobody Fri Dec 19 13:22:55 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=1689149974; cv=none; d=zohomail.com; s=zohoarc; b=d9REmUajOMirLTuwMAozC7qKd4LnvS/NtSovZ6w0iMzH2il2FppIwyZ9I5nCeln68pF9ldeduObP37qirkDsHZK+2A9oNW7SaonO7OllodNduv8eGYR0UqUyauFPlD8sYoAvNXbbGxxz6VXRSQlEO18Up8hJh/v1hEsa3uo4XDk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689149974; 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=qDd2NaSnlRSbCCUUBbj+uR00I1+xD1zilFuWI5wVq5U=; b=jwHWdvyew+fFeo6kPt8b1K5UgRPAmQwg1G3LIRCsq2FU2r1s1f7C6A2QPDG8ZuP5QT4SSY3KYMekVVEUgUeIi4WXA5+9dWRiKOOmDyNiJjG0PYpVbaxRkkukkv+LlFvQ7FVo6qc7aSvjpftssXe9x66CtESeyMQztI0Nep09sLA= 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 1689149974295620.6664791345423; Wed, 12 Jul 2023 01:19:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qJV3E-000499-6D; Wed, 12 Jul 2023 04:18:20 -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 1qJV3C-00048Q-Iw for qemu-devel@nongnu.org; Wed, 12 Jul 2023 04:18:18 -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 1qJV3B-0000Wd-34 for qemu-devel@nongnu.org; Wed, 12 Jul 2023 04:18:18 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-403-fpUugsUPNkSd_cRtFoWSsw-1; Wed, 12 Jul 2023 04:18:14 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7758C1044589; Wed, 12 Jul 2023 08:18:14 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.193.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 212B7492C13; Wed, 12 Jul 2023 08:18:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689149896; 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=qDd2NaSnlRSbCCUUBbj+uR00I1+xD1zilFuWI5wVq5U=; b=Qdbaoj76SaiakiBaAiuXiPL+U8FPG4sdv0pOGBviMVYKptTqGmErs34RJ0X4uZ14ZC/3uq R3K0IqxJyqgyXtonBUMyO2mzDhgPD9V3dfnKZPjeDrAp9pCK8JQM1o1EgoebpL0LUf8cK2 gwt26twfJu3VcAL0i21eoraNRAY66ug= X-MC-Unique: fpUugsUPNkSd_cRtFoWSsw-1 From: David Hildenbrand To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , "Michael S . Tsirkin" , Paolo Bonzini , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [GIT PULL 09/21] memory-device: Refactor memory_device_pre_plug() Date: Wed, 12 Jul 2023 10:17:38 +0200 Message-ID: <20230712081750.80852-10-david@redhat.com> In-Reply-To: <20230712081750.80852-1-david@redhat.com> References: <20230712081750.80852-1-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , 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: 1689149974874100001 Let's move memory_device_check_addable() and basic checks out of memory_device_get_free_addr() directly into memory_device_pre_plug(). Separating basic checks from address assignment is cleaner and prepares for further changes. As all memory device users now use memory_devices_init(), and that function enforces that the size is 0, we can drop the check for an empty region. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: David Hildenbrand Message-Id: <20230623124553.400585-10-david@redhat.com> Signed-off-by: David Hildenbrand --- hw/mem/memory-device.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index bb9d7c2a20..00c7755557 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -69,9 +69,10 @@ static int memory_device_used_region_size(Object *obj, v= oid *opaque) return 0; } =20 -static void memory_device_check_addable(MachineState *ms, uint64_t size, +static void memory_device_check_addable(MachineState *ms, MemoryRegion *mr, Error **errp) { + const uint64_t size =3D memory_region_size(mr); uint64_t used_region_size =3D 0; =20 /* we will need a new memory slot for kvm and vhost */ @@ -101,16 +102,9 @@ static uint64_t memory_device_get_free_addr(MachineSta= te *ms, uint64_t align, uint64_t size, Error **errp) { - Error *err =3D NULL; GSList *list =3D NULL, *item; Range as, new =3D range_empty; =20 - 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, memory_region_size(&ms->device_memory->mr)); =20 @@ -122,12 +116,6 @@ static uint64_t memory_device_get_free_addr(MachineSta= te *ms, align); } =20 - memory_device_check_addable(ms, size, &err); - if (err) { - error_propagate(errp, err); - return 0; - } - if (hint && !QEMU_IS_ALIGNED(*hint, align)) { error_setg(errp, "address must be aligned to 0x%" PRIx64 " bytes", align); @@ -251,11 +239,23 @@ void memory_device_pre_plug(MemoryDeviceState *md, Ma= chineState *ms, uint64_t addr, align =3D 0; MemoryRegion *mr; =20 + if (!ms->device_memory) { + error_setg(errp, "the configuration is not prepared for memory dev= ices" + " (e.g., for memory hotplug), consider specifying= the" + " maxmem option"); + return; + } + mr =3D mdc->get_memory_region(md, &local_err); if (local_err) { goto out; } =20 + memory_device_check_addable(ms, mr, &local_err); + if (local_err) { + goto out; + } + if (legacy_align) { align =3D *legacy_align; } else { --=20 2.41.0