Received: by 2002:a17:906:fcb7:b0:974:3dd3:6e73 with SMTP id qw23csp396452ejb; Thu, 1 Jun 2023 05:20:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ40HCUuCA/tOooojZ0+bxLll8nA7uL9E4BPt3gFR3V5Wcr+Le3d2R0VKRYX2EmBz88eeraA X-Received: by 2002:a05:6000:151:b0:30a:efd3:66a with SMTP id r17-20020a056000015100b0030aefd3066amr2035677wrx.40.1685622051228; Thu, 01 Jun 2023 05:20:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685622051; cv=none; d=google.com; s=arc-20160816; b=c0v3ADQGGf/qFab71msklixL8kkfMB0PlJ5rnBmzqHJvMiW/jUJWHhD0XxDJAifmyx ZpGCvGkIi0svdbiClVkZLYr52xr6GVu0aK5uHVGwTfTS7VZMQuxVc4A9ZwpH3RKAs99B gc/84PmsH9oY9drJDXNxw2+ZG/pQbq2I/zNIWAn/idiqDwotrqzLEshaP7LzMJ0sleOv laORO8GsGuZsLnw5h8p32XeAf0h/wlesGivqQFVIdM2QD7X9Rc6924LJ8oZYQ+DHZURI EL0eBRwuIMA10c7Vu5bUv76ED5OHFqIKR8xTboUgAH2gPn7QfNRtgHweb7v/B5mjWjXF 2fqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7aUX/geBE6gcCUcvdeMA3YTIodD7jkhRvdSycb4ixhk=; b=pWGVplU4DOYUkPmBkTlHYlnly3jsUxLd1y2k+dID1Xhq5MeB780u0eWvr5RVs5Bamd Su1a3UIeO7Q/W3HAGcujj2lQwlQVUEIbLn0Od1U/hgs/7jY7dduvSmOx7ZUkV1Y+AazO CY+FL+N8tRGl+dT15TXvB/gKKQ8rbwFgX0Y03xeLCibopggskfwEt0qJ0k+J+DUP4SHR uzpptt1ZgDEkR+w5br0D3PFHcjItAtwl4TUGUUOm9pkCuF3H7CHYQklq8UQK52Rh7haT O4trtmKz9Sv8gj3FR5MtPK01F3TekgLAKG7jseormVkqRtM52+FxrwMUqV9XzcWJWRgM YaVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=B5W+HfZP; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w8-20020adff9c8000000b003062d81831asi4050883wrr.625.2023.06.01.05.20.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Jun 2023 05:20:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=B5W+HfZP; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4hFS-00044M-Se; Thu, 01 Jun 2023 08:17:46 -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 1q4hCy-0000nT-Q6 for qemu-devel@nongnu.org; Thu, 01 Jun 2023 08:15:15 -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 1q4hCv-0006UN-Vv for qemu-devel@nongnu.org; Thu, 01 Jun 2023 08:15:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685621709; 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=7aUX/geBE6gcCUcvdeMA3YTIodD7jkhRvdSycb4ixhk=; b=B5W+HfZPyea6KWlw1NX9qkS5Dbv4abph7Rk8g0kdUS50sERTJ8lZTPFHqUniEvUfbtGYCP +3nCkZ5ytBs25lESUQZ242X651DIYwaSxTzhb4fLkn5tqcHWDrhtS1CKIEl+rkZkAE4Cl6 09P2FSPTwArM/qqm++jOMWKfeFgo9nU= 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-517-q3IVP4-LPl2u7O2tnIDnkg-1; Thu, 01 Jun 2023 08:15:05 -0400 X-MC-Unique: q3IVP4-LPl2u7O2tnIDnkg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8CAD1811E8F; Thu, 1 Jun 2023 12:15:05 +0000 (UTC) Received: from t480s.redhat.com (unknown [10.22.8.170]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B28D2166B25; Thu, 1 Jun 2023 12:15:04 +0000 (UTC) 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 Subject: [PATCH v3 09/10] memory-device: Refactor memory_device_pre_plug() Date: Thu, 1 Jun 2023 14:14:46 +0200 Message-Id: <20230601121447.272487-11-david@redhat.com> In-Reply-To: <20230601121447.272487-1-david@redhat.com> References: <20230601121447.272487-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.166, 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=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+alex.bennee=linaro.org@nongnu.org Sender: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: asW1LgLPyUNj 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. 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, void *opaque) return 0; } -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 = memory_region_size(mr); uint64_t used_region_size = 0; /* we will need a new memory slot for kvm and vhost */ @@ -101,16 +102,9 @@ static uint64_t memory_device_get_free_addr(MachineState *ms, uint64_t align, uint64_t size, Error **errp) { - Error *err = NULL; GSList *list = NULL, *item; Range as, new = range_empty; - if (!ms->device_memory || !memory_region_size(&ms->device_memory->mr)) { - error_setg(errp, "the configuration is not prepared for memory devices" - " (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)); @@ -122,12 +116,6 @@ static uint64_t memory_device_get_free_addr(MachineState *ms, align); } - 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, MachineState *ms, uint64_t addr, align = 0; MemoryRegion *mr; + if (!ms->device_memory) { + error_setg(errp, "the configuration is not prepared for memory devices" + " (e.g., for memory hotplug), consider specifying the" + " maxmem option"); + return; + } + mr = mdc->get_memory_region(md, &local_err); if (local_err) { goto out; } + memory_device_check_addable(ms, mr, &local_err); + if (local_err) { + goto out; + } + if (legacy_align) { align = *legacy_align; } else { -- 2.40.1