From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8UyA-0005Hk-Vd for qemu-devel@nongnu.org; Fri, 26 Jun 2015 10:51:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z8Uy5-0002Nu-Sy for qemu-devel@nongnu.org; Fri, 26 Jun 2015 10:51:06 -0400 Received: from mail-qg0-x235.google.com ([2607:f8b0:400d:c04::235]:36205) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8Uy5-0002Nf-O0 for qemu-devel@nongnu.org; Fri, 26 Jun 2015 10:51:01 -0400 Received: by qgal13 with SMTP id l13so35915159qga.3 for ; Fri, 26 Jun 2015 07:51:01 -0700 (PDT) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Fri, 26 Jun 2015 16:49:29 +0200 Message-Id: <1435330185-23248-24-git-send-email-marcandre.lureau@gmail.com> In-Reply-To: <1435330185-23248-1-git-send-email-marcandre.lureau@gmail.com> References: <1435330185-23248-1-git-send-email-marcandre.lureau@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 23/39] ivshmem: shmfd can be 0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: cam@cs.ualberta.ca, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , stefanha@redhat.com 0 is a valid fd value, so change conditions and set -1 value early Signed-off-by: Marc-André Lureau --- 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