From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A89E2C433F5 for ; Sun, 3 Oct 2021 08:07:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 26DB061A7A for ; Sun, 3 Oct 2021 08:07:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 26DB061A7A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:52168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWwWy-0000nX-5v for qemu-devel@archiver.kernel.org; Sun, 03 Oct 2021 04:07:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWw9V-0004I0-9y for qemu-devel@nongnu.org; Sun, 03 Oct 2021 03:43:17 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:46677) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWw9T-00012Z-Lz for qemu-devel@nongnu.org; Sun, 03 Oct 2021 03:43:17 -0400 Received: by mail-ed1-x52a.google.com with SMTP id z20so468533edc.13 for ; Sun, 03 Oct 2021 00:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Iazzme8gW0iiwChNe0S4mE4gEWXWyIgyzE45wOse0ek=; b=QoAds/7SxGuQX7UN2AyLGGzlyeMhBTlgKf/MrYKvDYgvqV1kYY66LB+LS1DOJXUv0i 4b8CNP4U6RBv3cZ51XwESWKgqIt8FMwBQb4kJcBzpU+IZWlBkgJUuUkjJcunLIoHGjFZ 183NKv1KrIKyjcq3gi5Q8O1qx90eJpdKF1FFWdJc7+9TKXjwp3db7h+UlK8sNceCP1D0 yO3TW2g3bsQ69YZWg5AHEKSEJKnsxpBsDP21yJpnPZ0ueFK3tKmPwEaD0Njv+q/WJGI8 fodK93HLOpM0v33zlF8DsrJ/XPQ5GUmInimsxQ8Y8JSei2HBF3+WQRycJKqIL09jray9 edrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Iazzme8gW0iiwChNe0S4mE4gEWXWyIgyzE45wOse0ek=; b=njVZDVoI+4uSi4v+a+4NaMXO9adW+pD7fVGl5F72RNkZfP1b2aj1+75OMMqUxr6btj OikCnzLMDUOw1k6XAwmlNDsu9Tokx244R3QsyJpsBZyi5geIojRnmJORlSAI0dgBKORB m0tmyhBlTmRWaQyiw7zEr8jnkSaKQ/VKUHq+VpfwUj6Ny+CFgmxFTwej8oWHqN7hhOx6 LwAWrVL21XgBwI+fBVYDAxpSyQ45+zLL3cycikAAs2Z26COVUpsyTl/ul4uFAqiO2Pop Zl19Lked5ht00Id2XVkMi6Nj8Pmq4hJRyWK/HB4GrDbj+llEbUShoAuIf90OiDCkDUMv G9dQ== X-Gm-Message-State: AOAM530P8TwImMhrth3CnFsnC3tqHqxphIJqA26DCKdBtF7FTzwqmv3F ZqniGWGSQxPSL1sCDuSCcYhzWWH4uHA= X-Google-Smtp-Source: ABdhPJyxZN9AtNHAbvzajZc/7f58G0I4Xz1Kw/9gLYhsN0d6vt5OHAuMDn7evg/TMOXteRoFzmE69w== X-Received: by 2002:a17:906:39cd:: with SMTP id i13mr8665730eje.227.1633246994397; Sun, 03 Oct 2021 00:43:14 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n6sm5560856eds.10.2021.10.03.00.43.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Oct 2021 00:43:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 29/30] softmmu/memory_mapping: factor out adding physical memory ranges Date: Sun, 3 Oct 2021 09:42:49 +0200 Message-Id: <20211003074250.60869-30-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211003074250.60869-1-pbonzini@redhat.com> References: <20211003074250.60869-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Laurent Vivier , Thomas Huth , Eduardo Habkost , "Michael S. Tsirkin" , David Hildenbrand , "Dr . David Alan Gilbert" , Peter Xu , Alex Williamson , Claudio Fontana , Igor Mammedov , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefan Berger Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: David Hildenbrand Let's factor out adding a MemoryRegionSection to the list, to be reused in RamDiscardManager context next. Reviewed-by: Stefan Berger Reviewed-by: Peter Xu Cc: Marc-André Lureau Cc: Paolo Bonzini Cc: "Michael S. Tsirkin" Cc: Eduardo Habkost Cc: Alex Williamson Cc: Dr. David Alan Gilbert Cc: Igor Mammedov Cc: Claudio Fontana Cc: Thomas Huth Cc: "Alex Bennée" Cc: Peter Xu Cc: Laurent Vivier Cc: Stefan Berger Signed-off-by: David Hildenbrand Message-Id: <20210727082545.17934-4-david@redhat.com> Signed-off-by: Paolo Bonzini --- softmmu/memory_mapping.c | 41 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/softmmu/memory_mapping.c b/softmmu/memory_mapping.c index d401ca7e31..a2af02c41c 100644 --- a/softmmu/memory_mapping.c +++ b/softmmu/memory_mapping.c @@ -193,29 +193,14 @@ typedef struct GuestPhysListener { MemoryListener listener; } GuestPhysListener; -static void guest_phys_blocks_region_add(MemoryListener *listener, +static void guest_phys_block_add_section(GuestPhysListener *g, MemoryRegionSection *section) { - GuestPhysListener *g; - uint64_t section_size; - hwaddr target_start, target_end; - uint8_t *host_addr; - GuestPhysBlock *predecessor; - - /* we only care about RAM */ - if (!memory_region_is_ram(section->mr) || - memory_region_is_ram_device(section->mr) || - memory_region_is_nonvolatile(section->mr)) { - return; - } - - g = container_of(listener, GuestPhysListener, listener); - section_size = int128_get64(section->size); - target_start = section->offset_within_address_space; - target_end = target_start + section_size; - host_addr = memory_region_get_ram_ptr(section->mr) + - section->offset_within_region; - predecessor = NULL; + const hwaddr target_start = section->offset_within_address_space; + const hwaddr target_end = target_start + int128_get64(section->size); + uint8_t *host_addr = memory_region_get_ram_ptr(section->mr) + + section->offset_within_region; + GuestPhysBlock *predecessor = NULL; /* find continuity in guest physical address space */ if (!QTAILQ_EMPTY(&g->list->head)) { @@ -261,6 +246,20 @@ static void guest_phys_blocks_region_add(MemoryListener *listener, #endif } +static void guest_phys_blocks_region_add(MemoryListener *listener, + MemoryRegionSection *section) +{ + GuestPhysListener *g = container_of(listener, GuestPhysListener, listener); + + /* we only care about RAM */ + if (!memory_region_is_ram(section->mr) || + memory_region_is_ram_device(section->mr) || + memory_region_is_nonvolatile(section->mr)) { + return; + } + guest_phys_block_add_section(g, section); +} + void guest_phys_blocks_append(GuestPhysBlockList *list) { GuestPhysListener g = { 0 }; -- 2.31.1