From patchwork Fri Jun 26 14:49:22 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: 488886 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 EC92F1400A0 for ; Sat, 27 Jun 2015 01:12:34 +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=VU9E3FUv; dkim-atps=neutral Received: from localhost ([::1]:60612 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8VIv-0000gD-1A for incoming@patchwork.ozlabs.org; Fri, 26 Jun 2015 11:12:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8Uxp-0004zx-SG for qemu-devel@nongnu.org; Fri, 26 Jun 2015 10:50:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z8Uxn-0002JM-Gc for qemu-devel@nongnu.org; Fri, 26 Jun 2015 10:50:45 -0400 Received: from mail-qk0-x22a.google.com ([2607:f8b0:400d:c09::22a]:33550) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8Uxn-0002JI-Ca for qemu-devel@nongnu.org; Fri, 26 Jun 2015 10:50:43 -0400 Received: by qkhu186 with SMTP id u186so56277374qkh.0 for ; Fri, 26 Jun 2015 07:50:43 -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=laH4GnPddhdG69nzEHR3yYSokGScwme4uzUpLqzHoVg=; b=VU9E3FUvzZWNlsj7+MwYttyK3dwzEOSs0f6yM6hIgGJXrY05pr1PXW/30xzFMPwIDD y7nhFk5v70dMy/dM8737UpN2TKwm6M8BW7vk3PnEctr64/hpEjE8oQqw9bbkqWq8m3ET VUL4GWpcxMT/QXKIHvXmZCrPtMb956D6mdxLv132MRwzpKvU2JFbATcixppiOXjPjBOU p0Re2i6Jp/Rz5eigHu4WM4/kToVri4//UDdxGGjCwDArOkPcv2J4iNGCoRKIbJEpRduU J6g4fguYb/k4VIuo53P58QVj9yP+pEkT4jN6CbEymKVRIEcO1mO7g/l/fNCISlKuiZ0y cL+w== X-Received: by 10.55.19.225 with SMTP id 94mr4466669qkt.37.1435330243062; Fri, 26 Jun 2015 07:50:43 -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 35sm6940599qkq.41.2015.06.26.07.50.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jun 2015 07:50:42 -0700 (PDT) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 26 Jun 2015 16:49:22 +0200 Message-Id: <1435330185-23248-17-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:c09::22a Cc: cam@cs.ualberta.ca, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , stefanha@redhat.com Subject: [Qemu-devel] [PATCH 16/39] ivshmem: improve error 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 The test whether the chardev is an AF_UNIX socket rejects "-chardev socket,id=chr0,path=/tmp/foo,server,nowait -device ivshmem,chardev=chr0", but fails to explain why. Use an explicit error on why a chardev may be rejected. Signed-off-by: Marc-André Lureau --- hw/misc/ivshmem.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 0cc5682..ab13f70 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -301,7 +301,7 @@ static CharDriverState* create_eventfd_chr_device(void * opaque, EventNotifier * chr = qemu_chr_open_eventfd(eventfd); if (chr == NULL) { - error_report("creating eventfd for eventfd %d failed", eventfd); + error_report("creating chardriver for eventfd %d failed", eventfd); return NULL; } qemu_chr_fe_claim_no_fail(chr); @@ -778,8 +778,12 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) attr |= PCI_BASE_ADDRESS_MEM_TYPE_64; } - if ((s->server_chr != NULL) && - (strncmp(s->server_chr->filename, "unix:", 5) == 0)) { + if (s->server_chr != NULL) { + if (strncmp(s->server_chr->filename, "unix:", 5)) { + error_setg(errp, "chardev is not a unix client socket"); + return; + } + /* if we get a UNIX socket as the parameter we will talk * to the ivshmem server to receive the memory region */