diff --git a/qemu/include/exec/memory.h b/qemu/include/exec/memory.h index d3d992d2..a270f4f4 100644 --- a/qemu/include/exec/memory.h +++ b/qemu/include/exec/memory.h @@ -262,10 +262,10 @@ FlatView *address_space_to_flatview(AddressSpace *as); * @nonvolatile: this section is non-volatile */ struct MemoryRegionSection { + Int128 size; MemoryRegion *mr; FlatView *fv; hwaddr offset_within_region; - Int128 size; hwaddr offset_within_address_space; bool readonly; bool nonvolatile; diff --git a/qemu/memory.c b/qemu/memory.c index 565163cb..4b6a2084 100644 --- a/qemu/memory.c +++ b/qemu/memory.c @@ -1818,7 +1818,7 @@ bool memory_region_is_mapped(MemoryRegion *mr) static MemoryRegionSection memory_region_find_rcu(MemoryRegion *mr, hwaddr addr, uint64_t size) { - MemoryRegionSection ret = { NULL }; + MemoryRegionSection ret = {}; MemoryRegion *root; AddressSpace *as; AddrRange range;