From patchwork Tue Oct 6 19:19:20 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: 526931 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:4830:134:3::10]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 89A35140D89 for ; Wed, 7 Oct 2015 06:27:22 +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=kLXL0Vc2; dkim-atps=neutral Received: from lists.gnu.org ([208.118.235.17]:58400) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXtQ-0007oK-2U for incoming@patchwork.ozlabs.org; Tue, 06 Oct 2015 15:27:20 -0400 Received: from localhost ([::1]:53349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXtP-0001Mw-QE for incoming@patchwork.ozlabs.org; Tue, 06 Oct 2015 15:27:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXoI-0001lB-7p for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:22:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjXnY-0005GY-VN for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:22:02 -0400 Received: from mail-qg0-x233.google.com ([2607:f8b0:400d:c04::233]:36810) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXnW-0005Aa-Qt for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:21:15 -0400 Received: by qgx61 with SMTP id 61so184008592qgx.3 for ; Tue, 06 Oct 2015 12:21:14 -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=kLXL0Vc2LimxQBULHV8CiyO7jgX6Dy9JUxXspvjS9jhb+Hy0Ti3AGwWQJibc6v6Bzt pY3z6ywkrqCtDhz2ab10FZXC1jRnjZMDoVFEuyvcDVowEXwg1gJKYunKbjXLwppUGwFk sjlGFcygcn4npPeqoT2K+hVotC8ue9GxAPlfXSKP6OMVOGdTnhaF9Ffoq42TZhwh4JY1 XUmgjztBy6HGOoNjRXgGpH3vikpeb0ZvEPw/lWdXZF2djr476z4z1c8VyKq4UdqITqro 58rLhkZeliQZpGMIIeSQtfcYZgZLuRCrkU59Kxudcy/WxlowA60NJcpg8kvp3PAS5R8I wYYA== X-Received: by 10.140.235.84 with SMTP id g81mr51609402qhc.75.1444159274383; Tue, 06 Oct 2015 12:21:14 -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 u70sm6104631qku.18.2015.10.06.12.21.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 12:21:13 -0700 (PDT) From: marcandre.lureau@redhat.com To: peter.maydell@linaro.org Date: Tue, 6 Oct 2015 21:19:20 +0200 Message-Id: <1444159184-18153-25-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1444159184-18153-1-git-send-email-marcandre.lureau@redhat.com> References: <1444159184-18153-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:400d:c04::233 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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);