The Thursday 28 Aug 2014 à 18:27:55 (+0800), Liu Yuan wrote : > We should reinit local_err as NULL inside the while loop or g_free() will > report > corrupption and abort the QEMU when sheepdog driver tries reconnecting. > > This was broken in commit 356b4ca. > > qemu-system-x86_64: failed to get the header, Resource temporarily unavailable > qemu-system-x86_64: Failed to connect to socket: Connection refused > qemu-system-x86_64: (null) > [xcb] Unknown sequence number while awaiting reply > [xcb] Most likely this is a multi-threaded client and XInitThreads has not > been called > [xcb] Aborting, sorry about that. > qemu-system-x86_64: ../../src/xcb_io.c:298: poll_for_response: Assertion > `!xcb_xlib_threads_sequence_lost' failed. > Aborted (core dumped) > > Cc: qemu-devel@nongnu.org > Cc: Markus Armbruster <arm...@redhat.com> > Cc: Kevin Wolf <kw...@redhat.com> > Cc: Stefan Hajnoczi <stefa...@redhat.com> > Reviewed-by: Markus Armbruster <arm...@redhat.com> > Signed-off-by: Liu Yuan <namei.u...@gmail.com> > --- > block/sheepdog.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/block/sheepdog.c b/block/sheepdog.c > index 12cbd9d..53c24d6 100644 > --- a/block/sheepdog.c > +++ b/block/sheepdog.c > @@ -712,7 +712,6 @@ static void coroutine_fn > send_pending_req(BDRVSheepdogState *s, uint64_t oid) > > static coroutine_fn void reconnect_to_sdog(void *opaque) > { > - Error *local_err = NULL; > BDRVSheepdogState *s = opaque; > AIOReq *aio_req, *next; > > @@ -727,6 +726,7 @@ static coroutine_fn void reconnect_to_sdog(void *opaque) > > /* Try to reconnect the sheepdog server every one second. */ > while (s->fd < 0) { > + Error *local_err = NULL; > s->fd = get_sheep_fd(s, &local_err); > if (s->fd < 0) { > DPRINTF("Wait for connection to be established\n"); > -- > 1.9.1 > >
I am not a sheepdog expert but from the code it looks good. Reviewed-by: Benoît Canet <benoit.ca...@nodalink.com>