From patchwork Fri May 20 07:13:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Obergfell X-Patchwork-Id: 802332 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4K7DMFN021107 for ; Fri, 20 May 2011 07:13:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933810Ab1ETHNP (ORCPT ); Fri, 20 May 2011 03:13:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21434 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933731Ab1ETHNO (ORCPT ); Fri, 20 May 2011 03:13:14 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4K7DB9C021202 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 20 May 2011 03:13:11 -0400 Received: from localhost.localdomain (vpn1-7-144.ams2.redhat.com [10.36.7.144]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p4K7Cxq4003713; Fri, 20 May 2011 03:13:09 -0400 From: Ulrich Obergfell To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, uobergfe@redhat.com, gcosta@redhat.com, avi@redhat.com, mtosatti@redhat.com, zamsden@redhat.com, aliguori@us.ibm.com, jan.kiszka@siemens.com Subject: [PATCH v5 3/5] hpet 'driftfix': add fields to HPETTimer and VMStateDescription Date: Fri, 20 May 2011 09:13:21 +0200 Message-Id: <1305875603-3104-4-git-send-email-uobergfe@redhat.com> In-Reply-To: <1305875603-3104-1-git-send-email-uobergfe@redhat.com> References: <1305875603-3104-1-git-send-email-uobergfe@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 20 May 2011 07:13:24 +0000 (UTC) The new fields in HPETTimer are covered by a separate VMStateDescription which is a subsection of 'vmstate_hpet_timer'. They are only migrated if -global hpet.driftfix=on Signed-off-by: Ulrich Obergfell --- hw/hpet.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/hw/hpet.c b/hw/hpet.c index 7513065..dba9370 100644 --- a/hw/hpet.c +++ b/hw/hpet.c @@ -55,6 +55,19 @@ typedef struct HPETTimer { /* timers */ uint8_t wrap_flag; /* timer pop will indicate wrap for one-shot 32-bit * mode. Next pop will be actual timer expiration. */ + /* driftfix state */ + uint64_t prev_period; /* needed when the guest o/s changes the + * comparator value */ + uint64_t ticks_not_accounted; /* ticks for which no interrupts have been + * delivered to the guest o/s yet */ + uint32_t irq_rate; /* rate at which interrupts are delivered + * to the guest o/s during one period + * interval; if rate is greater than 1, + * additional interrupts are delivered + * to compensate missed interrupts */ + uint32_t divisor; /* needed to determine when the next + * timer callback should occur while + * rate is greater than 1 */ } HPETTimer; typedef struct HPETState { @@ -246,6 +259,27 @@ static int hpet_post_load(void *opaque, int version_id) return 0; } +static bool hpet_timer_driftfix_vmstate_needed(void *opaque) +{ + HPETTimer *t = opaque; + + return (t->state->driftfix != 0); +} + +static const VMStateDescription vmstate_hpet_timer_driftfix = { + .name = "hpet_timer_driftfix", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField []) { + VMSTATE_UINT64(prev_period, HPETTimer), + VMSTATE_UINT64(ticks_not_accounted, HPETTimer), + VMSTATE_UINT32(irq_rate, HPETTimer), + VMSTATE_UINT32(divisor, HPETTimer), + VMSTATE_END_OF_LIST() + } +}; + static const VMStateDescription vmstate_hpet_timer = { .name = "hpet_timer", .version_id = 1, @@ -260,6 +294,14 @@ static const VMStateDescription vmstate_hpet_timer = { VMSTATE_UINT8(wrap_flag, HPETTimer), VMSTATE_TIMER(qemu_timer, HPETTimer), VMSTATE_END_OF_LIST() + }, + .subsections = (VMStateSubsection []) { + { + .vmsd = &vmstate_hpet_timer_driftfix, + .needed = hpet_timer_driftfix_vmstate_needed, + }, { + /* empty */ + } } };