| Message ID | 1320839216-19509-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
Am 09.11.2011 12:46, schrieb Paolo Bonzini: > The non-dynticks timer variations are broken, so they can be > removed. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > qemu-timer.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/qemu-timer.c b/qemu-timer.c > index f11a28d..cd026c6 100644 > --- a/qemu-timer.c > +++ b/qemu-timer.c > @@ -183,10 +183,8 @@ static struct qemu_alarm_timer alarm_timers[] = { > #endif > {"unix", unix_start_timer, unix_stop_timer, unix_rearm_timer}, > #else > - {"mmtimer", mm_start_timer, mm_stop_timer, NULL}, > - {"mmtimer2", mm_start_timer, mm_stop_timer, mm_rearm_timer}, > + {"mmtimer", mm_start_timer, mm_stop_timer, mm_rearm_timer}, > {"dynticks", win32_start_timer, win32_stop_timer, win32_rearm_timer}, > - {"win32", win32_start_timer, win32_stop_timer, NULL}, > #endif > {NULL, } > }; Reviewed-by: Stefan Weil <sw@weilnetz.de> This patch is needed for QEMU 1.0 because it fixes a fatal assertion with the default timer for QEMU on w32 hosts. Regards, Stefan Weil
On 11/09/2011 05:46 AM, Paolo Bonzini wrote: > The non-dynticks timer variations are broken, so they can be > removed. > > Signed-off-by: Paolo Bonzini<pbonzini@redhat.com> Applied. Thanks. Regards, Anthony Liguori > --- > qemu-timer.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/qemu-timer.c b/qemu-timer.c > index f11a28d..cd026c6 100644 > --- a/qemu-timer.c > +++ b/qemu-timer.c > @@ -183,10 +183,8 @@ static struct qemu_alarm_timer alarm_timers[] = { > #endif > {"unix", unix_start_timer, unix_stop_timer, unix_rearm_timer}, > #else > - {"mmtimer", mm_start_timer, mm_stop_timer, NULL}, > - {"mmtimer2", mm_start_timer, mm_stop_timer, mm_rearm_timer}, > + {"mmtimer", mm_start_timer, mm_stop_timer, mm_rearm_timer}, > {"dynticks", win32_start_timer, win32_stop_timer, win32_rearm_timer}, > - {"win32", win32_start_timer, win32_stop_timer, NULL}, > #endif > {NULL, } > };
diff --git a/qemu-timer.c b/qemu-timer.c index f11a28d..cd026c6 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -183,10 +183,8 @@ static struct qemu_alarm_timer alarm_timers[] = { #endif {"unix", unix_start_timer, unix_stop_timer, unix_rearm_timer}, #else - {"mmtimer", mm_start_timer, mm_stop_timer, NULL}, - {"mmtimer2", mm_start_timer, mm_stop_timer, mm_rearm_timer}, + {"mmtimer", mm_start_timer, mm_stop_timer, mm_rearm_timer}, {"dynticks", win32_start_timer, win32_stop_timer, win32_rearm_timer}, - {"win32", win32_start_timer, win32_stop_timer, NULL}, #endif {NULL, } };
The non-dynticks timer variations are broken, so they can be removed. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- qemu-timer.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)