[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/38] ivshmem: Don't destroy the chardev on version
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 13/38] ivshmem: Don't destroy the chardev on version mismatch |
Date: |
Mon, 29 Feb 2016 19:40:29 +0100 |
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 <address@hidden>
---
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 0835ba1..4fc6f37 100644
--- a/docs/specs/ivshmem-spec.txt
+++ b/docs/specs/ivshmem-spec.txt
@@ -188,6 +188,9 @@ Each message consists of a single 8 byte little-endian
signed number,
and may be accompanied by a file descriptor via SCM_RIGHTS. Both
client and server close the connection on error.
+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:
1. The protocol version number, currently zero. The client should
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 7119a07..2850e8a 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -707,8 +707,7 @@ static void ivshmem_check_version(void *opaque, const
uint8_t * buf, int size)
if (tmp != -1 || version != IVSHMEM_PROTOCOL_VERSION) {
fprintf(stderr, "incompatible version, you are connecting to a
ivshmem-"
"server using a different protocol please check your setup\n");
- qemu_chr_delete(s->server_chr);
- s->server_chr = NULL;
+ qemu_chr_add_handlers(s->server_chr, NULL, NULL, NULL, s);
return;
}
--
2.4.3
- [Qemu-devel] [PATCH 11/38] ivshmem: Clean up after commit 9940c32, (continued)
- [Qemu-devel] [PATCH 11/38] ivshmem: Clean up after commit 9940c32, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 12/38] ivshmem: Drop ivshmem_event() stub, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 05/38] ivshmem-test: Improve test case /ivshmem/single, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 15/38] ivshmem: Failed realize() can leave migration blocker behind, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 14/38] ivshmem: Fix harmless misuse of Error, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 10/38] ivshmem: Compile debug prints unconditionally to prevent bit-rot, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 22/38] ivshmem: Plug leaks on unplug, fix peer disconnect, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 06/38] ivshmem-test: Clean up wait for devices to become operational, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 16/38] ivshmem: Clean up register callbacks, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 03/38] event_notifier: Make event_notifier_init_fd() #ifdef CONFIG_EVENTFD, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 13/38] ivshmem: Don't destroy the chardev on version mismatch,
Markus Armbruster <=
- [Qemu-devel] [PATCH 21/38] ivshmem: Disentangle ivshmem_read(), Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 32/38] qdev: New DEFINE_PROP_ON_OFF_AUTO, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 26/38] ivshmem: Drop the hackish test for UNIX domain chardev, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 19/38] ivshmem: Assert interrupts are set up once, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 28/38] ivshmem: Tighten check of property "size", Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 30/38] ivshmem: Simplify memory regions for BAR 2 (shared memory), Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 38/38] contrib/ivshmem-server: Print "not for production" warning, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 25/38] ivshmem: Rely on server sending the ID right after the version, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 04/38] tests/libqos/pci-pc: Fix qpci_pc_iomap() to map BARs aligned, Markus Armbruster, 2016/02/29
- [Qemu-devel] [PATCH 08/38] ivshmem: Rewrite specification document, Markus Armbruster, 2016/02/29