From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF6fP-0007Tb-BG for qemu-devel@nongnu.org; Fri, 21 Sep 2012 13:05:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF6fN-0008Mc-Fl for qemu-devel@nongnu.org; Fri, 21 Sep 2012 13:05:27 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:43020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF6fN-0008KE-9V for qemu-devel@nongnu.org; Fri, 21 Sep 2012 13:05:25 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so8110795pbb.4 for ; Fri, 21 Sep 2012 10:05:25 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 21 Sep 2012 19:04:58 +0200 Message-Id: <1348247106-27936-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1348247106-27936-1-git-send-email-pbonzini@redhat.com> References: <1348247106-27936-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/9] migration: unify stdio-based QEMUFile operations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: quintela@redhat.com Now that qemu_fseek does not exist anymore, there is no reason to do an fseek before fread/fwrite when operating on an stdio file. Thus, unify the get/put_buffer callbacks used by qemu_fopen with those used for pipes. Signed-off-by: Paolo Bonzini --- savevm.c | 19 ++----------------- 1 file modificato, 2 inserzioni(+), 17 rimozioni(-) diff --git a/savevm.c b/savevm.c index 2ea1fa6..5cd4432 100644 --- a/savevm.c +++ b/savevm.c @@ -342,21 +342,6 @@ QEMUFile *qemu_fopen_socket(int fd) return s->file; } -static int file_put_buffer(void *opaque, const uint8_t *buf, - int64_t pos, int size) -{ - QEMUFileStdio *s = opaque; - fseek(s->stdio_file, pos, SEEK_SET); - return fwrite(buf, 1, size, s->stdio_file); -} - -static int file_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size) -{ - QEMUFileStdio *s = opaque; - fseek(s->stdio_file, pos, SEEK_SET); - return fread(buf, 1, size, s->stdio_file); -} - QEMUFile *qemu_fopen(const char *filename, const char *mode) { QEMUFileStdio *s; @@ -375,10 +360,10 @@ QEMUFile *qemu_fopen(const char *filename, const char *mode) goto fail; if(mode[0] == 'w') { - s->file = qemu_fopen_ops(s, file_put_buffer, NULL, stdio_fclose, + s->file = qemu_fopen_ops(s, stdio_put_buffer, NULL, stdio_fclose, NULL, NULL, NULL); } else { - s->file = qemu_fopen_ops(s, NULL, file_get_buffer, stdio_fclose, + s->file = qemu_fopen_ops(s, NULL, stdio_get_buffer, stdio_fclose, NULL, NULL, NULL); } return s->file; -- 1.7.12