diff options
| author | David Marchand <david.marchand@6wind.com> | 2014-06-11 17:25:16 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2014-06-13 12:34:55 +0200 |
| commit | e9d21c436f716603b3844513ba890ac570e642e1 (patch) | |
| tree | a927678eb8eabf661bc6be99ccafe9ddd1e7eaa2 /qemu-char.c | |
| parent | 2a2c4830c0068d70443f3dddc4cc668f0c601b5c (diff) | |
| download | qemu-e9d21c436f716603b3844513ba890ac570e642e1.zip qemu-e9d21c436f716603b3844513ba890ac570e642e1.tar.gz qemu-e9d21c436f716603b3844513ba890ac570e642e1.tar.bz2 | |
char: fix avail_connections init in qemu_chr_open_eventfd()
When trying to use a ivshmem server with qemu, ivshmem init code tries to
create a CharDriverState object for each eventfd retrieved from the server.
To create this object, a call to qemu_chr_open_eventfd() is done.
Right after this, before adding a frontend, qemu_chr_fe_claim_no_fail() is
called.
qemu_chr_open_eventfd() does not set avail_connections to 1, so no frontend can
be associated because qemu_chr_fe_claim_no_fail() makes qemu stop right away.
This problem comes from 456d60692310e7ac25cf822cc1e98192ad636ece
"qemu-char: Call fe_claim / fe_release when not using qdev chr properties".
Fix this, by setting avail_connections to 1 in qemu_chr_open_eventfd().
Signed-off-by: David Marchand <david.marchand@6wind.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'qemu-char.c')
| -rw-r--r-- | qemu-char.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/qemu-char.c b/qemu-char.c index 4c04bbc..f918f90 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2493,7 +2493,13 @@ static gboolean tcp_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque) #ifndef _WIN32 CharDriverState *qemu_chr_open_eventfd(int eventfd) { - return qemu_chr_open_fd(eventfd, eventfd); + CharDriverState *chr = qemu_chr_open_fd(eventfd, eventfd); + + if (chr) { + chr->avail_connections = 1; + } + + return chr; } #endif |