mirror of https://github.com/proxmox/mirror_qemu
rdma: don't use negative index to array
Reviewed-by: Michael R. Hines <mrhines@us.ibm.com> Signed-off-by: Isaku Yamahata <yamahata@private.email.ne.jp> Signed-off-by: Michael R. Hines <mrhines@us.ibm.com> Message-id: 1375584894-9917-5-git-send-email-mrhines@linux.vnet.ibm.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>master
parent
6698894125
commit
44b5949491
|
@ -1933,10 +1933,21 @@ static int qemu_rdma_write_flush(QEMUFile *f, RDMAContext *rdma)
|
||||||
static inline int qemu_rdma_buffer_mergable(RDMAContext *rdma,
|
static inline int qemu_rdma_buffer_mergable(RDMAContext *rdma,
|
||||||
uint64_t offset, uint64_t len)
|
uint64_t offset, uint64_t len)
|
||||||
{
|
{
|
||||||
RDMALocalBlock *block =
|
RDMALocalBlock *block;
|
||||||
&(rdma->local_ram_blocks.block[rdma->current_index]);
|
uint8_t *host_addr;
|
||||||
uint8_t *host_addr = block->local_host_addr + (offset - block->offset);
|
uint8_t *chunk_end;
|
||||||
uint8_t *chunk_end = ram_chunk_end(block, rdma->current_chunk);
|
|
||||||
|
if (rdma->current_index < 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rdma->current_chunk < 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
block = &(rdma->local_ram_blocks.block[rdma->current_index]);
|
||||||
|
host_addr = block->local_host_addr + (offset - block->offset);
|
||||||
|
chunk_end = ram_chunk_end(block, rdma->current_chunk);
|
||||||
|
|
||||||
if (rdma->current_length == 0) {
|
if (rdma->current_length == 0) {
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1949,10 +1960,6 @@ static inline int qemu_rdma_buffer_mergable(RDMAContext *rdma,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rdma->current_index < 0) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (offset < block->offset) {
|
if (offset < block->offset) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1961,10 +1968,6 @@ static inline int qemu_rdma_buffer_mergable(RDMAContext *rdma,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rdma->current_chunk < 0) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((host_addr + len) > chunk_end) {
|
if ((host_addr + len) > chunk_end) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue