From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXuuM-0004Ys-E9 for qemu-devel@nongnu.org; Mon, 12 Nov 2012 09:22:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TXuuJ-0003oR-47 for qemu-devel@nongnu.org; Mon, 12 Nov 2012 09:22:38 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:64449) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXuuI-0003mX-Tl for qemu-devel@nongnu.org; Mon, 12 Nov 2012 09:22:35 -0500 Received: by mail-pa0-f45.google.com with SMTP id fb10so4204030pad.4 for ; Mon, 12 Nov 2012 06:22:34 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 12 Nov 2012 15:22:04 +0100 Message-Id: <1352730127-32685-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1352730127-32685-1-git-send-email-pbonzini@redhat.com> References: <1352730127-32685-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 4/7] nbd: fix nbd_server_stop crash when no server was running List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com This failed on the new assertion of qemu_set_fd_handler2: qemu-system-x86_64: /home/pbonzini/work/upstream/qemu/iohandler.c:60: qemu_set_fd_handler2: Assertion `fd >= 0' failed. Signed-off-by: Paolo Bonzini --- blockdev-nbd.c | 8 +++++--- 1 file modificato, 5 inserzioni(+), 3 rimozioni(-) diff --git a/blockdev-nbd.c b/blockdev-nbd.c index 8031813..274fba6 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -113,7 +113,9 @@ void qmp_nbd_server_stop(Error **errp) nbd_close_notifier(&cn->n, nbd_export_get_blockdev(cn->exp)); } - qemu_set_fd_handler2(server_fd, NULL, NULL, NULL, NULL); - close(server_fd); - server_fd = -1; + if (server_fd != -1) { + qemu_set_fd_handler2(server_fd, NULL, NULL, NULL, NULL); + close(server_fd); + server_fd = -1; + } } -- 1.7.12.1