On 2/10/25 17:59, Harsh Prateek Bora wrote:
On 10/1/25 23:24, Philippe Mathieu-Daudé wrote:
None of these files require definition exposed by "system/ram_addr.h",
remove its inclusion.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
---
hw/ppc/spapr.c | 1 -
hw/ppc/spapr_caps.c | 1 -
hw/ppc/spapr_pci.c | 1 -
hw/remote/memory.c | 1 -
hw/remote/proxy-memory-listener.c | 1 -
hw/s390x/s390-virtio-ccw.c | 1 -
hw/vfio/spapr.c | 1 -
hw/virtio/virtio-mem.c | 1 -
8 files changed, 8 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 82fb23beaa8..97ab6bebd25 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -77,7 +77,6 @@
#include "hw/virtio/virtio-scsi.h"
#include "hw/virtio/vhost-scsi-common.h"
-#include "system/ram_addr.h"
#include "system/confidential-guest-support.h"
#include "hw/usb.h"
#include "qemu/config-file.h"
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
index f2f5722d8ad..0f94c192fd4 100644
--- a/hw/ppc/spapr_caps.c
+++ b/hw/ppc/spapr_caps.c
@@ -27,7 +27,6 @@
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "system/hw_accel.h"
-#include "system/ram_addr.h"
#include "target/ppc/cpu.h"
#include "target/ppc/mmu-hash64.h"
#include "cpu-models.h"
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 1ac1185825e..f9095552e86 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -34,7 +34,6 @@
#include "hw/pci/pci_host.h"
#include "hw/ppc/spapr.h"
#include "hw/pci-host/spapr.h"
-#include "system/ram_addr.h"
#include <libfdt.h>
#include "trace.h"
#include "qemu/error-report.h"
I am seeing error while applying patch series:
harshpb:patches$ git log --oneline -n1
29b77c1a2d (HEAD -> review-20251002, upstream/master, master) Merge tag
'rust-ci-pull-request' of https://gitlab.com/marcandre.lureau/qemu into
staging
harshpb:patches$ git am ./
v2_20251001_philmd_system_physmem_extract_api_out_of_system_ram_addr_h_header.mbx
Applying: system/ram_addr: Remove unnecessary 'exec/cpu-common.h' header
Applying: accel/kvm: Include missing 'exec/target_page.h' header
Applying: hw/s390x/s390-stattrib: Include missing 'exec/target_page.h'
header
Applying: hw/vfio/listener: Include missing 'exec/target_page.h' header
Applying: target/arm/tcg/mte: Include missing 'exec/target_page.h' header
Applying: hw: Remove unnecessary 'system/ram_addr.h' header
Applying: system/physmem: Un-inline cpu_physical_memory_get_dirty_flag()
Applying: system/physmem: Un-inline cpu_physical_memory_is_clean()
Applying: system/physmem: Un-inline
cpu_physical_memory_range_includes_clean()
Applying: system/physmem: Un-inline cpu_physical_memory_set_dirty_flag()
Applying: system/physmem: Un-inline cpu_physical_memory_set_dirty_range()
Applying: system/physmem: Remove _WIN32 #ifdef'ry
Applying: system/physmem: Un-inline
cpu_physical_memory_set_dirty_lebitmap()
Applying: system/physmem: Un-inline
cpu_physical_memory_dirty_bits_cleared()
Applying: system/physmem: Reduce cpu_physical_memory_clear_dirty_range()
scope
Applying: system/physmem: Reduce cpu_physical_memory_sync_dirty_bitmap()
scope
Applying: system/physmem: Drop 'cpu_' prefix in Physical Memory API
error: patch failed: hw/vfio/container.c:255
error: hw/vfio/container.c: patch does not apply
Patch failed at 0017 system/physmem: Drop 'cpu_' prefix in Physical
Memory API
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
harshpb:patches$
However, changes for ppc/spapr looks fine to me.
Sorry, I forgot the 'Based-on' tag on v1 and added it separately:
https://lore.kernel.org/qemu-devel/[email protected]/
then forgot to add it again on v2 :/
Thanks
Harsh
