From 96f891c66e4dd0f5d03d9fc80324fc58f94addbe Mon Sep 17 00:00:00 2001 From: Juan Quintela <quintela@redhat.com> Date: Mon, 20 Jul 2009 23:26:52 +0200 Subject: [PATCH] enable rtc-hack by default Hi Hugh asked for this patch again. He told me on irc that danp and markmc agreed on the call to change the default. Later,Juan. Signed-off-by: Juan Quintela <quintela@redhat.com> Message-Id: <1248125212-27589-1-git-send-email-quintela@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Bugzilla: 512898 Obsoletes: <d9eef5539c347670fe914f1267f2cd5342e751e4.1248208471.git.quintela@redhat.com> Acked-by: Eduardo Habkost <ehabkost@redhat.com> Acked-by: "Daniel P. Berrange" <berrange@redhat.com> Acked-by: Dor Laor <dlaor@redhat.com> --- qemu/qemu-doc.texi | 6 +++++- qemu/vl.c | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/qemu/qemu-doc.texi b/qemu/qemu-doc.texi index 71f2097..3d64f08 100644 --- a/qemu/qemu-doc.texi +++ b/qemu/qemu-doc.texi @@ -431,7 +431,11 @@ slows down the IDE transfers). @item -rtc-td-hack Use it if you experience time drift problem in Windows with ACPI HAL. This option will try to figure out how many timer interrupts were not -processed by the Windows guest and will re-inject them. +processed by the Windows guest and will re-inject them. This is the +default. + +@item -no-rtc-td-hack +Disable the rtc td hack. @item -option-rom @var{file} Load the contents of @var{file} as an option ROM. diff --git a/qemu/vl.c b/qemu/vl.c index f24c916..59c7e8c 100644 --- a/qemu/vl.c +++ b/qemu/vl.c @@ -226,7 +226,7 @@ CharDriverState *serial_hds[MAX_SERIAL_PORTS]; CharDriverState *parallel_hds[MAX_PARALLEL_PORTS]; #ifdef TARGET_I386 int win2k_install_hack = 0; -int rtc_td_hack = 0; +int rtc_td_hack = 1; #endif int usb_enabled = 0; const char *assigned_devices[MAX_DEV_ASSIGN_CMDLINE]; @@ -4417,6 +4417,7 @@ enum { QEMU_OPTION_enable_nesting, QEMU_OPTION_win2k_hack, QEMU_OPTION_rtc_td_hack, + QEMU_OPTION_no_rtc_td_hack, QEMU_OPTION_usb, QEMU_OPTION_usbdevice, QEMU_OPTION_smp, @@ -4565,6 +4566,7 @@ static const QEMUOption qemu_options[] = { { "pidfile", HAS_ARG, QEMU_OPTION_pidfile }, { "win2k-hack", 0, QEMU_OPTION_win2k_hack }, { "rtc-td-hack", 0, QEMU_OPTION_rtc_td_hack }, + { "no-rtc-td-hack", 0, QEMU_OPTION_no_rtc_td_hack }, { "usbdevice", HAS_ARG, QEMU_OPTION_usbdevice }, { "smp", HAS_ARG, QEMU_OPTION_smp }, { "vnc", HAS_ARG, QEMU_OPTION_vnc }, @@ -5581,6 +5583,9 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_rtc_td_hack: rtc_td_hack = 1; break; + case QEMU_OPTION_no_rtc_td_hack: + rtc_td_hack = 0; + break; case QEMU_OPTION_acpitable: if(acpi_table_add(optarg) < 0) { fprintf(stderr, "Wrong acpi table provided\n"); -- 1.6.3.rc4.29.g8146