[Qemu-devel] [PATCH]: Fix "defined but not used" warning

[Qemu-devel] [PATCH]: Fix "defined but not used" warning

[Luiz Capitulino]

 
    The function qemu_calculate_timeout() is only used when CONFIG_IOTHREAD
    is not defined. When CONFIG_IOTHREAD is defined, we have the following
    warning:
    
    vl.c:4389: warning: ‘qemu_calculate_timeout’ defined but not used
    
    This change fixes that by moving the #ifdef/#endif from main_loop()
    into qemu_calculate_timeout(). This encapsulates the logic and allow
    us to use qemu_calculate_timeout() when CONFIG_IOTHREAD is defined
    or not (suggested by Glauber Costa).
    
    Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

diff --git a/vl.c b/vl.c
index fcf8532..9e5cf4c 100644
--- a/vl.c
+++ b/vl.c
@@ -4388,6 +4388,7 @@ static int tcg_has_work(void)
 
 static int qemu_calculate_timeout(void)
 {
+#ifndef CONFIG_IOTHREAD
     int timeout;
 
     if (!vm_running)
@@ -4433,6 +4434,9 @@ static int qemu_calculate_timeout(void)
     }
 
     return timeout;
+#else /* CONFIG_IOTHREAD */
+    return 1000;
+#endif
 }
 
 static int vm_can_run(void)
@@ -4468,11 +4472,7 @@ static void main_loop(void)
 #ifdef CONFIG_PROFILER
             ti = profile_getclock();
 #endif
-#ifdef CONFIG_IOTHREAD
-            main_loop_wait(1000);
-#else
             main_loop_wait(qemu_calculate_timeout());
-#endif
 #ifdef CONFIG_PROFILER
             dev_time += profile_getclock() - ti;
 #endif


-- 
Luiz

Re: [Qemu-devel] [PATCH] Fix "defined but not used" warning

[Blue Swirl]

On 6/10/09, Luiz Capitulino <lcapitulino@redhat.com> wrote:
>
>  The function qemu_calculate_timeout() is only used when CONFIG_IOTHREAD
>  is not defined. When CONFIG_IOTHREAD is defined, we have the following
>  warning:
>
>  vl.c:4389: warning: ‘qemu_calculate_timeout’ defined but not used
>
>  This change fixes that by moving the #ifdef/#endif from main_loop()
>  into qemu_calculate_timeout(). This encapsulates the logic and allow
>  us to use qemu_calculate_timeout() when CONFIG_IOTHREAD is defined
>  or not (suggested by Glauber Costa).
>
>  Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

Thanks, applied.

Re: [Qemu-devel] [PATCH] Fix "defined but not used" warning

[Marcelo Tosatti]

On Tue, Jun 09, 2009 at 06:24:57PM -0300, Luiz Capitulino wrote:
> 
> The function qemu_calculate_timeout() is only used when CONFIG_IOTHREAD
> is not defined. When CONFIG_IOTHREAD is defined, we have the following
> warning:
> 
> vl.c:4389: warning: ‘qemu_calculate_timeout’ defined but not used
> 
> This change fixes that by moving the #ifdef/#endif from main_loop()
> into qemu_calculate_timeout(). This encapsulates the logic and allow
> us to use qemu_calculate_timeout() when CONFIG_IOTHREAD is defined
> or not (suggested by Glauber Costa).

ACK

Re: [Qemu-devel] [PATCH] Fix "defined but not used" warning

[Mark McLoughlin]

On Tue, 2009-06-09 at 18:24 -0300, Luiz Capitulino wrote:
> The function qemu_calculate_timeout() is only used when CONFIG_IOTHREAD
> is not defined. When CONFIG_IOTHREAD is defined, we have the following
> warning:
> 
> vl.c:4389: warning: ‘qemu_calculate_timeout’ defined but not used
> 
> This change fixes that by moving the #ifdef/#endif from main_loop()
> into qemu_calculate_timeout(). This encapsulates the logic and allow
> us to use qemu_calculate_timeout() when CONFIG_IOTHREAD is defined
> or not (suggested by Glauber Costa).
> 
> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

Looks correct and is a good cleanup too. Moves us closer to being able
to build with --enable-werror always :-)

Reviewed-by: Mark McLoughlin <markmc@redhat.com>

Cheers,
Mark.

[Qemu-devel] [PATCH] Fix "defined but not used" warning

[Luiz Capitulino]

The function qemu_calculate_timeout() is only used when CONFIG_IOTHREAD
is not defined. When CONFIG_IOTHREAD is defined, we have the following
warning:

vl.c:4389: warning: ‘qemu_calculate_timeout’ defined but not used

This change fixes that by moving the #ifdef/#endif from main_loop()
into qemu_calculate_timeout(). This encapsulates the logic and allow
us to use qemu_calculate_timeout() when CONFIG_IOTHREAD is defined
or not (suggested by Glauber Costa).

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 vl.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vl.c b/vl.c
index f08f0f3..69a9f91 100644
--- a/vl.c
+++ b/vl.c
@@ -4388,6 +4388,7 @@ static int tcg_has_work(void)
 
 static int qemu_calculate_timeout(void)
 {
+#ifndef CONFIG_IOTHREAD
     int timeout;
 
     if (!vm_running)
@@ -4433,6 +4434,9 @@ static int qemu_calculate_timeout(void)
     }
 
     return timeout;
+#else /* CONFIG_IOTHREAD */
+    return 1000;
+#endif
 }
 
 static int vm_can_run(void)
@@ -4468,11 +4472,7 @@ static void main_loop(void)
 #ifdef CONFIG_PROFILER
             ti = profile_getclock();
 #endif
-#ifdef CONFIG_IOTHREAD
-            main_loop_wait(1000);
-#else
             main_loop_wait(qemu_calculate_timeout());
-#endif
 #ifdef CONFIG_PROFILER
             dev_time += profile_getclock() - ti;
 #endif
-- 
1.6.3.GIT



-- 
Luiz