From patchwork Sun Jun 13 12:15:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 55418 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 87DD31007D2 for ; Sun, 13 Jun 2010 22:22:30 +1000 (EST) Received: from localhost ([127.0.0.1]:33391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ONmCn-0004yV-Ek for incoming@patchwork.ozlabs.org; Sun, 13 Jun 2010 08:22:25 -0400 Received: from [140.186.70.92] (port=44584 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ONm6W-0001j1-Dw for qemu-devel@nongnu.org; Sun, 13 Jun 2010 08:15:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ONm6U-00031n-Cc for qemu-devel@nongnu.org; Sun, 13 Jun 2010 08:15:56 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:54898) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ONm6U-00031M-6n for qemu-devel@nongnu.org; Sun, 13 Jun 2010 08:15:54 -0400 Received: from smtp01.web.de ( [172.20.0.243]) by fmmailgate01.web.de (Postfix) with ESMTP id 95DFA15EFE4D7; Sun, 13 Jun 2010 14:15:53 +0200 (CEST) Received: from [92.74.52.35] (helo=localhost.localdomain) by smtp01.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #4) id 1ONm6T-0004oR-01; Sun, 13 Jun 2010 14:15:53 +0200 From: Jan Kiszka To: Anthony Liguori , qemu-devel@nongnu.org Date: Sun, 13 Jun 2010 14:15:37 +0200 Message-Id: <4e3faf9155a8f294c35997a3ae020035013db621.1276431335.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX19VNo27SNQaJkJNyzuxPDtzYR8VsU/H5TdD8Omc cLMlUp4drG0MtZ3aUtNREyPxvcXQx92gNHoNGWHDt1MDuj1DVM nU/Rlog4M= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: blue Swirl , Jan Kiszka , Paul Brook , Gleb Natapov , Juan Quintela Subject: [Qemu-devel] [PATCH v4 04/13] hpet: Move static timer field initialization X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);