diff options
| author | Markus Armbruster | 2016-03-15 19:34:30 +0100 |
|---|---|---|
| committer | Markus Armbruster | 2016-03-21 21:29:00 +0100 |
| commit | 71c265816dd2772f89ebb377381c836dfca09d70 (patch) | |
| tree | edcd0d6652cf93e454cbb0fa511d1d8ab74b2d23 /hw | |
| parent | ivshmem: Drop ivshmem_event() stub (diff) | |
| download | qemu-71c265816dd2772f89ebb377381c836dfca09d70.tar.gz qemu-71c265816dd2772f89ebb377381c836dfca09d70.tar.xz qemu-71c265816dd2772f89ebb377381c836dfca09d70.zip | |
ivshmem: Don't destroy the chardev on version mismatch
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 <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1458066895-20632-16-git-send-email-armbru@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/misc/ivshmem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 8356399092..0ac0238c7f 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 != -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; } |