[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 25/51] ivshmem: shmfd can be 0
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL v3 25/51] ivshmem: shmfd can be 0 |
Date: |
Tue, 13 Oct 2015 16:25:52 +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 v3 07/51] ivshmem: remove unnecessary dup(), (continued)
- [Qemu-devel] [PULL v3 07/51] ivshmem: remove unnecessary dup(), marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 10/51] ivshmem: more qdev conversion, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 11/51] ivshmem: remove last exit(1), marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 15/51] ivshmem: remove useless ivshmem_update_irq() val argument, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 18/51] ivshmem: improve debug messages, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 17/51] ivshmem: remove max_peer field, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 21/51] ivshmem: simplify a bit the code, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 23/51] ivshmem: use common is_power_of_2(), marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 22/51] ivshmem: use common return, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 19/51] ivshmem: improve error handling, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 25/51] ivshmem: shmfd can be 0,
marcandre . lureau <=
- [Qemu-devel] [PULL v3 20/51] ivshmem: print error on invalid peer id, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 26/51] ivshmem: check shm isn't already initialized, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 24/51] ivshmem: migrate with VMStateDescription, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 28/51] ivshmem: fix pci_ivshmem_exit(), marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 31/51] ivshmem: reset mask on device reset, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 35/51] ivshmem-server: use a uint16 for client ID, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 29/51] ivshmem: replace 'guest' for 'peer' appropriately, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 34/51] ivshmem-client: check the number of vectors, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 30/51] ivshmem: error on too many eventfd received, marcandre . lureau, 2015/10/13
- [Qemu-devel] [PULL v3 33/51] contrib: add ivshmem client and server, marcandre . lureau, 2015/10/13