[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] few compile time warnings removed
From: |
Stefano Stabellini |
Subject: |
Re: [Qemu-devel] [PATCH] few compile time warnings removed |
Date: |
Thu, 25 Sep 2008 10:30:57 +0100 |
User-agent: |
Thunderbird 2.0.0.14 (X11/20080505) |
Could someone take a look at this patch, please?
It should only take few minutes.
Stefano Stabellini wrote:
> Few small changes to remove some compile time warnings:
>
> - we are not initializing the qemu_alarm_timer pointer in
> init_timer_alarm, so I am adding a NULL initialization;
>
> - in the headers include code, we are doing something like:
>
> #ifdef
> /* BSD stuff */
> #else
> #ifndef __sun__
> /* linux stuff */
> #else
> /* sun stuff */
> #endif
> #endif
>
> that works most of the times but it fails when you try to compile qemu
> on mini-os, that is posix but it doesn't define either __sun__ or
> __linux__, so I am changing it to:
>
> #ifdef
> /* BSD stuff */
> #else
> #ifdef __linux__
> /* linux stuff */
> #endif
> #ifdef __sun__
> /* sun stuff */
> #endif
> #endif
>
> Signed-off-by: Stefano Stabellini <address@hidden>
>
> diff --git a/vl.c b/vl.c
> index 0d96401..69aee16 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -70,7 +70,7 @@
> #elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
> #include <freebsd/stdlib.h>
> #else
> -#ifndef __sun__
> +#ifdef __linux__
> #include <linux/if.h>
> #include <linux/if_tun.h>
> #include <pty.h>
> @@ -84,7 +84,8 @@
>
> #include <linux/ppdev.h>
> #include <linux/parport.h>
> -#else
> +#endif
> +#ifdef __sun__
> #include <sys/stat.h>
> #include <sys/ethernet.h>
> #include <sys/sockio.h>
> @@ -1676,7 +1677,7 @@ static void win32_rearm_timer(struct qemu_alarm_timer
> *t)
>
> static void init_timer_alarm(void)
> {
> - struct qemu_alarm_timer *t;
> + struct qemu_alarm_timer *t = NULL;
> int i, err = -1;
>
> for (i = 0; alarm_timers[i].name; i++) {
>
>