diff mbox

Fix infinite loop in i386 cpu_post_load()

Message ID 1254826053-19132-1-git-send-email-avi@redhat.com
State Superseded
Headers show

Commit Message

Avi Kivity Oct. 6, 2009, 10:47 a.m. UTC 
Signed-off-by: Avi Kivity <avi@redhat.com>
---
 target-i386/machine.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Anthony Liguori Oct. 6, 2009, 2:16 p.m. UTC | #1 
This was fixed by:

commit 1e7fbc6d3cfcffe1d490ab8851e712c6e98fa771
Author: Juan Quintela <quintela@redhat.com>
Date:   Mon Oct 5 20:30:32 2009 +0200

    x86: fix miss merge

Regards,

Anthony Liguori

Avi Kivity wrote:
> Signed-off-by: Avi Kivity <avi@redhat.com>
> ---
>  target-i386/machine.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/target-i386/machine.c b/target-i386/machine.c
> index 5607be3..2ae284b 100644
> --- a/target-i386/machine.c
> +++ b/target-i386/machine.c
> @@ -384,7 +384,7 @@ static int cpu_post_load(void *opaque, int version_id)
>          }
>      }
>  
> -    return cpu_post_load(env, version_id);
> +    return 0;
>  }
>  
>  const VMStateDescription vmstate_cpu = {
>
diff mbox

Patch

diff --git a/target-i386/machine.c b/target-i386/machine.c
index 5607be3..2ae284b 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -384,7 +384,7 @@  static int cpu_post_load(void *opaque, int version_id)
         }
     }
 
-    return cpu_post_load(env, version_id);
+    return 0;
 }
 
 const VMStateDescription vmstate_cpu = {