From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MCNNJ-0006eV-TI
	for qemu-devel@nongnu.org; Thu, 04 Jun 2009 20:33:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MCNNF-0006Yo-5c
	for qemu-devel@nongnu.org; Thu, 04 Jun 2009 20:33:37 -0400
Received: from [199.232.76.173] (port=52853 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MCMRp-0006Xf-K6
	for qemu-devel@nongnu.org; Thu, 04 Jun 2009 19:34:13 -0400
Received: from mx2.redhat.com ([66.187.237.31]:34957)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <lcapitulino@redhat.com>) id 1MCHgz-0001lr-AR
	for qemu-devel@nongnu.org; Thu, 04 Jun 2009 14:29:33 -0400
Date: Thu, 4 Jun 2009 15:29:19 -0300
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20090604152919.486ba200@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: [Qemu-devel] [PATCH]: Fix "defined but not used" warning
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, glommer@redhat.com

=20
    The function qemu_calculate_timeout() is only used when CONFIG_IOTHREAD
    is not defined. When CONFIG_IOTHREAD is defined, we have the following
    warning:
   =20
    vl.c:4389: warning: =E2=80=98qemu_calculate_timeout=E2=80=99 defined bu=
t not used
   =20
    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).
   =20
    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)
=20
 static int qemu_calculate_timeout(void)
 {
+#ifndef CONFIG_IOTHREAD
     int timeout;
=20
     if (!vm_running)
@@ -4433,6 +4434,9 @@ static int qemu_calculate_timeout(void)
     }
=20
     return timeout;
+#else /* CONFIG_IOTHREAD */
+    return 1000;
+#endif
 }
=20
 static int vm_can_run(void)
@@ -4468,11 +4472,7 @@ static void main_loop(void)
 #ifdef CONFIG_PROFILER
             ti =3D profile_getclock();
 #endif
-#ifdef CONFIG_IOTHREAD
-            main_loop_wait(1000);
-#else
             main_loop_wait(qemu_calculate_timeout());
-#endif
 #ifdef CONFIG_PROFILER
             dev_time +=3D profile_getclock() - ti;
 #endif


--=20
Luiz