From patchwork Mon Oct 12 16:41:19 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: 529230 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 6CA291400CB for ; Tue, 13 Oct 2015 04:00:02 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=J58je/gb; dkim-atps=neutral Received: from localhost ([::1]:56762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgS8-0001Xm-AU for incoming@patchwork.ozlabs.org; Mon, 12 Oct 2015 13:00:00 -0400 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) 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=J58je/gbjSWasIPj95i2VGU7hMtT7eU9jnI8n6PyaEId+mrdqnPWGegeV3NFP9E9om ACXgU7bjSgkTCZIcnvV3T0kp30mf9ZhHjlgvXsnYOJDhJcd9QryYcfOZMk6LEokuRRjZ bjbhEmKh86sFMNqWucqWQv9aRZcjAqRnMPkN223Toeozj7ckStxUcgB3vjgIkzsLobfQ OQ0Ls8J33FmFqKXquxg8IFYgQjrTteKayinQIo7Vy9qOHV4m0Zpejtr3JD5dTmpBXgYE afe6w0Uf8NlZwc8BbaOPJhq7bGmMz0DzMF2W6v5AnfQe9VkUurT0OlFr56fQnw1j2I8p Bprw== X-Received: by 10.66.119.135 with SMTP id ku7mr34995189pab.21.1444668451154; Mon, 12 Oct 2015 09:47:31 -0700 (PDT) Received: from localhost (APoitiers-257-1-35-234.w90-38.abo.wanadoo.fr. [90.38.210.234]) by smtp.gmail.com with ESMTPSA id zc4sm19314245pbb.24.2015.10.12.09.47.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 09:47:30 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Mon, 12 Oct 2015 18:41:19 +0200 Message-Id: <1444668104-22955-26-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 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 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::234 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 Subject: [Qemu-devel] [PULL v2 25/50] 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);