From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sym4x-0001Zn-Fq for qemu-devel@nongnu.org; Tue, 07 Aug 2012 11:52:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sym4t-0005Ib-8d for qemu-devel@nongnu.org; Tue, 07 Aug 2012 11:52:19 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:42042) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sym4t-0005GN-2c for qemu-devel@nongnu.org; Tue, 07 Aug 2012 11:52:15 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so7076664pbb.4 for ; Tue, 07 Aug 2012 08:52:14 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 7 Aug 2012 17:51:45 +0200 Message-Id: <1344354707-27315-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1344354707-27315-1-git-send-email-pbonzini@redhat.com> References: <1344354707-27315-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 4/6] migration: remove iohandlers before closing the file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: owasserm@redhat.com, quintela@redhat.com This will be needed as soon as process_incoming_migration will set handlers on the file. The patch may be removed if Signed-off-by: Paolo Bonzini --- savevm.c | 3 +++ 1 file modificato, 3 inserzioni(+) diff --git a/savevm.c b/savevm.c index 57cae52..8f075e5 100644 --- a/savevm.c +++ b/savevm.c @@ -210,6 +210,7 @@ static int socket_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size) static int socket_close(void *opaque) { QEMUFileSocket *s = opaque; + qemu_set_fd_handler(s->fd, NULL, NULL, NULL); close(s->fd); g_free(s); return 0; @@ -238,6 +239,7 @@ static int stdio_pclose(void *opaque) { QEMUFileStdio *s = opaque; int ret; + qemu_set_fd_handler(fileno(s->stdio_file), NULL, NULL, NULL); ret = pclose(s->stdio_file); if (ret == -1) { ret = -errno; @@ -250,6 +252,7 @@ static int stdio_fclose(void *opaque) { QEMUFileStdio *s = opaque; int ret = 0; + qemu_set_fd_handler(fileno(s->stdio_file), NULL, NULL, NULL); if (fclose(s->stdio_file) == EOF) { ret = -errno; } -- 1.7.11.2