|
 |
0a122b |
From 9933c07995dc978f8ea636cead7c66d78428484b Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
Message-Id: <9933c07995dc978f8ea636cead7c66d78428484b.1387382496.git.minovotn@redhat.com>
|
|
|
0a122b |
In-Reply-To: <c5386144fbf09f628148101bc674e2421cdd16e3.1387382496.git.minovotn@redhat.com>
|
|
|
0a122b |
References: <c5386144fbf09f628148101bc674e2421cdd16e3.1387382496.git.minovotn@redhat.com>
|
|
|
0a122b |
From: Nigel Croxon <ncroxon@redhat.com>
|
|
|
0a122b |
Date: Thu, 14 Nov 2013 22:53:10 +0100
|
|
|
0a122b |
Subject: [PATCH 34/46] savevm: fix wrong initialization by
|
|
|
0a122b |
ram_control_load_hook
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Nigel Croxon <ncroxon@redhat.com>
|
|
|
0a122b |
Message-id: <1384469598-13137-35-git-send-email-ncroxon@redhat.com>
|
|
|
0a122b |
Patchwork-id: 55720
|
|
|
0a122b |
O-Subject: [RHEL7.0 PATCH 34/42] savevm: fix wrong initialization by ram_control_load_hook
|
|
|
0a122b |
Bugzilla: 1011720
|
|
|
0a122b |
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Amit Shah <amit.shah@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
Bugzilla: 1011720
|
|
|
0a122b |
https://bugzilla.redhat.com/show_bug.cgi?id=1011720
|
|
|
0a122b |
|
|
|
0a122b |
>From commit ID:
|
|
|
0a122b |
commit c77a5f2daa1ccbd825d59b95c70207c0a196bb94
|
|
|
0a122b |
Author: Lei Li <lilei@linux.vnet.ibm.com>
|
|
|
0a122b |
Date: Wed Sep 4 17:02:35 2013 +0800
|
|
|
0a122b |
|
|
|
0a122b |
savevm: fix wrong initialization by ram_control_load_hook
|
|
|
0a122b |
|
|
|
0a122b |
It should set negative error value rather than 0 in QEMUFile
|
|
|
0a122b |
if there has been an error.
|
|
|
0a122b |
|
|
|
0a122b |
Reviewed-by: Michael R. Hines <mrhines@us.ibm.com>
|
|
|
0a122b |
Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
|
|
|
0a122b |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
savevm.c | 2 +-
|
|
|
0a122b |
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
savevm.c | 2 +-
|
|
|
0a122b |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/savevm.c b/savevm.c
|
|
|
0a122b |
index 03fc4d9..a0d4e09 100644
|
|
|
0a122b |
--- a/savevm.c
|
|
|
0a122b |
+++ b/savevm.c
|
|
|
0a122b |
@@ -642,7 +642,7 @@ void ram_control_after_iterate(QEMUFile *f, uint64_t flags)
|
|
|
0a122b |
|
|
|
0a122b |
void ram_control_load_hook(QEMUFile *f, uint64_t flags)
|
|
|
0a122b |
{
|
|
|
0a122b |
- int ret = 0;
|
|
|
0a122b |
+ int ret = -EINVAL;
|
|
|
0a122b |
|
|
|
0a122b |
if (f->ops->hook_ram_load) {
|
|
|
0a122b |
ret = f->ops->hook_ram_load(f, f->opaque, flags);
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.11.7
|
|
|
0a122b |
|