From patchwork Fri Oct 2 19:09:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 525759 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BBBDD140D7E for ; Sat, 3 Oct 2015 05:38:18 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=BkPLhdgO; dkim-atps=neutral Received: from localhost ([::1]:34727 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi69o-0006jQ-JT for incoming@patchwork.ozlabs.org; Fri, 02 Oct 2015 15:38:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi5j9-0007cY-EZ for qemu-devel@nongnu.org; Fri, 02 Oct 2015 15:10:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zi5j4-0007iS-3x for qemu-devel@nongnu.org; Fri, 02 Oct 2015 15:10:43 -0400 Received: from mail-wi0-x232.google.com ([2a00:1450:400c:c05::232]:33135) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi5j3-0007h4-HK for qemu-devel@nongnu.org; Fri, 02 Oct 2015 15:10:37 -0400 Received: by wiclk2 with SMTP id lk2so46717198wic.0 for ; Fri, 02 Oct 2015 12:10:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=6/z8nVVHgaZ0UUTVtrg2Z5r0LB68Ukx8wGZIWvpslFM=; b=BkPLhdgO0yACVGaABUJB/YUdJwYRZZH46wr9/uCAlXbngE1FK1+nmwpV9iSt5JcfmI f0gXB8out26bOGv6yiTzf4Ge0tnk9ja7NwwDMSEvEQ6V/PkKlwFbEgqhT1Sf8yLs6kfT RKr6oTenymqGlSe06Tk83lO/DSqpFbVAzy+4Qrf/9pkdpQFVk+GYBvReRt2frfy/Gnxk swM7iPdIoRy6IHEYLxfdD21LmLojG4iL4OgwzGa7ZhXqqxKpI9HlItQZ1RNLzM+n6E9D 5RRox9cwvVoQ+cHmZc3OM+S/VSK063T2XWZQXGR68VWXBXr1i0qGak/howx1YC58H6Z0 GtOg== X-Received: by 10.180.87.102 with SMTP id w6mr495040wiz.88.1443813036598; Fri, 02 Oct 2015 12:10:36 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id bu19sm12660451wjb.45.2015.10.02.12.10.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Oct 2015 12:10:35 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Fri, 2 Oct 2015 21:09:27 +0200 Message-Id: <1443812991-17356-25-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1443812991-17356-1-git-send-email-marcandre.lureau@redhat.com> References: <1443812991-17356-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::232 Cc: 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 Subject: [Qemu-devel] [PATCH v5 24/48] ivshmem: shmfd can be 0 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);