From patchwork Tue Aug 7 15:51:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 175675 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 69F682C00AB for ; Wed, 8 Aug 2012 01:52:39 +1000 (EST) Received: from localhost ([::1]:59950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sym5F-0001jk-Hv for incoming@patchwork.ozlabs.org; Tue, 07 Aug 2012 11:52:37 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=PR8dHWOSsMx4S39u5sMVddmQua3j+9/c+rvXl8YWtZM=; b=ATiWBiRaXEMBOEgtZKMlnySQI8XS2vV+GsWlnyCinDtNocwapsZ6PrVa3WjXyPyFZl LsvdI9fQbiHOdRRXWvXXc1RAo114frGNUI/wl+99SG+09g5DSud0E2wXm4j/uJ+sAQge a7heEflwv/J6j9uCHGLZNdRcuuGQGw3JVt5nuyxCU51OTRMqj8zj6p8tZXYRcbd8FBT6 ZkZjTZ+cpJORpu6vOdN91lI30xQ2+Bd4ESJsdQjBQ1IZEFDjzB3hnHTCEGa9DzBjOElg cExIK72Wom+LdyfBDjRlI1kvJTso33MEfekMt+KtWKdfKTHZ7YlqS22+j0vY9QfudRZJ BkZw== Received: by 10.68.224.161 with SMTP id rd1mr17052921pbc.133.1344354734660; Tue, 07 Aug 2012 08:52:14 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id op10sm7982776pbc.75.2012.08.07.08.52.11 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Aug 2012 08:52:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 7 Aug 2012 17:51:45 +0200 Message-Id: <1344354707-27315-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1344354707-27315-1-git-send-email-pbonzini@redhat.com> References: <1344354707-27315-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: owasserm@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 4/6] migration: remove iohandlers before closing the file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }