yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-qemu_file-Fix-mismerge-of-use-fwrite-correctly.patch

0a122b
From 28c5321911bde483484eb95d0bef2e8e65a3593b Mon Sep 17 00:00:00 2001
0a122b
From: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
0a122b
Date: Mon, 10 Mar 2014 17:41:44 +0100
0a122b
Subject: [PATCH 16/16] qemu_file: Fix mismerge of "use fwrite() correctly"
0a122b
0a122b
RH-Author: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
0a122b
Message-id: <1394473304-7190-3-git-send-email-dgilbert@redhat.com>
0a122b
Patchwork-id: 58074
0a122b
O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 2/2] qemu_file: Fix mismerge of "use fwrite() correctly"
0a122b
Bugzilla: 1005103
0a122b
RH-Acked-by: Juan Quintela <quintela@redhat.com>
0a122b
RH-Acked-by: Eric Blake <eblake@redhat.com>
0a122b
RH-Acked-by: Amit Shah <amit.shah@redhat.com>
0a122b
0a122b
From: Markus Armbruster <armbru@redhat.com>
0a122b
0a122b
Reviewers accepted v2 of the patch, but what got committed was v1,
0a122b
with the R-bys for v2.  This is the v1->v2 followup fix.
0a122b
0a122b
[Amit:
0a122b
 This fixes commit aded6539d983280212e08d09f14157b1cb4d58cc
0a122b
]
0a122b
0a122b
Signed-off-by: Markus Armbruster <armbru@redhat.com>
0a122b
Reviewed-by: Eric Blake <eblake@redhat.com>
0a122b
Reviewed-by: Amit Shah <amit.shah@redhat.com>
0a122b
Signed-off-by: Amit Shah <amit.shah@redhat.com>
0a122b
Signed-off-by: Juan Quintela <quintela@redhat.com>
0a122b
(cherry picked from commit ac4df4e608e84da135eacecd7bba7c6e9e9a63b7)
0a122b
0a122b
Conflicts:
0a122b
	qemu-file.c
0a122b
was still in savevm.c
0a122b
---
0a122b
 savevm.c | 2 +-
0a122b
 1 file changed, 1 insertion(+), 1 deletion(-)
0a122b
0a122b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
0a122b
---
0a122b
 savevm.c |    2 +-
0a122b
 1 files changed, 1 insertions(+), 1 deletions(-)
0a122b
0a122b
diff --git a/savevm.c b/savevm.c
0a122b
index 94121a2..4d92a7b 100644
0a122b
--- a/savevm.c
0a122b
+++ b/savevm.c
0a122b
@@ -216,7 +216,7 @@ static int stdio_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, int s
0a122b
     res = fwrite(buf, 1, size, s->stdio_file);
0a122b
 
0a122b
     if (res != size) {
0a122b
-        return -EIO;	/* fake errno value */
0a122b
+        return -errno;
0a122b
     }
0a122b
     return res;
0a122b
 }
0a122b
-- 
0a122b
1.7.1
0a122b