From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40692) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcAxe-00005R-1f for qemu-devel@nongnu.org; Wed, 16 Sep 2015 07:33:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZcAxZ-0000pW-8d for qemu-devel@nongnu.org; Wed, 16 Sep 2015 07:33:13 -0400 Received: from lhrrgout.huawei.com ([194.213.3.17]:62487) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcAxY-0000ou-Rq for qemu-devel@nongnu.org; Wed, 16 Sep 2015 07:33:09 -0400 References: <1442333283-13119-1-git-send-email-marcandre.lureau@redhat.com> <1442333283-13119-25-git-send-email-marcandre.lureau@redhat.com> From: Claudio Fontana Message-ID: <55F9536D.4070301@huawei.com> Date: Wed, 16 Sep 2015 13:33:01 +0200 MIME-Version: 1.0 In-Reply-To: <1442333283-13119-25-git-send-email-marcandre.lureau@redhat.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v3 24/46] ivshmem: shmfd can be 0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org Cc: drjones@redhat.com, cam@cs.ualberta.ca, stefanha@redhat.com On 15.09.2015 18:07, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > 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 14c7d58..c80503d 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; > @@ -663,6 +663,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 { > @@ -707,8 +709,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); > > Reviewed-by: Claudio Fontana