[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/6] Move no_hpet test to inside hpet_init()
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 3/6] Move no_hpet test to inside hpet_init() |
Date: |
Mon, 24 May 2010 17:18:18 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/hpet.c | 3 +++
hw/pc.c | 4 +---
2 files changed, 4 insertions(+), 3 deletions(-)
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]) {
--
1.6.6.1
- [Qemu-devel] [PATCH 0/6] Make hpet a compile time option, Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 1/6] Create again config-device.h and config.devices.h, Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 2/6] Move no_hpet declaration to hpet_emul.h, Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 3/6] Move no_hpet test to inside hpet_init(),
Juan Quintela <=
- [Qemu-devel] [PATCH 6/6] Create CONFIG_HPET, Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 4/6] Make hpet_in_legacy_mode() return 0 for !TARGET_I386, Juan Quintela, 2010/05/24
- [Qemu-devel] [PATCH 5/6] make hpet_in_legacy_mode() return a bool, Juan Quintela, 2010/05/24
- [Qemu-devel] Re: [PATCH 0/6] Make hpet a compile time option, Juan Quintela, 2010/05/24
- [Qemu-devel] Re: [PATCH 0/6] Make hpet a compile time option, Jan Kiszka, 2010/05/24
- [Qemu-devel] Re: [PATCH 0/6] Make hpet a compile time option, Paul Brook, 2010/05/24