On 5/1/24 16:41, Philippe Mathieu-Daudé wrote:
The following changes since commit 05470c3979d5485003e129ff4b0c2ef98af91d86:
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging
(2024-01-04 19:55:20 +0000)
are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-cpus-20240105
for you to fetch changes up to a318da6b3f6a88e6cfd6953c519def9457e8962f:
target/sparc: Simplify qemu_irq_ack (2024-01-05 16:20:15 +0100)
----------------------------------------------------------------
HW core patch queue
- Unify CPU QOM type checks (Gavin)
- Simplify uses of some CPU related property (Philippe)
(start-powered-off, ARM reset-cbar and mp-affinity)
- Header and documentation cleanups (Zhao, Philippe)
- Have Memory API return boolean indicating possible error
- Fix frame filter mask in CAN sja1000 model (Pavel)
- QOM embed MCF5206 timer into SoC (Thomas)
- Simplify LEON3 qemu_irq_ack handler (Clément)
----------------------------------------------------------------
Philippe Mathieu-Daudé (37):
backends: Simplify host_memory_backend_memory_complete()
I neglected to run checkpatch.pl on this patch, so it lacks:
-- >8 --
diff --git a/backends/hostmem.c b/backends/hostmem.c
index 30f69b2cb5..987f6f591e 100644
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -346,5 +346,7 @@ host_memory_backend_memory_complete(UserCreatable
*uc, Error **errp)
unsigned long maxnode = (lastbit + 1) % (MAX_NODES + 1);
- /* ensure policy won't be ignored in case memory is preallocated
+ /*
+ * Ensure policy won't be ignored in case memory is preallocated
* before mbind(). note: MPOL_MF_STRICT is ignored on hugepages so
- * this doesn't catch hugepage case. */
+ * this doesn't catch hugepage case.
+ */
unsigned flags = MPOL_MF_STRICT | MPOL_MF_MOVE;
@@ -365,3 +367,4 @@ host_memory_backend_memory_complete(UserCreatable
*uc, Error **errp)
- /* We can have up to MAX_NODES nodes, but we need to pass maxnode+1
+ /*
+ * We can have up to MAX_NODES nodes, but we need to pass maxnode+1
* as argument to mbind() due to an old Linux bug (feature?) which
@@ -393,3 +396,4 @@ host_memory_backend_memory_complete(UserCreatable
*uc, Error **errp)
#endif
- /* Preallocate memory after the NUMA policy has been instantiated.
+ /*
+ * Preallocate memory after the NUMA policy has been instantiated.
* This is necessary to guarantee memory is allocated with
---
Since the PR is already in the testing pipeline:
- if it get merged, I'll send a cleanup patch
- otherwise if it fails I'll fix it.
Sorry for missing that.
Phil.
