From patchwork Thu Mar 13 03:45:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 873140 Delivered-To: patch@linaro.org Received: by 2002:a5d:5343:0:b0:38f:210b:807b with SMTP id t3csp272208wrv; Wed, 12 Mar 2025 20:50:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVIsgQIy3WHzNV/OvX/FKPaB3coLxiu+h1vlyzX72Bxn33byQS9c5boAb9NZWveXwGbEyZwCQ==@linaro.org X-Google-Smtp-Source: AGHT+IFZ1lnIqzTe5rGTZ8ar8xKP31xkDRMK5vHNLQeuZV650SlawXoUrTCmU022queuiSlrGQlS X-Received: by 2002:a05:620a:27d3:b0:7c5:3ca5:58fb with SMTP id af79cd13be357-7c53ca55afamr3137104485a.4.1741837803752; Wed, 12 Mar 2025 20:50:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741837803; cv=none; d=google.com; s=arc-20240605; b=HF+/+zJRf+Kyuyl77FqoScMTqqS/+yiLgvDSDJdMJOqSKq3l1ouuW5p7u5qhCAdbiP H/VHGaPCTxM9s8J2ESISAjSfX+G6S31imGxsIk2nSCp4kcm/H74WMWvaRtYFm7LgzeMg fLYZ4vPGNav/dSUrDe7NrBrL3ahD/C1niJ4DI9ZFxaPNqeza/mKTmk74mbRFb81u0t4B 8bjS+0vlCcbJiGlJxEoziGvKyuzr9/ck8rymKp9G4+zGI5SdaFlzubuuFbjCuYtY7ckR 1wSNdKB1tiLmJd+VatxLGKRxmDaG8ZUgKnCZILjrlw0NPFmJumWquhaYDbotVZDg+6tY tQKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=PsjMy5lcZ0oWARq4nJr2i4kwj0kpFaIrAOqFSC65xXY=; fh=DMsE7tt1yctKFfl3yHwu1RCUVEpd9TdAG7FdasYB91k=; b=AnAj0uohtZtFMXDHfQz2nuCIntFYoVs62BSlTT1OiLbyogPHrX7pWPEvPtApIeyjJO 196YOeCWCZ1Yi7XNYtU3VdQpa/Y6ABifU5xh3J6dod2sZfnMVLtcRbC2eA+AI83FtKFC U6OmwvZRK2UhP3u4JI+hUnN8/0u3bjlYV+ZKubDqEDVZZgpwHThH9LOQK3vMso5oBJnT x3YeSr6C8gDSTONV0+Uof3UxL2h4dXO7Du0yhTyMmCbnXH5IcxbdAP2B2QsLbf0rtmi9 bQ5SgcUg5ApSFTvGuK7NCJ9M825iph/vYxXt2PvWEEXPT0IRrN51YILmrXxRVIA8kTJB jvlw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aXV9u1NP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c573b9322esi77321785a.132.2025.03.12.20.50.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Mar 2025 20:50:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=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=@linaro.org header.s=google header.b=aXV9u1NP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tsZWU-0004mA-4S; Wed, 12 Mar 2025 23:46:18 -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 1tsZWC-0004gZ-Hw for qemu-devel@nongnu.org; Wed, 12 Mar 2025 23:46:00 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tsZW0-0007oI-Gr for qemu-devel@nongnu.org; Wed, 12 Mar 2025 23:45:59 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-22580c9ee0aso8854215ad.2 for ; Wed, 12 Mar 2025 20:45:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741837546; x=1742442346; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PsjMy5lcZ0oWARq4nJr2i4kwj0kpFaIrAOqFSC65xXY=; b=aXV9u1NPz96Bp1u5m02f6YZSBQJnkh6fUKT5KdeduY1l9iJX/QdDHXibwHUnBUqdFG jPDp1C+ZSHLj/Zf3IVS4h1m1r8K0Sw+X7eNkILIpJW/4P4k88gjEDtswTnYZZaN8s7R1 xZai5CEfzmp/UvXBZutaXtbXy1HkPLCTHxxlkEwRnLpMDa9XjYinUPTvkefMBNq3jbrP 1MVv6YvXk3tnHDSJqLLu3f5stf0x4fGw6i+Eb9TU8Rd2f5h9bB1EVzyQ9Vkq//aQXtFf 37SUrvGTqwpZsVS73AcKcn/+InGIvpFh9hz0UnXmQzQLCyudxErJIFqFnKKG78H8pyrQ x/Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741837546; x=1742442346; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PsjMy5lcZ0oWARq4nJr2i4kwj0kpFaIrAOqFSC65xXY=; b=D3nAVUHTvistwb4fJH92nT9FyNVjqOzX3gWRcHP6EnlqSPs6rFFd0Bwh9acyFEFvRv k4wP/6h1qm5Kx3eskskYRCpOkIOj6HWwyc/dhEMq9oxtsW2ftDb8VdakyIGBPHBupgsX 4LTWF9uGomHI5k0hykMgTxyFvPEKFrq+1+khSBxSNneBuiUJyd3yATXpoFV81x3bAHnb KM4aN00lJx/wUYadsIxxiHpWavr8NHMuvYL7JLXYFZg0+lVza6pBfYMR5UKYondyaDtg L2O1i9alcLHQbHGz0dG2f7XfbJP3fORmyyp8Aa56/mMi7rPVfjmXKfAxZyG5RxiPT6v/ 8p0A== X-Gm-Message-State: AOJu0Yw/yDKG9bIJgGnfT7hrF59v/eza81YgDfURM5ZqVZEZXpKOlsqq 5R5r9QUtZeVdz3KHY4Pi1MnnCgbBUn98hRBBDP9//6YVnjE3aJtbYHTDxuyJpcla1OEqv2afQ+l E X-Gm-Gg: ASbGncsDtVaKLo6ZTvr0EeiBNUKSkJSk2LlzF1bxEQW0MeNHHpXnN6t/pAjmFpJtrQ6 hbNN3Yvi5Giz6/oV6x4/8wCmCw+Z5+pSO4hDvT4I38PW27D65fnftGYZyGgagd80Ag5SNn/KxVa GR8cFxQiTVJ03ByEUVYpHt1dmpZQiazVxvlnTJd5+A942gVdPhiSSLIk2ULhlGa2yksOYEI/5pO myQ36+MCq8ZEm9N92kUwOErgqamci51B4+f9AXVAsVVz4uxm6W9hXIi5o5Za8/nMF0tKus/LkHt XzoPgxnyknJ5BIZf1lH5abW0CDoI9Jvin3xBYQ864v1ROtGjiHHuHynW60AC++CKjt98H6MD9AM NP8zVb707pKU= X-Received: by 2002:a05:6a00:4f90:b0:736:4a5b:7f08 with SMTP id d2e1a72fcca58-736aaae86d4mr30499210b3a.22.1741837545770; Wed, 12 Mar 2025 20:45:45 -0700 (PDT) Received: from stoup.. (174-21-74-48.tukw.qwest.net. [174.21.74.48]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7371167def8sm316781b3a.90.2025.03.12.20.45.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Mar 2025 20:45:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pierrick.bouvier@linaro.org, pbonzini@redhat.com, philmd@linaro.org Subject: [PATCH 24/37] include/system: Move exec/ramblock.h to system/ramblock.h Date: Wed, 12 Mar 2025 20:45:04 -0700 Message-ID: <20250313034524.3069690-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250313034524.3069690-1-richard.henderson@linaro.org> References: <20250313034524.3069690-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.google.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, 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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Convert the existing includes with sed. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- include/system/ram_addr.h | 2 +- include/{exec => system}/ramblock.h | 9 ++++----- hw/display/virtio-gpu-udmabuf.c | 2 +- hw/hyperv/hv-balloon.c | 2 +- hw/virtio/vhost-user.c | 2 +- migration/dirtyrate.c | 2 +- migration/file.c | 2 +- migration/multifd-nocomp.c | 2 +- migration/multifd-qatzip.c | 2 +- migration/multifd-qpl.c | 2 +- migration/multifd-uadk.c | 2 +- migration/multifd-zero-page.c | 2 +- migration/multifd-zlib.c | 2 +- migration/multifd-zstd.c | 2 +- migration/multifd.c | 2 +- migration/postcopy-ram.c | 2 +- tests/qtest/fuzz/generic_fuzz.c | 2 +- MAINTAINERS | 2 +- 18 files changed, 21 insertions(+), 22 deletions(-) rename include/{exec => system}/ramblock.h (96%) diff --git a/include/system/ram_addr.h b/include/system/ram_addr.h index 65f8f37b2a..eceb8fbe4b 100644 --- a/include/system/ram_addr.h +++ b/include/system/ram_addr.h @@ -24,7 +24,7 @@ #include "system/tcg.h" #include "exec/cputlb.h" #include "exec/ramlist.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "exec/exec-all.h" #include "qemu/rcu.h" diff --git a/include/exec/ramblock.h b/include/system/ramblock.h similarity index 96% rename from include/exec/ramblock.h rename to include/system/ramblock.h index 64484cd821..d8a116ba99 100644 --- a/include/exec/ramblock.h +++ b/include/system/ramblock.h @@ -16,11 +16,10 @@ * The functions declared here will be removed soon. */ -#ifndef QEMU_EXEC_RAMBLOCK_H -#define QEMU_EXEC_RAMBLOCK_H +#ifndef SYSTEM_RAMBLOCK_H +#define SYSTEM_RAMBLOCK_H -#ifndef CONFIG_USER_ONLY -#include "cpu-common.h" +#include "exec/cpu-common.h" #include "qemu/rcu.h" #include "exec/ramlist.h" @@ -91,5 +90,5 @@ struct RAMBlock { */ ram_addr_t postcopy_length; }; -#endif + #endif diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c index 85ca23cb32..0510577475 100644 --- a/hw/display/virtio-gpu-udmabuf.c +++ b/hw/display/virtio-gpu-udmabuf.c @@ -19,7 +19,7 @@ #include "hw/virtio/virtio-gpu.h" #include "hw/virtio/virtio-gpu-pixman.h" #include "trace.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "system/hostmem.h" #include #include diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c index 0b1da723c8..acabff2c4a 100644 --- a/hw/hyperv/hv-balloon.c +++ b/hw/hyperv/hv-balloon.c @@ -12,7 +12,7 @@ #include "system/address-spaces.h" #include "exec/cpu-common.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "hw/boards.h" #include "hw/hyperv/dynmem-proto.h" #include "hw/hyperv/hv-balloon.h" diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 267b612587..48561d3c74 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -28,7 +28,7 @@ #include "system/cryptodev.h" #include "migration/postcopy-ram.h" #include "trace.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include #include diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 09caf92f87..986624c79a 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -14,7 +14,7 @@ #include "qemu/error-report.h" #include "hw/core/cpu.h" #include "qapi/error.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "exec/target_page.h" #include "qemu/rcu_queue.h" #include "qemu/main-loop.h" diff --git a/migration/file.c b/migration/file.c index 7f11e26f5c..bb8031e3c7 100644 --- a/migration/file.c +++ b/migration/file.c @@ -6,7 +6,7 @@ */ #include "qemu/osdep.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "qemu/cutils.h" #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/migration/multifd-nocomp.c b/migration/multifd-nocomp.c index ffe75256c9..94f248e8a2 100644 --- a/migration/multifd-nocomp.c +++ b/migration/multifd-nocomp.c @@ -11,7 +11,7 @@ */ #include "qemu/osdep.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "exec/target_page.h" #include "file.h" #include "migration-stats.h" diff --git a/migration/multifd-qatzip.c b/migration/multifd-qatzip.c index 6a0e989fae..7419e5dc0d 100644 --- a/migration/multifd-qatzip.c +++ b/migration/multifd-qatzip.c @@ -13,7 +13,7 @@ */ #include "qemu/osdep.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qapi/qapi-types-migration.h" diff --git a/migration/multifd-qpl.c b/migration/multifd-qpl.c index 88e2344af2..52902eb00c 100644 --- a/migration/multifd-qpl.c +++ b/migration/multifd-qpl.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "qapi/qapi-types-migration.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "multifd.h" #include "qpl/qpl.h" diff --git a/migration/multifd-uadk.c b/migration/multifd-uadk.c index 6895c1f65a..fd7cd9b5e8 100644 --- a/migration/multifd-uadk.c +++ b/migration/multifd-uadk.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qapi/error.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "migration.h" #include "multifd.h" #include "options.h" diff --git a/migration/multifd-zero-page.c b/migration/multifd-zero-page.c index f1e988a959..dbc1184921 100644 --- a/migration/multifd-zero-page.c +++ b/migration/multifd-zero-page.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "migration.h" #include "migration-stats.h" #include "multifd.h" diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index 8cf8a26bb4..8820b2a787 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include #include "qemu/rcu.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "exec/target_page.h" #include "qapi/error.h" #include "migration.h" diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index abed140855..3c2dcf76b0 100644 --- a/migration/multifd-zstd.c +++ b/migration/multifd-zstd.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include #include "qemu/rcu.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "exec/target_page.h" #include "qapi/error.h" #include "migration.h" diff --git a/migration/multifd.c b/migration/multifd.c index dfb5189f0e..86c83e43c0 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -16,7 +16,7 @@ #include "qemu/rcu.h" #include "exec/target_page.h" #include "system/system.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "file.h" diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 5d3edfcfec..995614b38c 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -31,7 +31,7 @@ #include "qemu/error-report.h" #include "trace.h" #include "hw/boards.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "socket.h" #include "yank_functions.h" #include "tls.h" diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c index 239be9372d..507de74806 100644 --- a/tests/qtest/fuzz/generic_fuzz.c +++ b/tests/qtest/fuzz/generic_fuzz.c @@ -21,7 +21,7 @@ #include "fuzz.h" #include "string.h" #include "system/memory.h" -#include "exec/ramblock.h" +#include "system/ramblock.h" #include "hw/qdev-core.h" #include "hw/pci/pci.h" #include "hw/pci/pci_device.h" diff --git a/MAINTAINERS b/MAINTAINERS index 2cc0b54ec4..212435e302 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3111,7 +3111,7 @@ F: include/system/ioport.h F: include/exec/memop.h F: include/system/memory.h F: include/system/ram_addr.h -F: include/exec/ramblock.h +F: include/system/ramblock.h F: include/system/memory_mapping.h F: system/dma-helpers.c F: system/ioport.c