Re: [Qemu-devel] [PATCH v2 01/43] qemu_ram_foreach_block: pass up error value, and down the ramblock name

[Eric Blake]

On 08/11/2014 08:29 AM, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <address@hidden>
> 
> 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 <address@hidden>
> ---
>  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 <address@hidden>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

signature.asc
Description: OpenPGP digital signature