From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L0MRx-0007ap-PV
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 15:36:29 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L0MRx-0007aP-1v
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 15:36:29 -0500
Received: from [199.232.76.173] (port=42360 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L0MRw-0007aJ-Rt
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 15:36:28 -0500
Received: from savannah.gnu.org ([199.232.41.3]:55477 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1L0MRw-0001Gq-MI
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 15:36:28 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1L0MRw-0003YW-39
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 20:36:28 +0000
Received: from malc by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <malc@savannah.gnu.org>) id 1L0MRv-0003YS-T1
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 20:36:28 +0000
MIME-Version: 1.0
Errors-To: malc
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: malc <av1474@comtv.ru>
Message-Id: <E1L0MRv-0003YS-T1@cvs.savannah.gnu.org>
Date: Wed, 12 Nov 2008 20:36:27 +0000
Subject: [Qemu-devel] [5712] Rename hz to hertz to keep AIX happy
Reply-To: qemu-devel@nongnu.org
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

Revision: 5712
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5712
Author:   malc
Date:     2008-11-12 20:36:27 +0000 (Wed, 12 Nov 2008)

Log Message:
-----------
Rename hz to hertz to keep AIX happy

The issue was first noticed/addressed by Laurent Vivier in his QEMU on
AIX patches.

Modified Paths:
--------------
    trunk/audio/audio.c

Modified: trunk/audio/audio.c
===================================================================
--- trunk/audio/audio.c	2008-11-12 20:36:24 UTC (rev 5711)
+++ trunk/audio/audio.c	2008-11-12 20:36:27 UTC (rev 5712)
@@ -54,7 +54,7 @@
     struct fixed_settings fixed_out;
     struct fixed_settings fixed_in;
     union {
-        int hz;
+        int hertz;
         int64_t ticks;
     } period;
     int plive;
@@ -1520,7 +1520,7 @@
      "Number of voices for ADC", NULL, 0},
 
     /* Misc */
-    {"TIMER_PERIOD", AUD_OPT_INT, &conf.period.hz,
+    {"TIMER_PERIOD", AUD_OPT_INT, &conf.period.hertz,
      "Timer period in HZ (0 - use lowest possible)", NULL, 0},
 
     {"PLIVE", AUD_OPT_BOOL, &conf.plive,
@@ -1781,16 +1781,16 @@
     if (done) {
         VMChangeStateEntry *e;
 
-        if (conf.period.hz <= 0) {
-            if (conf.period.hz < 0) {
+        if (conf.period.hertz <= 0) {
+            if (conf.period.hertz < 0) {
                 dolog ("warning: Timer period is negative - %d "
                        "treating as zero\n",
-                       conf.period.hz);
+                       conf.period.hertz);
             }
             conf.period.ticks = 1;
         }
         else {
-            conf.period.ticks = ticks_per_sec / conf.period.hz;
+            conf.period.ticks = ticks_per_sec / conf.period.hertz;
         }
 
         e = qemu_add_vm_change_state_handler (audio_vm_change_state_handler, s);