Re: [Qemu-devel] [PATCH] RDMA: Fix error exits (for 2.4)

[Paolo Bonzini <pbonzini@redhat.com>]

Juan, okay for me to pick it up together with a bunch of other Coverity
fixes?

Paolo

On 10/07/2015 21:08, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> 
> The error checks I added used 'break' after the error, but I'm
> in a switch inside the while loop, so they need to be 'goto out'.
> 
> Spotted by coverity; entries 1311368 and 1311369
> 
> Fixes: afcddefd
> 
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
>  migration/rdma.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/migration/rdma.c b/migration/rdma.c
> index f106b2a..74876fd 100644
> --- a/migration/rdma.c
> +++ b/migration/rdma.c
> @@ -2997,7 +2997,7 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
>                               (unsigned int)comp->block_idx,
>                               rdma->local_ram_blocks.nb_blocks);
>                  ret = -EIO;
> -                break;
> +                goto out;
>              }
>              block = &(rdma->local_ram_blocks.block[comp->block_idx]);
>  
> @@ -3092,7 +3092,7 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
>                                   (unsigned int)reg->current_index,
>                                   rdma->local_ram_blocks.nb_blocks);
>                      ret = -ENOENT;
> -                    break;
> +                    goto out;
>                  }
>                  block = &(rdma->local_ram_blocks.block[reg->current_index]);
>                  if (block->is_ram_block) {
> @@ -3102,7 +3102,7 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
>                              block->block_name, block->offset,
>                              reg->key.current_addr);
>                          ret = -ERANGE;
> -                        break;
> +                        goto out;
>                      }
>                      host_addr = (block->local_host_addr +
>                                  (reg->key.current_addr - block->offset));
> @@ -3118,7 +3118,7 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
>                              " chunk: %" PRIx64,
>                              block->block_name, reg->key.chunk);
>                          ret = -ERANGE;
> -                        break;
> +                        goto out;
>                      }
>                  }
>                  chunk_start = ram_chunk_start(block, chunk);
>