From patchwork Fri Jun 26 14:49:29 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: 488861 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 0426C140285 for ; Sat, 27 Jun 2015 00:59:38 +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=a7cy2kTH; dkim-atps=neutral Received: from localhost ([::1]:60493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8V6N-0003AU-Sh for incoming@patchwork.ozlabs.org; Fri, 26 Jun 2015 10:59:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8UyA-0005Hk-Vd for qemu-devel@nongnu.org; Fri, 26 Jun 2015 10:51:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z8Uy5-0002Nu-Sy for qemu-devel@nongnu.org; Fri, 26 Jun 2015 10:51:06 -0400 Received: from mail-qg0-x235.google.com ([2607:f8b0:400d:c04::235]:36205) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8Uy5-0002Nf-O0 for qemu-devel@nongnu.org; Fri, 26 Jun 2015 10:51:01 -0400 Received: by qgal13 with SMTP id l13so35915159qga.3 for ; Fri, 26 Jun 2015 07:51:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=Zx8A8LvDkhgmreGBzCjGMHJtA03mrZfWuY7GBYrmXik=; b=a7cy2kTHyfYjZXoQyf4FUw2TPidWvvybXFqHCkB1fTsbp+8cFzjzHB/KPIwMqqW2K+ RpBF9YqQp0wtbIoE29dZFlsy6lhLAvU3AU86E7uIZJ6CbEyehRC1il0hYn8S5tZ9wDdY FE0iLPkdagg/JjlHv51b5wVHT872ltXdlljyRmtlh+xl0DmjQUxvEx10izwHBOA+u8yV tIFnRZr1hHrAEyXmpSNK6kSmvpuYlXZ67W07Y0SdFYHAPYirfv/SiuDYm/ARGJdDHztf 0EPqKqOdtWrbcngER/qQGO2OymcgifDH6LCMoLhM4pepWDw9jiRkBOBo8qm/98MPn3At Fw8A== X-Received: by 10.55.16.100 with SMTP id a97mr4663513qkh.8.1435330261300; Fri, 26 Jun 2015 07:51:01 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by mx.google.com with ESMTPSA id c38sm6970134qgd.33.2015.06.26.07.51.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jun 2015 07:51:00 -0700 (PDT) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 26 Jun 2015 16:49:29 +0200 Message-Id: <1435330185-23248-24-git-send-email-marcandre.lureau@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1435330185-23248-1-git-send-email-marcandre.lureau@gmail.com> References: <1435330185-23248-1-git-send-email-marcandre.lureau@gmail.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::235 Cc: cam@cs.ualberta.ca, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , stefanha@redhat.com Subject: [Qemu-devel] [PATCH 23/39] 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 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 199086d..9085f7c 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; @@ -664,6 +664,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 { @@ -708,8 +710,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);