nbd: Pass return value from nbd_handle_list()

While it does not make a difference in practice, nbd_receive_options()
generally returns -errno, so it should do that here as well; and the
easiest way to achieve this is by passing on the value returned by
nbd_handle_list().

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <1424887718-10800-7-git-send-email-mreitz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Max Reitz 2015-02-25 13:08:19 -05:00 committed by Paolo Bonzini
parent 2b1f13b996
commit 892f5a5270

7
nbd.c
View File

@ -351,7 +351,7 @@ fail:
static int nbd_receive_options(NBDClient *client)
{
while (1) {
int csock = client->sock;
int csock = client->sock, ret;
uint32_t tmp, length;
uint64_t magic;
@ -398,8 +398,9 @@ static int nbd_receive_options(NBDClient *client)
TRACE("Checking option");
switch (be32_to_cpu(tmp)) {
case NBD_OPT_LIST:
if (nbd_handle_list(client, length) < 0) {
return 1;
ret = nbd_handle_list(client, length);
if (ret < 0) {
return ret;
}
break;