]> git.proxmox.com Git - mirror_qemu.git/commit - qemu-nbd.c
nbd: Always call "close_fn" in nbd_client_new
authorFam Zheng <famz@redhat.com>
Thu, 14 Jan 2016 08:41:01 +0000 (16:41 +0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 15 Jan 2016 17:58:01 +0000 (18:58 +0100)
commitee7d7aabdaea4484e069cb99c9fc54e8cb24b56f
treeda85bcfd0c1092c266629d6afd9d75d59c98eea0
parente1dc68155cafabfd6a065391f7826d5d0992b46e
nbd: Always call "close_fn" in nbd_client_new

Rename the parameter "close" to "close_fn" to disambiguous with
close(2).

This unifies error handling paths of NBDClient allocation:
nbd_client_new will shutdown the socket and call the "close_fn" callback
if negotiation failed, so the caller don't need a different path than
the normal close.

The returned pointer is never used, make it void in preparation for the
next patch.

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <1452760863-25350-2-git-send-email-famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
blockdev-nbd.c
include/block/nbd.h
nbd.c
qemu-nbd.c