From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgG4-00069Q-Jc for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:47:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlgG3-0002U3-N6 for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:47:32 -0400 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]:34292) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgG3-0002Tt-Ir for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:47:31 -0400 Received: by padhy16 with SMTP id hy16so158278459pad.1 for ; Mon, 12 Oct 2015 09:47:31 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Mon, 12 Oct 2015 18:41:19 +0200 Message-Id: <1444668104-22955-26-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> References: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL v2 25/50] ivshmem: shmfd can be 0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, drjones@redhat.com, claudio.fontana@huawei.com, stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com, cam@cs.ualberta.ca From: Marc-André Lureau 0 is a valid fd value, so change conditions and set -1 value early Signed-off-by: Marc-André Lureau Reviewed-by: Claudio Fontana --- 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