[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/16] hpet: Move static timer field initialization
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 04/16] hpet: Move static timer field initialization |
Date: |
Sun, 6 Jun 2010 10:10:53 +0200 |
From: Jan Kiszka <address@hidden>
Properly initialize HPETTimer::tn and HPETTimer::state once during
hpet_init instead of (re-)writing them on every reset.
Signed-off-by: Jan Kiszka <address@hidden>
---
hw/hpet.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/hpet.c b/hw/hpet.c
index bcb160b..fd7a1fd 100644
--- a/hw/hpet.c
+++ b/hw/hpet.c
@@ -575,12 +575,10 @@ static void hpet_reset(void *opaque)
HPETTimer *timer = &s->timer[i];
hpet_del_timer(timer);
- timer->tn = i;
timer->cmp = ~0ULL;
timer->config = HPET_TN_PERIODIC_CAP | HPET_TN_SIZE_CAP;
/* advertise availability of ioapic inti2 */
timer->config |= 0x00000004ULL << 32;
- timer->state = s;
timer->period = 0ULL;
timer->wrap_flag = 0;
}
@@ -617,6 +615,8 @@ void hpet_init(qemu_irq *irq)
for (i = 0; i < HPET_NUM_TIMERS; i++) {
timer = &s->timer[i];
timer->qemu_timer = qemu_new_timer(vm_clock, hpet_timer, timer);
+ timer->tn = i;
+ timer->state = s;
}
vmstate_register(-1, &vmstate_hpet, s);
qemu_register_reset(hpet_reset, s);
--
1.6.0.2
- [Qemu-devel] [PATCH 00/16] HPET cleanups, fixes, enhancements, Jan Kiszka, 2010/06/06
- [Qemu-devel] [PATCH 01/16] hpet: Catch out-of-bounds timer access, Jan Kiszka, 2010/06/06
- [Qemu-devel] [PATCH 04/16] hpet: Move static timer field initialization,
Jan Kiszka <=
- [Qemu-devel] [PATCH 05/16] hpet: Convert to qdev, Jan Kiszka, 2010/06/06
- [Qemu-devel] [PATCH 03/16] hpet: Silence warning on write to running main counter, Jan Kiszka, 2010/06/06
- [Qemu-devel] [PATCH 07/16] monitor/QMP: Drop info hpet / query-hpet, Jan Kiszka, 2010/06/06
- [Qemu-devel] [PATCH 02/16] hpet: Coding style cleanups and some refactorings, Jan Kiszka, 2010/06/06
- [Qemu-devel] [PATCH 06/16] hpet: Start/stop timer when HPET_TN_ENABLE is modified, Jan Kiszka, 2010/06/06
- [Qemu-devel] [PATCH 09/16] Enable message delivery via IRQs, Jan Kiszka, 2010/06/06