commit c310de8657b12e805b2ac225e6932b8beed013cf
author malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Nov 12 20:36:27 2008 +0000
committer malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Nov 12 20:36:27 2008 +0000
tree 01ca43e30fa7d5006b2642b233dfca1cf00affcd
parent 2946898b48bd210b4874c80e720ffc59572532d0

Rename hz to hertz to keep AIX happy

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

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5712 c046a42c-6fe2-441c-8c8c-71466251a162

audio/audio.c

diff --git a/audio/audio.c b/audio/audio.c
index 79d8b20..f24215b 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -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);