From b319820d4099ec6b98c9c260e06d519fc41d544c Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Tue, 9 Jun 2009 18:24:57 -0300 Subject: Fix "defined but not used" warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- vl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vl.c') diff --git a/vl.c b/vl.c index f08f0f3542..69a9f918ca 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 -- cgit v1.2.1