diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2015-06-23 12:53:42 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2015-10-24 18:02:49 +0200 |
| commit | 86d471bfa4262fa983c0214ace7336843e2181a2 (patch) | |
| tree | 65e7705221a641ca56bda971fd682e26f71cd85e | |
| parent | 1f8552df2c7935a4cf883bda22acbe2adbf7d579 (diff) | |
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 <marcandre.lureau@redhat.com>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
| -rw-r--r-- | hw/misc/ivshmem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 0ccf932b7d..d3d02048cd 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); |