Skip to content

Commit

Permalink
memory: Make flatview_cb return bool, not int
Browse files Browse the repository at this point in the history
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
  • Loading branch information
pm215 committed Mar 23, 2021
1 parent e6fa978 commit d1e8cf7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions include/exec/memory.h
Expand Up @@ -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);

Expand Down
8 changes: 4 additions & 4 deletions tests/qtest/fuzz/generic_fuzz.c
Expand Up @@ -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;
}

/*
Expand Down

0 comments on commit d1e8cf7

Please sign in to comment.