* [Qemu-devel] [PATCH] Fix infinite loop in i386 cpu_post_load()
@ 2009-10-06 10:47 Avi Kivity
2009-10-06 14:16 ` Anthony Liguori
0 siblings, 1 reply; 2+ messages in thread
From: Avi Kivity @ 2009-10-06 10:47 UTC (permalink / raw)
To: qemu-devel
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 = {
--
1.6.2.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] Fix infinite loop in i386 cpu_post_load()
2009-10-06 10:47 [Qemu-devel] [PATCH] Fix infinite loop in i386 cpu_post_load() Avi Kivity
@ 2009-10-06 14:16 ` Anthony Liguori
0 siblings, 0 replies; 2+ messages in thread
From: Anthony Liguori @ 2009-10-06 14:16 UTC (permalink / raw)
To: Avi Kivity; +Cc: qemu-devel
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 = {
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-10-06 14:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-06 10:47 [Qemu-devel] [PATCH] Fix infinite loop in i386 cpu_post_load() Avi Kivity
2009-10-06 14:16 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).