[Qemu-devel] [PATCH v2 1/2] Force timedrift=none on previous machines

[Qemu-devel] [PATCH v2 1/2] Force timedrift=none on previous machines

[Crístian Viana]

The current value for the -rtc timedrift option is none. This patch
makes sure that the old machines configuration will work the same way
even after that option changes its default value.

Signed-off-by: Crístian Viana <vianac@linux.vnet.ibm.com>
---
 hw/pc_piix.c |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 3f99f9a..08255b5 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -386,6 +386,10 @@ static QEMUMachine pc_machine_v1_0 = {
             .driver   = "isa-fdc",
             .property = "check_media_rate",
             .value    = "off",
+        }, {
+            .driver   = "mc146818rtc",
+            .property = "lost_tick_policy",
+            .value    = "none",
         },
         { /* end of list */ }
     },
@@ -405,6 +409,10 @@ static QEMUMachine pc_machine_v0_15 = {
             .driver   = "isa-fdc",
             .property = "check_media_rate",
             .value    = "off",
+        }, {
+            .driver   = "mc146818rtc",
+            .property = "lost_tick_policy",
+            .value    = "none",
         },
         { /* end of list */ }
     },
@@ -449,6 +457,10 @@ static QEMUMachine pc_machine_v0_14 = {
             .driver   = "pc-sysfw",
             .property = "rom_only",
             .value    = stringify(1),
+        }, {
+            .driver   = "mc146818rtc",
+            .property = "lost_tick_policy",
+            .value    = "none",
         },
         { /* end of list */ }
     },
@@ -505,6 +517,10 @@ static QEMUMachine pc_machine_v0_13 = {
             .driver   = "pc-sysfw",
             .property = "rom_only",
             .value    = stringify(1),
+        }, {
+            .driver   = "mc146818rtc",
+            .property = "lost_tick_policy",
+            .value    = "none",
         },
         { /* end of list */ }
     },
@@ -565,6 +581,10 @@ static QEMUMachine pc_machine_v0_12 = {
             .driver   = "pc-sysfw",
             .property = "rom_only",
             .value    = stringify(1),
+        }, {
+            .driver   = "mc146818rtc",
+            .property = "lost_tick_policy",
+            .value    = "none",
         },
         { /* end of list */ }
     }
@@ -633,6 +653,10 @@ static QEMUMachine pc_machine_v0_11 = {
             .driver   = "pc-sysfw",
             .property = "rom_only",
             .value    = stringify(1),
+        }, {
+            .driver   = "mc146818rtc",
+            .property = "lost_tick_policy",
+            .value    = "none",
         },
         { /* end of list */ }
     }
@@ -713,6 +737,10 @@ static QEMUMachine pc_machine_v0_10 = {
             .driver   = "pc-sysfw",
             .property = "rom_only",
             .value    = stringify(1),
+        }, {
+            .driver   = "mc146818rtc",
+            .property = "lost_tick_policy",
+            .value    = "none",
         },
         { /* end of list */ }
     },
@@ -728,6 +756,10 @@ static QEMUMachine isapc_machine = {
             .driver   = "pc-sysfw",
             .property = "rom_only",
             .value    = stringify(1),
+        }, {
+            .driver   = "mc146818rtc",
+            .property = "lost_tick_policy",
+            .value    = "none",
         },
         { /* end of list */ }
     },
@@ -740,6 +772,13 @@ static QEMUMachine xenfv_machine = {
     .init = pc_xen_hvm_init,
     .max_cpus = HVM_MAX_VCPUS,
     .default_machine_opts = "accel=xen",
+    .compat_props = (GlobalProperty[]) {
+        {
+            .driver   = "mc146818rtc",
+            .property = "lost_tick_policy",
+            .value    = "none",
+        },
+        { /* end of list */ }
 };
 #endif
 
-- 
1.7.8.5

[Qemu-devel] [PATCH v2 2/2] Change timedrift default value to slew

[Crístian Viana]

Windows 2008+ is very sensitive to missed ticks. The RTC is used by default as
the time source.  If time drift is not enabled, Windows is prone to
blue screening.

Signed-off-by: Crístian Viana <vianac@linux.vnet.ibm.com>
---
 hw/mc146818rtc.c |    2 +-
 vl.c             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index 2b59c36..2b31587 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -726,7 +726,7 @@ ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq)
 static Property mc146818rtc_properties[] = {
     DEFINE_PROP_INT32("base_year", RTCState, base_year, 1980),
     DEFINE_PROP_LOSTTICKPOLICY("lost_tick_policy", RTCState,
-                               lost_tick_policy, LOST_TICK_DISCARD),
+                               lost_tick_policy, LOST_TICK_SLEW),
     DEFINE_PROP_END_OF_LIST(),
 };
 
