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: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
parent
4590fd80b8
commit
b319820d40
8
vl.c
8
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
|
||||
|
Loading…
Reference in New Issue
Block a user