* [Qemu-devel] [PATCH] win32: remove broken timers
@ 2011-11-09 11:46 Paolo Bonzini
2011-11-09 18:16 ` Stefan Weil
2011-11-09 19:44 ` Anthony Liguori
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Bonzini @ 2011-11-09 11:46 UTC (permalink / raw)
To: qemu-devel
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, }
};
--
1.7.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] win32: remove broken timers
2011-11-09 11:46 [Qemu-devel] [PATCH] win32: remove broken timers Paolo Bonzini
@ 2011-11-09 18:16 ` Stefan Weil
2011-11-09 19:44 ` Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Weil @ 2011-11-09 18:16 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Paolo Bonzini, qemu-devel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] win32: remove broken timers
2011-11-09 11:46 [Qemu-devel] [PATCH] win32: remove broken timers Paolo Bonzini
2011-11-09 18:16 ` Stefan Weil
@ 2011-11-09 19:44 ` Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Anthony Liguori @ 2011-11-09 19:44 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
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, }
> };
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-09 19:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-09 11:46 [Qemu-devel] [PATCH] win32: remove broken timers Paolo Bonzini
2011-11-09 18:16 ` Stefan Weil
2011-11-09 19:44 ` 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).