From patchwork Sun Jun 13 12:15:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v4,04/13] hpet: Move static timer field initialization Date: Sun, 13 Jun 2010 02:15:37 -0000 From: Jan Kiszka X-Patchwork-Id: 55418 Message-Id: <4e3faf9155a8f294c35997a3ae020035013db621.1276431335.git.jan.kiszka@web.de> To: Anthony Liguori , qemu-devel@nongnu.org Cc: blue Swirl , Jan Kiszka , Paul Brook , Gleb Natapov , Juan Quintela From: Jan Kiszka Properly initialize HPETTimer::tn and HPETTimer::state once during hpet_init instead of (re-)writing them on every reset. Signed-off-by: Jan Kiszka --- 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);