[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 23/45] ivshmem: shmfd can be 0
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 23/45] ivshmem: shmfd can be 0 |
Date: |
Tue, 28 Jul 2015 02:32:35 +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>
---
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 199086d..9085f7c 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;
@@ -664,6 +664,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 {
@@ -708,8 +710,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] [PATCH v2 13/45] ivshmem: initialize max_peer to -1, (continued)
- [Qemu-devel] [PATCH v2 13/45] ivshmem: initialize max_peer to -1, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 14/45] ivshmem: remove max_peer field, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 15/45] ivshmem: improve debug messages, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 16/45] ivshmem: improve error, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 18/45] ivshmem: add a warning if eventfd value is 0, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 17/45] ivshmem: print error on invalid peer id, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 19/45] ivshmem: beautify a bit the code, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 20/45] ivshmem: use common return, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 21/45] ivshmem: use common is_power_of_2(), Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 22/45] ivshmem: migrate with VMStateDescription, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 23/45] ivshmem: shmfd can be 0,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 24/45] ivshmem: check shm isn't already initialized, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 25/45] ivshmem: add device description, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 26/45] ivshmem: fix pci_ivshmem_exit(), Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 27/45] ivshmem: replace 'guest' for 'peer' appropriately, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 28/45] ivshmem: error on too many eventfd received, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 29/45] ivshmem: reset mask on device reset, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 31/45] ivshmem-client: check the number of vectors, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 32/45] ivshmem-server: use a uint16 for client ID, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 30/45] contrib: add ivshmem client and server, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 33/45] ivshmem-server: fix hugetlbfs support, Marc-André Lureau, 2015/07/27