Message ID | 1296853292-8450-1-git-send-email-weil@mail.berlios.de |
---|---|
State | Accepted |
Headers | show |
On 02/04/2011 10:01 PM, Stefan Weil wrote: > qemu_next_alarm_deadline() is needed by MinGW, too. > > Cc: Paolo Bonzini<pbonzini@redhat.com> > Cc: Anthony Liguori<aliguori@us.ibm.com> > Signed-off-by: Stefan Weil<weil@mail.berlios.de> > --- > qemu-timer.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/qemu-timer.c b/qemu-timer.c > index b1a3a84..2de02fe 100644 > --- a/qemu-timer.c > +++ b/qemu-timer.c > @@ -706,8 +706,6 @@ int64_t qemu_next_deadline(void) > return delta; > } > > -#ifndef _WIN32 > - > static int64_t qemu_next_alarm_deadline(void) > { > int64_t delta; > @@ -920,6 +918,8 @@ static void dynticks_rearm_timer(struct qemu_alarm_timer *t) > > #endif /* defined(__linux__) */ > > +#if !defined(_WIN32) > + > static int unix_start_timer(struct qemu_alarm_timer *t) > { > struct sigaction act; Acked-by: Paolo Bonzini <pbonzini@redhat.com> Thanks, Paolo
Thanks, applied. On Sat, Feb 5, 2011 at 5:36 PM, Paolo Bonzini <pbonzini@redhat.com> wrote: > On 02/04/2011 10:01 PM, Stefan Weil wrote: >> >> qemu_next_alarm_deadline() is needed by MinGW, too. >> >> Cc: Paolo Bonzini<pbonzini@redhat.com> >> Cc: Anthony Liguori<aliguori@us.ibm.com> >> Signed-off-by: Stefan Weil<weil@mail.berlios.de> >> --- >> qemu-timer.c | 4 ++-- >> 1 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/qemu-timer.c b/qemu-timer.c >> index b1a3a84..2de02fe 100644 >> --- a/qemu-timer.c >> +++ b/qemu-timer.c >> @@ -706,8 +706,6 @@ int64_t qemu_next_deadline(void) >> return delta; >> } >> >> -#ifndef _WIN32 >> - >> static int64_t qemu_next_alarm_deadline(void) >> { >> int64_t delta; >> @@ -920,6 +918,8 @@ static void dynticks_rearm_timer(struct >> qemu_alarm_timer *t) >> >> #endif /* defined(__linux__) */ >> >> +#if !defined(_WIN32) >> + >> static int unix_start_timer(struct qemu_alarm_timer *t) >> { >> struct sigaction act; > > Acked-by: Paolo Bonzini <pbonzini@redhat.com> > > Thanks, > > Paolo > >
diff --git a/qemu-timer.c b/qemu-timer.c index b1a3a84..2de02fe 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -706,8 +706,6 @@ int64_t qemu_next_deadline(void) return delta; } -#ifndef _WIN32 - static int64_t qemu_next_alarm_deadline(void) { int64_t delta; @@ -920,6 +918,8 @@ static void dynticks_rearm_timer(struct qemu_alarm_timer *t) #endif /* defined(__linux__) */ +#if !defined(_WIN32) + static int unix_start_timer(struct qemu_alarm_timer *t) { struct sigaction act;
qemu_next_alarm_deadline() is needed by MinGW, too. Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> --- qemu-timer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)