提交 b319820d 编写于 作者: L Luiz Capitulino 提交者: Blue Swirl

Fix "defined but not used" warning

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: NLuiz Capitulino <lcapitulino@redhat.com>
上级 4590fd80
...@@ -4388,6 +4388,7 @@ static int tcg_has_work(void) ...@@ -4388,6 +4388,7 @@ static int tcg_has_work(void)
static int qemu_calculate_timeout(void) static int qemu_calculate_timeout(void)
{ {
#ifndef CONFIG_IOTHREAD
int timeout; int timeout;
if (!vm_running) if (!vm_running)
...@@ -4433,6 +4434,9 @@ static int qemu_calculate_timeout(void) ...@@ -4433,6 +4434,9 @@ static int qemu_calculate_timeout(void)
} }
return timeout; return timeout;
#else /* CONFIG_IOTHREAD */
return 1000;
#endif
} }
static int vm_can_run(void) static int vm_can_run(void)
...@@ -4468,11 +4472,7 @@ static void main_loop(void) ...@@ -4468,11 +4472,7 @@ static void main_loop(void)
#ifdef CONFIG_PROFILER #ifdef CONFIG_PROFILER
ti = profile_getclock(); ti = profile_getclock();
#endif #endif
#ifdef CONFIG_IOTHREAD
main_loop_wait(1000);
#else
main_loop_wait(qemu_calculate_timeout()); main_loop_wait(qemu_calculate_timeout());
#endif
#ifdef CONFIG_PROFILER #ifdef CONFIG_PROFILER
dev_time += profile_getclock() - ti; dev_time += profile_getclock() - ti;
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册