[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 24/48] ivshmem: shmfd can be 0
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL 24/48] ivshmem: shmfd can be 0 |
Date: |
Tue, 6 Oct 2015 21:19:20 +0200 |
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>
Reviewed-by: Claudio Fontana <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 0ccf932..d3d0204 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);
--
2.4.3
- [Qemu-devel] [PULL 00/48] ivshmem series, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 12/48] ivshmem: simplify around increase_dynamic_storage(), marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 39/48] qtest: add qtest_add_abrt_handler(), marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 24/48] ivshmem: shmfd can be 0,
marcandre . lureau <=
- [Qemu-devel] [PULL 45/48] ivshmem: remove EventfdEntry.vector, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 43/48] ivshmem: use qemu_strtosz(), marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 19/48] ivshmem: print error on invalid peer id, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 34/48] ivshmem-server: fix hugetlbfs support, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 11/48] ivshmem: limit maximum number of peers to G_MAXUINT16, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 32/48] ivshmem-client: check the number of vectors, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 13/48] ivshmem: allocate eventfds in resize_peers(), marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 05/48] ivshmem: factor out the incoming fifo handling, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 08/48] ivshmem: remove useless doorbell field, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 14/48] ivshmem: remove useless ivshmem_update_irq() val argument, marcandre . lureau, 2015/10/08