From patchwork Fri Mar 18 15:54:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Obergfell X-Patchwork-Id: 644241 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2IFt44k000479 for ; Fri, 18 Mar 2011 15:55:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932177Ab1CRPy4 (ORCPT ); Fri, 18 Mar 2011 11:54:56 -0400 Received: from mx3-phx2.redhat.com ([209.132.183.24]:41019 "EHLO mx3-phx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932123Ab1CRPyz (ORCPT ); Fri, 18 Mar 2011 11:54:55 -0400 Received: from mail03.corp.redhat.com (zmail07.collab.prod.int.phx2.redhat.com [10.5.5.47]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p2IFsmoY001722; Fri, 18 Mar 2011 11:54:48 -0400 Date: Fri, 18 Mar 2011 11:54:48 -0400 (EDT) From: Ulrich Obergfell To: qemu-devel@nongnu.org Cc: kvm , gcosta@redhat.com, Anthony Liguori , aliguori@us.ibm.com, Jan Kiszka Message-ID: <1379962083.421747.1300463688907.JavaMail.root@zmail07.collab.prod.int.phx2.redhat.com> In-Reply-To: <739175196.420885.1300461195339.JavaMail.root@zmail07.collab.prod.int.phx2.redhat.com> Subject: [PATCH 1/3] alleviate time drift with HPET periodic timers MIME-Version: 1.0 X-Originating-IP: [10.5.5.72] X-Mailer: Zimbra 6.0.9_GA_2686 (ZimbraWebClient - FF3.0 (Linux)/6.0.9_GA_2686) 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 (demeter1.kernel.org [140.211.167.41]); Fri, 18 Mar 2011 15:55:13 +0000 (UTC) diff -up ./qemu-config.c.orig1 ./qemu-config.c --- ./qemu-config.c.orig1 2011-02-18 22:48:06.000000000 +0100 +++ ./qemu-config.c 2011-03-13 12:38:22.813976639 +0100 @@ -261,6 +261,23 @@ static QemuOptsList qemu_rtc_opts = { }, }; +#ifdef CONFIG_HPET_DRIFTFIX +static QemuOptsList qemu_hpet_opts = { + .name = "hpet", + .head = QTAILQ_HEAD_INITIALIZER(qemu_hpet_opts.head), + .desc = { + { + .name = "device", + .type = QEMU_OPT_STRING, + },{ + .name = "driftfix", + .type = QEMU_OPT_STRING, + }, + { /* end of list */ } + }, +}; +#endif + static QemuOptsList qemu_global_opts = { .name = "global", .head = QTAILQ_HEAD_INITIALIZER(qemu_global_opts.head), @@ -462,6 +479,9 @@ static QemuOptsList *vm_config_groups[32 &qemu_netdev_opts, &qemu_net_opts, &qemu_rtc_opts, +#ifdef CONFIG_HPET_DRIFTFIX + &qemu_hpet_opts, +#endif &qemu_global_opts, &qemu_mon_opts, &qemu_cpudef_opts, diff -up ./qemu-options.hx.orig1 ./qemu-options.hx --- ./qemu-options.hx.orig1 2011-02-18 22:48:06.000000000 +0100 +++ ./qemu-options.hx 2011-03-13 12:38:22.815977096 +0100 @@ -972,6 +972,13 @@ STEXI Disable HPET support. ETEXI +#ifdef CONFIG_HPET_DRIFTFIX +DEF("hpet", HAS_ARG, QEMU_OPTION_hpet, \ + "-hpet [device=none|present][,driftfix=none|slew]\n" \ + " disable or enable HPET, disable or enable drift fix for periodic timers\n", + QEMU_ARCH_ALL) +#endif + DEF("balloon", HAS_ARG, QEMU_OPTION_balloon, "-balloon none disable balloon device\n" "-balloon virtio[,addr=str]\n" diff -up ./vl.c.orig1 ./vl.c --- ./vl.c.orig1 2011-02-18 22:48:06.000000000 +0100 +++ ./vl.c 2011-03-13 12:38:35.167984285 +0100 @@ -203,6 +203,9 @@ CharDriverState *parallel_hds[MAX_PARALL CharDriverState *virtcon_hds[MAX_VIRTIO_CONSOLES]; int win2k_install_hack = 0; int rtc_td_hack = 0; +#ifdef CONFIG_HPET_DRIFTFIX +int hpet_driftfix = 0; +#endif int usb_enabled = 0; int singlestep = 0; int smp_cpus = 1; @@ -431,6 +434,41 @@ static void configure_rtc(QemuOpts *opts } } +#ifdef CONFIG_HPET_DRIFTFIX +static void configure_hpet(QemuOpts *opts) +{ + const char *value, *opt; + + opt = "device"; + value = qemu_opt_get(opts, opt); + if (value) { + if (!strcmp(value, "present")) { + no_hpet = 0; + } else if (!strcmp(value, "none")) { + no_hpet = 1; + } else { + goto error_exit; + } + } + opt = "driftfix"; + value = qemu_opt_get(opts, opt); + if (value) { + if (!strcmp(value, "slew")) { + hpet_driftfix = 1; + } else if (!strcmp(value, "none")) { + hpet_driftfix = 0; + } else { + goto error_exit; + } + } + return; + +error_exit: + fprintf(stderr, "qemu: -hpet option '%s': value missing or invalid\n", opt); + exit(1); +} +#endif + /***********************************************************/ /* Bluetooth support */ static int nb_hcis; @@ -2644,6 +2682,15 @@ int main(int argc, char **argv, char **e case QEMU_OPTION_no_hpet: no_hpet = 1; break; +#ifdef CONFIG_HPET_DRIFTFIX + case QEMU_OPTION_hpet: + opts = qemu_opts_parse(qemu_find_opts("hpet"), optarg, 0); + if (!opts) { + exit(1); + } + configure_hpet(opts); + break; +#endif case QEMU_OPTION_balloon: if (balloon_parse(optarg) < 0) { fprintf(stderr, "Unknown -balloon argument %s\n", optarg);