[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL v2 07/50] nbd: client_close on error in nbd_co_client
From: |
Max Reitz |
Subject: |
[Qemu-block] [PULL v2 07/50] nbd: client_close on error in nbd_co_client_start |
Date: |
Tue, 2 Feb 2016 18:35:00 +0100 |
Use client_close() if an error in nbd_co_client_start() occurs instead
of manually inlining parts of it. This fixes an assertion error on the
server side if nbd_negotiate() fails.
Signed-off-by: Max Reitz <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
nbd/server.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 256feaf..7fa7f53 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -1082,8 +1082,7 @@ static coroutine_fn void nbd_co_client_start(void *opaque)
nbd_export_get(exp);
}
if (nbd_negotiate(data)) {
- shutdown(client->sock, 2);
- client->close(client);
+ client_close(client);
goto out;
}
qemu_co_mutex_init(&client->send_lock);
--
2.7.0
- [Qemu-block] [PULL v2 00/50] Block patches, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 01/50] block: Add blk_dev_has_tray(), Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 02/50] blockdev: Fix 'change' for slot devices, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 04/50] block/qapi: Emit tray_open only if there is a tray, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 03/50] Revert "hw/block/fdc: Implement tray status", Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 05/50] vmdk: Fix converting to streamOptimized, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 06/50] iotests: Limit supported formats for 118, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 07/50] nbd: client_close on error in nbd_co_client_start,
Max Reitz <=
- [Qemu-block] [PULL v2 08/50] iotests: Rename filter_nbd to _filter_nbd in 083, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 09/50] iotests: Change coding style of _filter_nbd in 083, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 11/50] iotests: Make _filter_nbd drop log lines, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 10/50] iotests: Move _filter_nbd into common.filter, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 12/50] iotests: Make _filter_nbd support more URL types, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 13/50] iotests: Make redirecting qemu's stderr optional, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 14/50] iotests: Add test for a nonexistent NBD export, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 16/50] block: Release named dirty bitmaps in bdrv_close(), Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 15/50] block: Remove unused struct definition BlockFinishData, Max Reitz, 2016/02/02
- [Qemu-block] [PULL v2 17/50] iotests: Add test for eject under NBD server, Max Reitz, 2016/02/02