Patchwork [3/6] Move no_hpet test to inside hpet_init()

login
register
mail settings
Submitter Juan Quintela
Date May 24, 2010, 3:18 p.m.
Message ID <853d34b0970150fa2e1df7a05edd6d8942a4d8e3.1274714215.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/53428/
State New
Headers show

Comments

Juan Quintela - May 24, 2010, 3:18 p.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/hpet.c |    3 +++
 hw/pc.c   |    4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/hw/hpet.c b/hw/hpet.c
index 8729fb2..0ef3335 100644
--- a/hw/hpet.c
+++ b/hw/hpet.c
@@ -570,6 +570,9 @@  void hpet_init(qemu_irq *irq) {

     DPRINTF ("hpet_init\n");

+    if (no_hpet)
+        return;
+
     s = qemu_mallocz(sizeof(HPETState));
     hpet_statep = s;
     s->irqs = irq;
diff --git a/hw/pc.c b/hw/pc.c
index e7f31d3..ccff3ec 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -944,9 +944,7 @@  void pc_basic_device_init(qemu_irq *isa_irq,

     pit = pit_init(0x40, isa_reserve_irq(0));
     pcspk_init(pit);
-    if (!no_hpet) {
-        hpet_init(isa_irq);
-    }
+    hpet_init(isa_irq);

     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {