Re: [Qemu-devel] [PATCH v3 24/46] ivshmem: shmfd can be 0

[Claudio Fontana]

On 15.09.2015 18:07, address@hidden wrote:
> From: Marc-André Lureau <address@hidden>
> 
> 0 is a valid fd value, so change conditions and set -1 value early
> 
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
>  hw/misc/ivshmem.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
> index 14c7d58..c80503d 100644
> --- a/hw/misc/ivshmem.c
> +++ b/hw/misc/ivshmem.c
> @@ -233,7 +233,7 @@ static uint64_t ivshmem_io_read(void *opaque, hwaddr addr,
>  
>          case IVPOSITION:
>              /* return my VM ID if the memory is mapped */
> -            if (s->shm_fd > 0) {
> +            if (s->shm_fd >= 0) {
>                  ret = s->vm_id;
>              } else {
>                  ret = -1;
> @@ -663,6 +663,8 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error 
> **errp)
>          PCI_BASE_ADDRESS_MEM_PREFETCH;;
>      Error *local_err = NULL;
>  
> +    s->shm_fd = -1;
> +
>      if (s->sizearg == NULL) {
>          s->ivshmem_size = 4 << 20; /* 4 MB default */
>      } else {
> @@ -707,8 +709,6 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error 
> **errp)
>  
>      pci_config_set_interrupt_pin(pci_conf, 1);
>  
> -    s->shm_fd = 0;
> -
>      memory_region_init_io(&s->ivshmem_mmio, OBJECT(s), &ivshmem_mmio_ops, s,
>                            "ivshmem-mmio", IVSHMEM_REG_BAR_SIZE);
>  
> 

Reviewed-by: Claudio Fontana <address@hidden>