| Message ID | 1407767399-3030-2-git-send-email-dgilbert@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 08/11/2014 08:29 AM, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > check the return value of the function it calls and error if it's none-0 s/none/non/ > Fixup qemu_rdma_init_one_block that is the only current caller, > and __qemu_rdma_add_block the only function it calls using it. > > Pass the name of the ramblock to the function; helps in debugging. > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > exec.c | 10 ++++++++-- > include/exec/cpu-common.h | 4 ++-- > migration-rdma.c | 4 ++-- > 3 files changed, 12 insertions(+), 6 deletions(-) > > +++ b/migration-rdma.c > @@ -595,10 +595,10 @@ static int __qemu_rdma_add_block(RDMAContext *rdma, void *host_addr, > * in advanced before the migration starts. This tells us where the RAM blocks > * are so that we can register them individually. > */ > -static void qemu_rdma_init_one_block(void *host_addr, > +static int qemu_rdma_init_one_block(const char *block_name, void *host_addr, > ram_addr_t block_offset, ram_addr_t length, void *opaque) > { > - __qemu_rdma_add_block(opaque, host_addr, block_offset, length); > + return __qemu_rdma_add_block(opaque, host_addr, block_offset, length); We really shouldn't be using __qemu naming in our source, as that namespace is reserved for the compiler/libc (this patch didn't introduce it, so if you fix it, do it as a separate cleanup). Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/exec.c b/exec.c index 765bd94..729c12c 100644 --- a/exec.c +++ b/exec.c @@ -2774,12 +2774,18 @@ bool cpu_physical_memory_is_io(hwaddr phys_addr) memory_region_is_romd(mr)); } -void qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) +int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) { RAMBlock *block; + int ret; QTAILQ_FOREACH(block, &ram_list.blocks, next) { - func(block->host, block->offset, block->length, opaque); + ret = func(block->idstr, block->host, block->offset, block->length, + opaque); + if (ret) { + return ret; + } } + return 0; } #endif diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index e3ec4c8..8042f50 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -118,10 +118,10 @@ void cpu_flush_icache_range(hwaddr start, int len); extern struct MemoryRegion io_mem_rom; extern struct MemoryRegion io_mem_notdirty; -typedef void (RAMBlockIterFunc)(void *host_addr, +typedef int (RAMBlockIterFunc)(const char *block_name, void *host_addr, ram_addr_t offset, ram_addr_t length, void *opaque); -void qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque); +int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque); #endif diff --git a/migration-rdma.c b/migration-rdma.c index d99812c..666c052 100644 --- a/migration-rdma.c +++ b/migration-rdma.c @@ -595,10 +595,10 @@ static int __qemu_rdma_add_block(RDMAContext *rdma, void *host_addr, * in advanced before the migration starts. This tells us where the RAM blocks * are so that we can register them individually. */ -static void qemu_rdma_init_one_block(void *host_addr, +static int qemu_rdma_init_one_block(const char *block_name, void *host_addr, ram_addr_t block_offset, ram_addr_t length, void *opaque) { - __qemu_rdma_add_block(opaque, host_addr, block_offset, length); + return __qemu_rdma_add_block(opaque, host_addr, block_offset, length); } /*