From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agxmK-0006ZG-Fm for qemu-devel@nongnu.org; Fri, 18 Mar 2016 13:01:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agxmI-00085b-Ir for qemu-devel@nongnu.org; Fri, 18 Mar 2016 13:01:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48581) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agxmI-00085F-Cp for qemu-devel@nongnu.org; Fri, 18 Mar 2016 13:01:34 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id F348D64D05 for ; Fri, 18 Mar 2016 17:01:33 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2IH1WCG009465 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 18 Mar 2016 13:01:33 -0400 From: Markus Armbruster Date: Fri, 18 Mar 2016 18:01:02 +0100 Message-Id: <1458320487-19603-16-git-send-email-armbru@redhat.com> In-Reply-To: <1458320487-19603-1-git-send-email-armbru@redhat.com> References: <1458320487-19603-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 15/40] ivshmem: Don't destroy the chardev on version mismatch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Yes, the chardev is commonly useless after we read a bad version from it, but destroying it is inappropriate anyway: the user created it, so the user should be able to hold on to it as long as he likes. We don't destroy it on other errors. Screwed up in commit 5105b1d. Stop reading instead. Also note QEMU's behavior in ivshmem-spec.txt. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <1458066895-20632-16-git-send-email-armbru@redhat.com> --- docs/specs/ivshmem-spec.txt | 3 +++ hw/misc/ivshmem.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/specs/ivshmem-spec.txt b/docs/specs/ivshmem-spec.txt index 0e9185a..0cd63ad 100644 --- a/docs/specs/ivshmem-spec.txt +++ b/docs/specs/ivshmem-spec.txt @@ -187,6 +187,9 @@ Each message consists of a single 8 byte little-endia= n signed number, and may be accompanied by a file descriptor via SCM_RIGHTS. Both client and server close the connection on error. =20 +Note: QEMU currently doesn't close the connection right on error, but +only when the character device is destroyed. + On connect, the server sends the following messages in order: =20 1. The protocol version number, currently zero. The client should diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 8356399..0ac0238 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -708,8 +708,7 @@ static void ivshmem_check_version(void *opaque, const= uint8_t * buf, int size) if (tmp !=3D -1 || version !=3D IVSHMEM_PROTOCOL_VERSION) { fprintf(stderr, "incompatible version, you are connecting to a i= vshmem-" "server using a different protocol please check your set= up\n"); - qemu_chr_delete(s->server_chr); - s->server_chr =3D NULL; + qemu_chr_add_handlers(s->server_chr, NULL, NULL, NULL, s); return; } =20 --=20 2.4.3