From: Marc-André Lureau Date: Tue, 23 Jun 2015 10:53:42 +0000 (+0200) Subject: ivshmem: shmfd can be 0 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=86d471bfa4262fa983c0214ace7336843e2181a2;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git ivshmem: shmfd can be 0 0 is a valid fd value, so change conditions and set -1 value early Signed-off-by: Marc-André Lureau Reviewed-by: Claudio Fontana --- diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 0ccf932b7..d3d02048c 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; @@ -665,6 +665,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 { @@ -709,8 +711,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);