Merge remote-tracking branch 'bonzini/nbd-next' into staging

* bonzini/nbd-next: nbd: Fix uninitialised use of s->sock
2012-04-26 15:22:07 -05:00 · 2012-04-26 15:22:07 -05:00 · a75bfc5fdd
parent f5eef2cf66 b3adf53a3a
commit a75bfc5fdd
1 changed files with 1 additions and 1 deletions
--- a/block/nbd.c
+++ b/block/nbd.c
@ -284,7 +284,7 @@ static int nbd_establish_connection(BlockDriverState *bs)
    /* Now that we're connected, set the socket to be non-blocking and
     * kick the reply mechanism.  */
    socket_set_nonblock(sock);
-    qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, NULL,
+    qemu_aio_set_fd_handler(sock, nbd_reply_ready, NULL,
                            nbd_have_request, s);

    s->sock = sock;