diff --git a/vl.c b/vl.c
index 112b0e0..62dda67 100644
--- a/vl.c
+++ b/vl.c
@@ -550,7 +550,7 @@ static void configure_rtc(QemuOpts *opts)
 
             qdev_prop_register_global_list(slew_lost_ticks);
         } else if (!strcmp(value, "none")) {
-            /* discard is default */
+            /* do nothing */
         } else {
             fprintf(stderr, "qemu: invalid option value '%s'\n", value);
             exit(1);
-- 
1.7.8.5

Re: [Qemu-devel] [PATCH v2 2/2] Change timedrift default value to slew

[Paolo Bonzini]

Il 20/03/2012 21:59, Crístian Viana ha scritto:
> Windows 2008+ is very sensitive to missed ticks. The RTC is used by default as
> the time source.  If time drift is not enabled, Windows is prone to
> blue screening.
> 
> Signed-off-by: Crístian Viana <vianac@linux.vnet.ibm.com>
> ---
>  hw/mc146818rtc.c |    2 +-
>  vl.c             |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
> index 2b59c36..2b31587 100644
> --- a/hw/mc146818rtc.c
> +++ b/hw/mc146818rtc.c
> @@ -726,7 +726,7 @@ ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq)
>  static Property mc146818rtc_properties[] = {
>      DEFINE_PROP_INT32("base_year", RTCState, base_year, 1980),
>      DEFINE_PROP_LOSTTICKPOLICY("lost_tick_policy", RTCState,
> -                               lost_tick_policy, LOST_TICK_DISCARD),
> +                               lost_tick_policy, LOST_TICK_SLEW),
>      DEFINE_PROP_END_OF_LIST(),
>  };
>  
> diff --git a/vl.c b/vl.c
> index 112b0e0..62dda67 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -550,7 +550,7 @@ static void configure_rtc(QemuOpts *opts)
>  
>              qdev_prop_register_global_list(slew_lost_ticks);
>          } else if (!strcmp(value, "none")) {
> -            /* discard is default */
> +            /* do nothing */
>          } else {
>              fprintf(stderr, "qemu: invalid option value '%s'\n", value);
>              exit(1);

This piece of code from the previous if:

        if (!strcmp(value, "slew")) {
            static GlobalProperty slew_lost_ticks[] = {
                {
                    .driver   = "mc146818rtc",
                    .property = "lost_tick_policy",
                    .value    = "slew",
                },
                { /* end of list */ }
            };

            qdev_prop_register_global_list(slew_lost_ticks);

needs to be adjusted and moved to the "if (!strmp(value, "none"))" branch.

Patch 1 looks good.

Paolo

Re: [Qemu-devel] [PATCH v2 2/2] Change timedrift default value to slew

[Crístian Viana]

On 21-03-2012 03:02, Paolo Bonzini wrote:
> This piece of code from the previous if:
> 
>         if (!strcmp(value, "slew")) {
>             static GlobalProperty slew_lost_ticks[] = {
>                 {
>                     .driver   = "mc146818rtc",
>                     .property = "lost_tick_policy",
>                     .value    = "slew",
>                 },
>                 { /* end of list */ }
>             };
> 
>             qdev_prop_register_global_list(slew_lost_ticks);
> 
> needs to be adjusted and moved to the "if (!strmp(value, "none"))" branch.

Thanks, Paolo! I sent a version 3 of these patches with the changes you
suggested.

-- 
Best regards,
Crístian.