Patchwork qemu-timer: Fix compilation of new timer code for w32, w64

login
register
mail settings
Submitter Stefan Weil
Date Feb. 4, 2011, 9:01 p.m.
Message ID <1296853292-8450-1-git-send-email-weil@mail.berlios.de>
Download mbox | patch
Permalink /patch/81952/
State Accepted
Headers show

Comments

Stefan Weil - Feb. 4, 2011, 9:01 p.m.
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(-)
Paolo Bonzini - Feb. 5, 2011, 3:36 p.m.
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
Blue Swirl - Feb. 7, 2011, 7:56 p.m.
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
>
>

Patch

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;