Fix "defined but not used" warning
PATCH 1/1 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).
--- vl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
vl.c +4 -4
@@ -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
Signature · 6 lines
1.6.3.GIT -- Luiz
Quoted 4 lines · Luiz Capitulino
The function
qemu_calculate_timeout()is only used whenCONFIG_IOTHREADis not defined. WhenCONFIG_IOTHREADis defined, we have the following warning:
Quoted 8 lines
vl.c:4389: warning: ‘qemu_calculate_timeout’ defined but not used
This change fixes that by moving the #ifdef/#endif from
main_loop()intoqemu_calculate_timeout(). This encapsulates the logic and allow us to useqemu_calculate_timeout()whenCONFIG_IOTHREADis defined or not (suggested by Glauber Costa).Signed-off-by Luiz Capitulino <[email protected]>
Looks correct and is a good cleanup too. Moves us closer to being able to build with --enable-werror always :-)
Cheers,
Mark.
Quoted 11 lines · Luiz Capitulino
The function
qemu_calculate_timeout()is only used whenCONFIG_IOTHREADis not defined. WhenCONFIG_IOTHREADis 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()intoqemu_calculate_timeout(). This encapsulates the logic and allow us to useqemu_calculate_timeout()whenCONFIG_IOTHREADis defined or not (suggested by Glauber Costa).
ACK
Blue Swirl
AppliedQuoted 5 lines · Luiz Capitulino
The function
qemu_calculate_timeout()is only used whenCONFIG_IOTHREADis not defined. WhenCONFIG_IOTHREADis defined, we have the following warning:
Quoted 8 lines
vl.c:4389: warning: ‘qemu_calculate_timeout’ defined but not used
This change fixes that by moving the #ifdef/#endif from
main_loop()intoqemu_calculate_timeout(). This encapsulates the logic and allow us to useqemu_calculate_timeout()whenCONFIG_IOTHREADis defined or not (suggested by Glauber Costa).Signed-off-by Luiz Capitulino <[email protected]>
Thanks, applied.