qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH] char: fix avail_connections init in qemu_chr_open_e


From: David Marchand
Subject: [Qemu-devel] [PATCH] char: fix avail_connections init in qemu_chr_open_eventfd()
Date: Wed, 11 Jun 2014 15:39:04 +0200

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 <address@hidden>
---
 qemu-char.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


No change since initial patch: http://patchwork.ozlabs.org/patch/316785/
I just rebased this patch on top of master branch and removed the [RFC] part.


-- 
David Marchand

diff --git a/qemu-char.c b/qemu-char.c
index 17b476e..7640f17 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2493,7 +2493,12 @@ 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
 
-- 
1.7.10.4




reply via email to

[Prev in Thread] Current Thread [Next in Thread]