[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.0 v2 1/5] memory: Make flatview_cb return bool, not int
From: |
Peter Maydell |
Subject: |
[PATCH for-6.0 v2 1/5] memory: Make flatview_cb return bool, not int |
Date: |
Thu, 18 Mar 2021 17:48:19 +0000 |
The return value of the flatview_cb callback passed to the
flatview_for_each_range() function is zero if the iteration through
the ranges should continue, or non-zero to break out of it. Use a
bool for this rather than int.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
include/exec/memory.h | 6 +++---
tests/qtest/fuzz/generic_fuzz.c | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 54ccf1a5f09..22c10b8496a 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -776,9 +776,9 @@ static inline FlatView
*address_space_to_flatview(AddressSpace *as)
return qatomic_rcu_read(&as->current_map);
}
-typedef int (*flatview_cb)(Int128 start,
- Int128 len,
- const MemoryRegion*, void*);
+typedef bool (*flatview_cb)(Int128 start,
+ Int128 len,
+ const MemoryRegion*, void*);
void flatview_for_each_range(FlatView *fv, flatview_cb cb , void *opaque);
diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c
index b5fe27aae18..b6af4cbb18b 100644
--- a/tests/qtest/fuzz/generic_fuzz.c
+++ b/tests/qtest/fuzz/generic_fuzz.c
@@ -98,19 +98,19 @@ struct get_io_cb_info {
address_range result;
};
-static int get_io_address_cb(Int128 start, Int128 size,
- const MemoryRegion *mr, void *opaque) {
+static bool get_io_address_cb(Int128 start, Int128 size,
+ const MemoryRegion *mr, void *opaque) {
struct get_io_cb_info *info = opaque;
if (g_hash_table_lookup(fuzzable_memoryregions, mr)) {
if (info->index == 0) {
info->result.addr = (ram_addr_t)start;
info->result.size = (ram_addr_t)size;
info->found = 1;
- return 1;
+ return true;
}
info->index--;
}
- return 0;
+ return false;
}
/*
--
2.20.1