diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-26 15:22:07 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-26 15:22:07 -0500 |
| commit | a75bfc5fdda8b87ff969d68e020ffdf1008751b1 (patch) | |
| tree | 0bdf76fd66aff0442170594a47f7d24a54e65244 | |
| parent | f5eef2cf66f3c343c0a529fa10ae0ba2b5da855d (diff) | |
| parent | b3adf53a3a10a1ca8347167907e4cf8bbd0204f1 (diff) | |
Merge remote-tracking branch 'bonzini/nbd-next' into staging
* bonzini/nbd-next:
nbd: Fix uninitialised use of s->sock
| -rw-r--r-- | block/nbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/nbd.c b/block/nbd.c index 56dbf6ef86..1212614223 100644 --- 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; |