aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-03-18 17:48:19 +0000
committerPeter Maydell <peter.maydell@linaro.org>2021-03-23 11:47:31 +0000
commitd1e8cf77f1739018b792ddc6b377b509fbf8e7c8 (patch)
treefc019b881855d6819fc0442aeee468409e77b261
parente6fa978d8343ec7cf20b9c8b2dcb390646242457 (diff)
memory: Make flatview_cb return bool, not int
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> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20210318174823.18066-2-peter.maydell@linaro.org
-rw-r--r--include/exec/memory.h6
-rw-r--r--tests/qtest/fuzz/generic_fuzz.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 260ddd8ade..500bfc0abd 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 b5fe27aae1..b6af4cbb18 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;
}
/*