From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sym4y-0001bV-0i for qemu-devel@nongnu.org; Tue, 07 Aug 2012 11:52:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sym4w-0005J2-V7 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 1Sym4w-0005GN-Os for qemu-devel@nongnu.org; Tue, 07 Aug 2012 11:52:18 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so7076664pbb.4 for ; Tue, 07 Aug 2012 08:52:18 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 7 Aug 2012 17:51:46 +0200 Message-Id: <1344354707-27315-6-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 5/6] migration: handle EAGAIN while reading QEMUFile 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 never happen right now (the assertion would fail). The next patch will set the socket or pipe in non-blocking mode, thus enabling this part of the code. Signed-off-by: Paolo Bonzini --- savevm.c | 30 ++++++++++++++++++++++++------ 1 file modificato, 24 inserzioni(+), 6 rimozioni(-) diff --git a/savevm.c b/savevm.c index 8f075e5..336b53b 100644 --- a/savevm.c +++ b/savevm.c @@ -197,13 +197,22 @@ static int socket_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size) QEMUFileSocket *s = opaque; ssize_t len; - do { + for (;;) { len = qemu_recv(s->fd, buf, size, 0); - } while (len == -1 && socket_error() == EINTR); + if (len != -1) { + break; + } + if (errno == EAGAIN) { + assert(qemu_in_coroutine()); + qemu_coroutine_yield(); + } else if (errno != EINTR) { + break; + } + } - if (len == -1) + if (len == -1) { len = -socket_error(); - + } return len; } @@ -228,10 +237,19 @@ static int stdio_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size) FILE *fp = s->stdio_file; int bytes; - do { + for (;;) { clearerr(fp); bytes = fread(buf, 1, size, fp); - } while ((bytes == 0) && ferror(fp) && (errno == EINTR)); + if (bytes != 0 || !ferror(fp)) { + break; + } + if (errno == EAGAIN) { + assert(qemu_in_coroutine()); + qemu_coroutine_yield(); + } else if (errno != EINTR) { + break; + } + } return bytes; } -- 1.7.11.2