]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Xen: Fix <clock> handling
authorPhilipp Hahn <hahn@univention.de>
Wed, 8 Feb 2012 16:32:34 +0000 (17:32 +0100)
committerEric Blake <eblake@redhat.com>
Mon, 2 Apr 2012 15:33:54 +0000 (09:33 -0600)
XenD-3.1 introduced managed domains. HV-domains have rtc_timeoffset
(hgd24f37b31030 from 2007-04-03), which tracks the offset between the
hypervisors clock and the domains RTC, and is persisted by XenD.
In combination with localtime=1 this had a bug until XenD-3.4
(hg5d701be7c37b from 2009-04-01) (I'm not 100% sure how that bug
manifests, but at least for me in TZ=Europe/Berlin I see the previous
offset relative to utc being applied to localtime again, which manifests
in an extra hour being added)

XenD implements the following variants for clock/@offset:
- PV domains don't have a RTC → 'localtime' | 'utc'
- <3.1: no managed domains → 'localtime' | 'utc'
- ≥3.1: the offset is tracked for HV → 'variable'
        due to the localtime=1 bug → 'localtime' | 'utc'
- ≥3.4: the offset is tracked for HV → 'variable'

Current libvirtd still thinks XenD only implements <clock offset='utc'/>
and <clock offset='localtime'/>, which is wrong, since the semantic of
'utc' and 'localtime' specifies, that the offset will be reset on
domain-restart, while with 'variable' the offset is kept. (keeping the
offset over "virsh edit" is important, since otherwise the clock might
jump, which confuses certain guest OSs)

xendConfigVersion was last incremented to 4 by the xen-folks for
xen-3.1.0. I know of no way to reliably detect the version of XenD
(user space tools), which may be different from the version of the
hypervisor (kernel) version! Because of this only the change from
'utc'/'localtime' to 'variable' in XenD-3.1 is handled, not the buggy
behaviour of XenD-3.1 until XenD-3.4.

For backward compatibility with previous versions of libvirt Xen-HV
still accepts 'utc' and 'localtime', but they are returned as 'variable'
on the next read-back from Xend to libvirt, since this is what XenD
implements: The RTC is NOT reset back to the specified time on next
restart, but the previous offset is kept.
This behaviour can be turned off by adding the additional attribute
adjustment='reset', in which case libvirt will report an error instead
of doing the conversion. The attribute can also be used as a shortcut to
offset='variable' with basis='...'.

With these changes, it is also necessary to adjust the xen tests:

"localtime = 0" is always inserted, because otherwise on updates the
value is not changed within XenD.

adjustment='reset' is inserted for all cases, since they're all <
XEND_CONFIG_VERSION_3_1_0, only 3.1 introduced persistent
rtc_timeoffset.

Some statements change their order because code was moved around.

Signed-off-by: Philipp Hahn <hahn@univention.de>
149 files changed:
src/xenxs/xen_sxpr.c
src/xenxs/xen_xm.c
tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
tests/sexpr2xmldata/sexpr2xml-curmem.xml
tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
tests/sexpr2xmldata/sexpr2xml-disk-block.xml
tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
tests/sexpr2xmldata/sexpr2xml-disk-file.xml
tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml
tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
tests/sexpr2xmldata/sexpr2xml-fv.xml
tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
tests/sexpr2xmldata/sexpr2xml-net-routed.xml
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
tests/sexpr2xmldata/sexpr2xml-pv.xml
tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg
tests/xmconfigdata/test-escape-paths.xml
tests/xmconfigdata/test-fullvirt-force-hpet.cfg
tests/xmconfigdata/test-fullvirt-force-hpet.xml
tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
tests/xmconfigdata/test-fullvirt-force-nohpet.xml
tests/xmconfigdata/test-fullvirt-localtime.xml
tests/xmconfigdata/test-fullvirt-net-ioemu.xml
tests/xmconfigdata/test-fullvirt-net-netfront.xml
tests/xmconfigdata/test-fullvirt-new-cdrom.xml
tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
tests/xmconfigdata/test-fullvirt-old-cdrom.xml
tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
tests/xmconfigdata/test-fullvirt-serial-file.xml
tests/xmconfigdata/test-fullvirt-serial-null.xml
tests/xmconfigdata/test-fullvirt-serial-pipe.xml
tests/xmconfigdata/test-fullvirt-serial-pty.xml
tests/xmconfigdata/test-fullvirt-serial-stdio.xml
tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
tests/xmconfigdata/test-fullvirt-serial-tcp.xml
tests/xmconfigdata/test-fullvirt-serial-udp.xml
tests/xmconfigdata/test-fullvirt-serial-unix.xml
tests/xmconfigdata/test-fullvirt-sound.xml
tests/xmconfigdata/test-fullvirt-usbmouse.xml
tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
tests/xmconfigdata/test-fullvirt-usbtablet.xml
tests/xmconfigdata/test-fullvirt-utc.xml
tests/xmconfigdata/test-no-source-cdrom.xml
tests/xmconfigdata/test-paravirt-net-e1000.cfg
tests/xmconfigdata/test-paravirt-net-e1000.xml
tests/xmconfigdata/test-paravirt-net-vifname.cfg
tests/xmconfigdata/test-paravirt-net-vifname.xml
tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg
tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
tests/xmconfigdata/test-paravirt-new-pvfb.cfg
tests/xmconfigdata/test-paravirt-new-pvfb.xml
tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg
tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
tests/xmconfigdata/test-paravirt-old-pvfb.cfg
tests/xmconfigdata/test-paravirt-old-pvfb.xml
tests/xmconfigdata/test-paravirt-vcpu.cfg
tests/xmconfigdata/test-paravirt-vcpu.xml
tests/xmconfigdata/test-pci-devs.xml
tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr
tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr
tests/xml2sexprdata/xml2sexpr-curmem.sexpr
tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr
tests/xml2sexprdata/xml2sexpr-disk-block.sexpr
tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr
tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr
tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr
tests/xml2sexprdata/xml2sexpr-disk-file.sexpr
tests/xml2sexprdata/xml2sexpr-escape.sexpr
tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr
tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr
tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
tests/xml2sexprdata/xml2sexpr-fv.sexpr
tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr
tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr
tests/xml2sexprdata/xml2sexpr-net-routed.sexpr
tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr
tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr
tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr
tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr
tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr
tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr
tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr
tests/xml2sexprdata/xml2sexpr-pv.sexpr

index d16be1818d997a64aa69ba920f7e99f81048edea..b26b2bc5e0f5df0cbcff13441733b0ff08ae4b0a 100644 (file)
@@ -1127,7 +1127,7 @@ xenParseSxpr(const struct sexpr *root,
 {
     const char *tmp;
     virDomainDefPtr def;
-    int hvm = 0;
+    int hvm = 0, vmlocaltime;
 
     if (VIR_ALLOC(def) < 0)
         goto no_memory;
@@ -1246,7 +1246,6 @@ xenParseSxpr(const struct sexpr *root,
     } else
         def->onCrash = VIR_DOMAIN_LIFECYCLE_DESTROY;
 
-    def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
     if (hvm) {
         if (sexpr_int(root, "domain/image/hvm/acpi"))
             def->features |= (1 << VIR_DOMAIN_FEATURE_ACPI);
@@ -1258,10 +1257,35 @@ xenParseSxpr(const struct sexpr *root,
             def->features |= (1 << VIR_DOMAIN_FEATURE_HAP);
         if (sexpr_int(root, "domain/image/hvm/viridian"))
             def->features |= (1 << VIR_DOMAIN_FEATURE_VIRIDIAN);
+    }
 
-        /* Old XenD only allows localtime here for HVM */
-        if (sexpr_int(root, "domain/image/hvm/localtime"))
-            def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME;
+    /* 12aaf4a2486b (3.0.3) added a second low-priority 'localtime' setting */
+    vmlocaltime = sexpr_int(root, "domain/localtime");
+    if (hvm) {
+        const char *value = sexpr_node(root, "domain/image/hvm/localtime");
+        if (value) {
+            if (virStrToLong_i(value, NULL, 0, &vmlocaltime) < 0) {
+                XENXS_ERROR(VIR_ERR_INTERNAL_ERROR,
+                            _("unknown localtime offset %s"), value);
+                goto error;
+            }
+        }
+        /* only managed HVM domains since 3.1.0 have persistent rtc_timeoffset */
+        if (xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) {
+            if (vmlocaltime)
+                def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME;
+            else
+                def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
+            def->clock.data.utc_reset = true;
+        } else {
+            int rtc_offset;
+            def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_VARIABLE;
+            rtc_offset =  sexpr_int(root, "domain/image/hvm/rtc_timeoffset");
+            def->clock.data.variable.adjustment = rtc_offset;
+            def->clock.data.variable.basis = vmlocaltime ?
+                VIR_DOMAIN_CLOCK_BASIS_LOCALTIME :
+                VIR_DOMAIN_CLOCK_BASIS_UTC;
+        }
 
         if (sexpr_lookup(root, "domain/image/hvm/hpet")) {
             virDomainTimerDefPtr timer;
@@ -1279,14 +1303,22 @@ xenParseSxpr(const struct sexpr *root,
             def->clock.ntimers = 1;
             def->clock.timers[0] = timer;
         }
-    } else { /* !hvm */
-        if (sexpr_int(root, "domain/image/linux/localtime"))
+    } else {
+        const char *value = sexpr_node(root, "domain/image/linux/localtime");
+        if (value) {
+            if (virStrToLong_i(value, NULL, 0, &vmlocaltime) < 0) {
+                XENXS_ERROR(VIR_ERR_INTERNAL_ERROR,
+                            _("unknown localtime offset %s"), value);
+                goto error;
+            }
+        }
+        /* PV domains do not have an emulated RTC and the offset is fixed. */
+        if (vmlocaltime)
             def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME;
-    }
-
-    /* Current XenD allows localtime here, for PV and HVM */
-    if (sexpr_int(root, "domain/localtime"))
-        def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME;
+        else
+            def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
+        def->clock.data.utc_reset = true;
+    } /* !hvm */
 
     if (sexpr_node_copy(root, hvm ?
                         "domain/image/hvm/device_model" :
@@ -2195,7 +2227,8 @@ xenFormatSxpr(virConnectPtr conn,
     char uuidstr[VIR_UUID_STRING_BUFLEN];
     const char *tmp;
     char *bufout;
-    int hvm = 0, i;
+    int hvm = 0, i, vmlocaltime = -1;
+    bool in_image = false;
 
     VIR_DEBUG("Formatting domain sexpr");
 
@@ -2255,30 +2288,15 @@ xenFormatSxpr(virConnectPtr conn,
     }
     virBufferAsprintf(&buf, "(on_crash '%s')", tmp);
 
-    /* Set localtime here for current XenD (both PV & HVM) */
-    if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME) {
-        if (def->clock.data.timezone) {
-            XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
-                         "%s", _("configurable timezones are not supported"));
-            goto error;
-        }
-
-        virBufferAddLit(&buf, "(localtime 1)");
-    } else if (def->clock.offset != VIR_DOMAIN_CLOCK_OFFSET_UTC) {
-        XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
-                     _("unsupported clock offset '%s'"),
-                     virDomainClockOffsetTypeToString(def->clock.offset));
-        goto error;
-    }
+    if (STREQ(def->os.type, "hvm"))
+        hvm = 1;
 
     if (!def->os.bootloader) {
-        if (STREQ(def->os.type, "hvm"))
-            hvm = 1;
-
         if (hvm)
             virBufferAddLit(&buf, "(image (hvm ");
         else
             virBufferAddLit(&buf, "(image (linux ");
+        in_image = true;
 
         if (hvm &&
             def->os.loader == NULL) {
@@ -2424,17 +2442,13 @@ xenFormatSxpr(virConnectPtr conn,
                 virBufferAddLit(&buf, "(serial none)");
             }
 
-            /* Set localtime here to keep old XenD happy for HVM */
-            if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME)
-                virBufferAddLit(&buf, "(localtime 1)");
-
             if (def->sounds) {
                 virBufferAddLit(&buf, "(soundhw '");
                 if (xenFormatSxprSound(def, &buf) < 0)
                     goto error;
                 virBufferAddLit(&buf, "')");
             }
-        }
+        } /* hvm */
 
         /* get the device emulation model */
         if (def->emulator && (hvm || xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4))
@@ -2458,15 +2472,98 @@ xenFormatSxpr(virConnectPtr conn,
                                          &buf, xendConfigVersion) < 0)
                 goto error;
         }
-
-        virBufferAddLit(&buf, "))");
     } else {
         /* PV domains accept kernel cmdline args */
         if (def->os.cmdline) {
-            virBufferEscapeSexpr(&buf, "(image (linux (args '%s')))",
-                                 def->os.cmdline);
+            virBufferEscapeSexpr(&buf, "(image (linux (args '%s')", def->os.cmdline);
+            in_image = true;
         }
+    } /* os.bootloader */
+
+
+    if (xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) {
+        /* <3.1: UTC and LOCALTIME */
+        switch (def->clock.offset) {
+        case VIR_DOMAIN_CLOCK_OFFSET_UTC:
+            vmlocaltime = 0;
+            break;
+        case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
+            vmlocaltime = 1;
+            break;
+        default:
+            XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
+                        _("unsupported clock offset='%s'"),
+                        virDomainClockOffsetTypeToString(def->clock.offset));
+            goto error;
+        }
+    } else {
+        if (!in_image) {
+            if (hvm)
+                virBufferAddLit(&buf, "(image (hvm ");
+            else
+                virBufferAddLit(&buf, "(image (linux ");
+            in_image = true;
+        }
+        if (hvm) {
+            /* >=3.1 HV: VARIABLE */
+            int rtc_timeoffset;
+            switch (def->clock.offset) {
+            case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE:
+                vmlocaltime = (int)def->clock.data.variable.basis;
+                rtc_timeoffset = def->clock.data.variable.adjustment;
+                break;
+            case VIR_DOMAIN_CLOCK_OFFSET_UTC:
+                if (def->clock.data.utc_reset) {
+                    XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
+                                _("unsupported clock adjustment='reset'"));
+                    goto error;
+                }
+                vmlocaltime = 0;
+                rtc_timeoffset = 0;
+                break;
+            case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
+                if (def->clock.data.utc_reset) {
+                    XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
+                                _("unsupported clock adjustment='reset'"));
+                    goto error;
+                }
+                vmlocaltime = 1;
+                rtc_timeoffset = 0;
+                break;
+            default:
+                XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
+                            _("unsupported clock offset='%s'"),
+                            virDomainClockOffsetTypeToString(def->clock.offset));
+                goto error;
+            }
+            virBufferAsprintf(&buf, "(rtc_timeoffset %d)", rtc_timeoffset);
+        } else {
+            /* >=3.1 PV: UTC and LOCALTIME */
+            switch (def->clock.offset) {
+            case VIR_DOMAIN_CLOCK_OFFSET_UTC:
+                vmlocaltime = 0;
+                break;
+            case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
+                vmlocaltime = 1;
+                break;
+            default:
+                XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
+                            _("unsupported clock offset='%s'"),
+                            virDomainClockOffsetTypeToString(def->clock.offset));
+                goto error;
+            }
+        } /* !hvm */
+        /* default post-XenD-3.1 location: */
+        virBufferAsprintf(&buf, "(localtime %d)", vmlocaltime);
     }
+    if (in_image) {
+        /* closes (image(hvm|linux */
+        virBufferAddLit(&buf, "))");
+        in_image = false;
+    }
+    /* pre-XenD-3.1 and compatibility location */
+    virBufferAsprintf(&buf, "(localtime %d)", vmlocaltime);
+
 
     for (i = 0 ; i < def->ndisks ; i++)
         if (xenFormatSxprDisk(def->disks[i],
index 31d8858515970b32d3c98347c156fe7837803be0..8e24fd528dac4af6c6a605a9ebd1668113d72154 100644 (file)
@@ -446,9 +446,31 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
     if (xenXMConfigGetBool(conf, "localtime", &vmlocaltime, 0) < 0)
         goto cleanup;
 
-    def->clock.offset = vmlocaltime ?
-        VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME :
-        VIR_DOMAIN_CLOCK_OFFSET_UTC;
+    if (hvm) {
+        /* only managed HVM domains since 3.1.0 have persistent rtc_timeoffset */
+        if (xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) {
+            if (vmlocaltime)
+                def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME;
+            else
+                def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
+            def->clock.data.utc_reset = true;
+        } else {
+            unsigned long rtc_timeoffset;
+            def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_VARIABLE;
+            if (xenXMConfigGetULong(conf, "rtc_timeoffset", &rtc_timeoffset, 0) < 0)
+                goto cleanup;
+            def->clock.data.variable.adjustment = (int)rtc_timeoffset;
+            def->clock.data.variable.basis = vmlocaltime ?
+                VIR_DOMAIN_CLOCK_BASIS_LOCALTIME :
+                VIR_DOMAIN_CLOCK_BASIS_UTC;
+        }
+    } else {
+        /* PV domains do not have an emulated RTC and the offset is fixed. */
+        def->clock.offset = vmlocaltime ?
+            VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME :
+            VIR_DOMAIN_CLOCK_OFFSET_UTC;
+        def->clock.data.utc_reset = true;
+    } /* !hvm */
 
     if (xenXMConfigCopyStringOpt(conf, "device_model", &def->emulator) < 0)
         goto cleanup;
@@ -1489,7 +1511,7 @@ virConfPtr xenFormatXM(virConnectPtr conn,
                                    virDomainDefPtr def,
                                    int xendConfigVersion) {
     virConfPtr conf = NULL;
-    int hvm = 0, i;
+    int hvm = 0, i, vmlocaltime = 0;
     char *cpus = NULL;
     const char *lifecycle;
     char uuid[VIR_UUID_STRING_BUFLEN];
@@ -1598,26 +1620,6 @@ virConfPtr xenFormatXM(virConnectPtr conn,
                 goto no_memory;
         }
 
-        if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME) {
-            if (def->clock.data.timezone) {
-                XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
-                           "%s", _("configurable timezones are not supported"));
-                goto cleanup;
-            }
-
-            if (xenXMConfigSetInt(conf, "localtime", 1) < 0)
-                goto no_memory;
-        } else if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_UTC) {
-            if (xenXMConfigSetInt(conf, "localtime", 0) < 0)
-                goto no_memory;
-        } else {
-            /* XXX We could support Xen's rtc clock offset */
-            XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("unsupported clock offset '%s'"),
-                       virDomainClockOffsetTypeToString(def->clock.offset));
-            goto cleanup;
-        }
-
         for (i = 0; i < def->clock.ntimers; i++) {
             if (def->clock.timers[i]->name == VIR_DOMAIN_TIMER_NAME_HPET &&
                 def->clock.timers[i]->present != -1 &&
@@ -1656,8 +1658,79 @@ virConfPtr xenFormatXM(virConnectPtr conn,
         if (def->os.cmdline &&
             xenXMConfigSetString(conf, "extra", def->os.cmdline) < 0)
             goto no_memory;
-
+    } /* !hvm */
+
+
+    if (xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) {
+        /* <3.1: UTC and LOCALTIME */
+        switch (def->clock.offset) {
+        case VIR_DOMAIN_CLOCK_OFFSET_UTC:
+            vmlocaltime = 0;
+            break;
+        case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
+            vmlocaltime = 1;
+            break;
+        default:
+            XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
+                        _("unsupported clock offset='%s'"),
+                        virDomainClockOffsetTypeToString(def->clock.offset));
+            goto cleanup;
+        }
+    } else {
+        if (hvm) {
+            /* >=3.1 HV: VARIABLE */
+            int rtc_timeoffset;
+            switch (def->clock.offset) {
+            case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE:
+                vmlocaltime = (int)def->clock.data.variable.basis;
+                rtc_timeoffset = def->clock.data.variable.adjustment;
+                break;
+            case VIR_DOMAIN_CLOCK_OFFSET_UTC:
+                if (def->clock.data.utc_reset) {
+                    XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
+                                _("unsupported clock adjustment='reset'"));
+                    goto cleanup;
+                }
+                vmlocaltime = 0;
+                rtc_timeoffset = 0;
+                break;
+            case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
+                if (def->clock.data.utc_reset) {
+                    XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
+                                _("unsupported clock adjustment='reset'"));
+                    goto cleanup;
+                }
+                vmlocaltime = 1;
+                rtc_timeoffset = 0;
+                break;
+            default:
+                XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
+                            _("unsupported clock offset='%s'"),
+                            virDomainClockOffsetTypeToString(def->clock.offset));
+                goto cleanup;
+            }
+            if (xenXMConfigSetInt(conf, "rtc_timeoffset", rtc_timeoffset) < 0)
+                goto no_memory;
+        } else {
+            /* >=3.1 PV: UTC and LOCALTIME */
+            switch (def->clock.offset) {
+            case VIR_DOMAIN_CLOCK_OFFSET_UTC:
+                vmlocaltime = 0;
+                break;
+            case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
+                vmlocaltime = 1;
+                break;
+            default:
+                XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
+                            _("unsupported clock offset='%s'"),
+                            virDomainClockOffsetTypeToString(def->clock.offset));
+                goto cleanup;
+            }
+        } /* !hvm */
     }
+    if (xenXMConfigSetInt(conf, "localtime", vmlocaltime) < 0)
+        goto no_memory;
+
 
     if (!(lifecycle = virDomainLifecycleTypeToString(def->onPoweroff))) {
         XENXS_ERROR(VIR_ERR_INTERNAL_ERROR,
index 7033088e5aecb5e03ac89631d7c089f94cdaf408..7f123e9f88f728bb5870acd2aa53cf807fac3fd4 100644 (file)
@@ -9,7 +9,7 @@
     <kernel>/usr/lib/xen/boot/pv-grub-x86_64.gz</kernel>
     <cmdline>(hd0,0)/grub/menu.lst</cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index 6bd0a2feec19d1e594b61509a876d818383f832a..4358198e6bb2da4d7f8db55ccdabc035435787e6 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index 8c11c16b92b1f77ed924631508f8f4523c111bda..806355b4b5763cad1bc06bdcff18ac6628a73692 100644 (file)
@@ -11,7 +11,7 @@
     <initrd>/var/lib/xen/initrd.gULTf1</initrd>
     <cmdline>ro root=/dev/VolGroup00/LogVol00 rhgb quiet</cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 9764fbc681bf3fbeee52c7bf28571cf893416033..ec0cfb034e53ecd8e6bd5d7befcd14a8950dd017 100644 (file)
@@ -8,7 +8,7 @@
   <os>
     <type>linux</type>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 2ab4950e0cd2bb0db9e359751c9ddce80545b538..92a57d8fee7c92487e10115470f57811ee04d3dd 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index 206542e73cc9db01e5dbe7c068fa329c391a14e4..6ace1c3ee440c7d0d5c8c0ec3801b80f9b0ca31e 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index d8449d37d483f85f4efbaa98514215b011344900..e40fa66834396596f0385201c5544eaf22095e01 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index f8f907df0e8ad3237e0c71d0d534d8882513b59e..9e2fb619616775b6f46194d8dd2c8e16584b0546 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index fd7ad4a985e465e77a2c9da28710f2660249c10f..570714ed51c9876236de1f2890634bdaebfa7f96 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index 79972c4382f813cc3322842db1ba0351229170c2..8966be08a87637b1f64a7edd85272ce90d773f55 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <pae/>
   </features>
-  <clock offset='localtime'/>
+  <clock offset='localtime' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index b336128d0de01f034f3217a4f9566691b73d95dd..672a8c043c433081e8d6faea3668f4fa9135eb16 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 6ec16ae636e5edf723627bef273375e16dce34e1..c82d092fc73c0f474e0c87a69f9732f759796050 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'>
+  <clock offset='utc' adjustment='reset'>
     <timer name='hpet' present='yes'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>
index 4dffdd3dac63965ad548f6182f784a3be53497a8..f46a9ea87b94718005fd49b0b27162fc2c376eed 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'>
+  <clock offset='utc' adjustment='reset'>
     <timer name='hpet' present='no'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>
index 9ca9ce0c6844a064a884a125cbd851b70f06651b..539afb776c4b8ec9f2197386c56df3b8999e6810 100644 (file)
@@ -11,7 +11,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index 6bf48f76d3c17728940dd31ac5b8ac5040ebbdf5..43a681977400629dd31df69cba8b664831d2624c 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 06e97018bf63e8ecf5566f57fddd500214ff6d44..5160f0ff8d21ed1610129eadc55c211e687eb7cd 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='localtime'/>
+  <clock offset='localtime' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index a1fb4a96c720083e5d35e3453722236eff67d295..168cea73b808b2c10f001b9e4b083fc5616a14a2 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index ede22bc4b444133b8d95bf53c535fe74e968340b..208c0210b9acc1f89de0cfcd9cb5020ab5c5848d 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 0aaeeef4bc5d60f65420b97b3600bf0f94f4283d..0a5c2f31a86b65004427508c6b24c82c04b170cf 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 0617439c613781d9b7e612d9f8a53a6bb7a2c6e1..ba79de735b164de7ad15c77bd475a6ba6756a183 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index f5c8070fc9f88475b5c196bf5126704e36e1215d..de2b6580cd55d6d9535a9ebd71dfc6087cd25bb1 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 69030199a254c8170af41b9b2fa95515caa1f48b..56cf09b9f53beeec83ed27fb8801b627162158bf 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 48b1b14140f3986250f092cc36010d41008d2e2a..1ba6ae8bb4f6fb009218d01c87e004f2f076c0b4 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index ceaddd27f287de0d2230b61d0031d80e1edcd953..d3c9419fd8b82aa9c33f77951cc84601eee88935 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 69eae958a06f4a08f94e4fe0af6ef4c551611eb0..5e6b58760a92feaaa29606e31bd7da6bfdc494e6 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 164ebd4a4c9f2aacaf48ae13d735fa9443829d6a..01bad0ad0f8b1e8251e96bb4d3ef7e21d380c566 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index c1c849ae8488aa2b08d1b763c6f68b273d640828..83c768ec3fc8d82893477e666318dde51c30671e 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 5f5fbb469a118fa8908ceb94f6f9d0a54b547e9d..b6028a28971b7c67f85dd6dfab8789fbe97a35f3 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 0edc79a3564d27ab5e5544526ba2f6e409cc7d47..7edd9458d2d76af6c4e16a8beb637eff913c44b9 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 7a9ef896314d423c14014d9faf7a09a75dbd16af..f60dc1571a8567b5ebc208922961b624ac21f149 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index b6fa1059425803f7cfe8514297f3539fa8824f15..5f952af07dc53fa16c3b3e12ce8468b0c1706bdf 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index b6fa1059425803f7cfe8514297f3539fa8824f15..5f952af07dc53fa16c3b3e12ce8468b0c1706bdf 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 974d78483f333b7ff1d6728468a8852e1eac79e3..dbaf7a64902d2cdbb41278314a94247234e07f3f 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 75c16daac26a0c39cbac8f100e6d3c2c5147c30a..c092a7639703461d57da81d4efff986d91e37607 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index d80b9a7d363441d588881009a670247d47ece1e6..b5c1d261cdacadef5903d30edce8c94c13ecbffb 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 89c956987f1836dd6ea9be1ad889b6cc89419cb3..36f9c1d7776760fff37397de387537c01bf5b58f 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index d80b9a7d363441d588881009a670247d47ece1e6..b5c1d261cdacadef5903d30edce8c94c13ecbffb 100644 (file)
@@ -12,7 +12,7 @@
   <features>
     <acpi/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 6c5e0472065dc55911cfa5424acc5d8d6e1a939d..0b452e7b6e9b66443280972d0a707520e70c4bf8 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index 482e6a958bdb16a5d6d7a38a8655f8e4370db0ce..bdb8e9a7872880139a5bcd1be5863def70d8901e 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index d79f313829ab31f0847e41ba77edce5b944930eb..0fc88a6efe36d5803eb5694178b8f5d143379fa7 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index 873aedfa2b50a5d4dd529bc7f0a6d095e24320f5..eb38b254e91370bf097effdb309e1a5fab889a3c 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index 63dfb5b8672d61c6dfdaafadafcbd293edf349d9..b91625ec533fa861e1500c53e9017ac991db9c72 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index f1ebfeb50f9190a84b7551a95efb04df59541b98..21c9ac72c231e02516e422de19f963eceee9d474 100644 (file)
@@ -10,7 +10,7 @@
     <type>linux</type>
     <cmdline>xenfb.video=8,1280,1024</cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index e3e6d7f0428a275268a85ac276b9fb519af6864c..46bacd854d497de3331750f1ef65f902f595ca93 100644 (file)
@@ -9,7 +9,7 @@
   <os>
     <type>linux</type>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index 460f0d64536bf77786c8d38a03bd8947588a7d19..d7beeb2fc264670c0010242715c0f581f78ce23a 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='localtime'/>
+  <clock offset='localtime' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index cf85ea535c514a55ef61b26a562568e80015504c..00b1059a1410981b7107886b1a67e5b1869e2e27 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index 806d0c5c46a3812906974332ab5df894da558e63..59db8d3358b0b6cea8b0f431acd5026ef9c948e2 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index be6d789d1dcf697cabe1d61f4fd076435fb8a21a..6b814fdac7e635292da940e1e32bbbaa9855a313 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index be6d789d1dcf697cabe1d61f4fd076435fb8a21a..6b814fdac7e635292da940e1e32bbbaa9855a313 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index 06e5729f1fb1018600f5f6a7858b72e4cbbcfb5b..fd64d6137ce12bbce772242fdd861956c2f7237d 100644 (file)
@@ -8,7 +8,7 @@
   <os>
     <type>linux</type>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index fd7ad4a985e465e77a2c9da28710f2660249c10f..570714ed51c9876236de1f2890634bdaebfa7f96 100644 (file)
@@ -10,7 +10,7 @@
     <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
     <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index b8570f229d069485524a36ed9c4a9cdae8fbaa72..c9abadd1ae05572216a5117a123803d5b47f08c6 100644 (file)
@@ -5,6 +5,7 @@ memory = 420
 vcpus = 2
 bootloader = "/usr/bin/pypxeboot"
 bootargs = "mac=AA:00:86:e2:35:72"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "destroy"
 on_crash = "destroy"
index 854c2505b3a3f993bc940c828ac9e59cb08aa973..8a263a557313f0b486d18db7d81aa87ac60d0f4d 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 4dd75853dfa09afed6c9dee5312578bb930f9e6e..178aecd90574bcc92c52fb6304267b4a33437718 100644 (file)
@@ -9,8 +9,8 @@ boot = "d"
 pae = 1
 acpi = 1
 apic = 1
-localtime = 0
 hpet = 1
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
index e9bd07fefb376bfe0025de8069d917e5abf7060c..c3bc50335e7d8fada69d44b873743a71afb49e83 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'>
+  <clock offset='utc' adjustment='reset'>
     <timer name='hpet' present='yes'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>
index d4fb429932661776db42a8583daf71a213852dde..44f5ac793a59bada7b503bc3c1042a377e6e9976 100644 (file)
@@ -9,8 +9,8 @@ boot = "d"
 pae = 1
 acpi = 1
 apic = 1
-localtime = 0
 hpet = 0
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
index 41fe32d20af707d79a2abe9f03916cc2faf519e3..af29f1d6c3ca932993d8346721ef48a2b706cf0e 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'>
+  <clock offset='utc' adjustment='reset'>
     <timer name='hpet' present='no'/>
   </clock>
   <on_poweroff>destroy</on_poweroff>
index 810fd5322719b65c77f0fdc6ef8a4f09008d16f4..7ae9c1dbef262a0294591246b9c8fdc94501a0aa 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='localtime'/>
+  <clock offset='localtime' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 449329623f73766daa718234664ab5c6e1c5ca8e..96acb9b3881285e28dedf1135129e25a75eb1238 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 3eeb302ec470c8e60ba881bced3e34804be592b2..cf235499a0eb9e68d621988ca146025cd896de92 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 449329623f73766daa718234664ab5c6e1c5ca8e..96acb9b3881285e28dedf1135129e25a75eb1238 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 4ec862c4dad1c90a470f0438e1555249042eb078..5d2ab815f0b7a74715a37bd292648ea002f232d5 100755 (executable)
@@ -9,8 +9,8 @@ boot = "d"
 pae = 1
 acpi = 1
 apic = 1
-localtime = 0
 cdrom = "/root/boot.iso"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
index 8b479acf23a7adcee32a6b164b9f589077ffd0c1..391468f9e9da3c2906578d151586e870e603ae3c 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 7b93607cc5f8ffdf2ed62ef00291413007b0a00b..222407eb77578f04c9dd10c64ea345934dd97fa2 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 3506f85303c175de9e2b2829b0ed5cbc7d5e7cd2..77ae7adb98228fcb5906e31099786979860d5c1d 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index b4f93eac8b5eac5079721ec557fa77171a17797c..90aa69b44b5e9069009c399c96fe530b3291f4aa 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 4b267b1e78aec0bcf4a146bdfd001fccea99236a..85f73410bc2384724f6b486ed81a36d98af3dadc 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 7ff0b3ce9755215d5ae85eabe4e9c87f778a008d..d825ec454a7142709a3e6273c6205eaf4a1ee092 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index e1a3be3b0f178816a5082814f690ba7261acb440..1b97feb1fae99466f8a8c454d2fe3c7d7af382c5 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 64355ec82a85dd031e70d965c17919416c4615e1..2d145030dbcbc2c9f5de7eabf42e293d2216bed5 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 8fdb814f5ce44aadf7945e77b53baf85117bbdc3..9a4fd26be03931b7414b73c11fd8379be7081900 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index eb2ab0c628d11324f73bdff19f23efa79178b075..9fa4a0355721c62e7898d0c2e19f91ae9fd9307f 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 3d0168bfcc55229ac471b21cb22a8fa7c2e496ed..75b2700caa46a8abca709a31320ca5757911ca61 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 26228446ebfdc524abe9dfdff3765c1e84476ae8..c704ed7d28d158e84c84a0c4584cce62a0056827 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index b4fb13cd0b47a7c9bce5c5d6f367022892fe9d57..90b81c2c25d849de33355147c0d261895a38d7d6 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 35789189630c0b1946037eb76d227af07d6ac09b..7ce28bdcbd33814c495198460051e17ed9ea838d 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 7a2d3a7f9d1e1af827e57e8104eb5ce379689d95..3bc8b8a440b5ba585ae24beffd2c2662a8a57b18 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 475cce3cd76be1f6012d3017d9273bbfef0c344a..1d0249f51fef2d430c5f9c5e24937ebcb9f24e6a 100644 (file)
@@ -17,7 +17,7 @@
     <acpi/>
     <apic/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
     <disk type='block' device='disk'>
index c7ca0a37b6debe91a5c90a7b4986772f244d0a6b..13e325993c0b5b062981546c94c5bfd448580010 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 449329623f73766daa718234664ab5c6e1c5ca8e..96acb9b3881285e28dedf1135129e25a75eb1238 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index baceee0cc99cc2b194988505f17428aa8118f9ff..cb2fb4eb719575e4337fbc68b4d5723f45cf37f2 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index 591f2ab9235a1d17eda998749f425310d38f3892..bcc16fb3ff3dfa36f80319aee2bfcf95cc0c7e4a 100755 (executable)
@@ -4,6 +4,7 @@ maxmem = 579
 memory = 394
 vcpus = 1
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
index 8f6bef90f772fc4e1365d1eed7bbdb0be0f68cd6..b2941fd3738fc4c879c349cd5c60e6b2598d19e7 100644 (file)
@@ -8,7 +8,7 @@
   <os>
     <type arch='i686' machine='xenpv'>linux</type>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 3d685cad3106fadc438616f71d72285368c4a80f..98ce75be288117756dd510952e5af4b6b9343bdd 100644 (file)
@@ -4,6 +4,7 @@ maxmem = 579
 memory = 394
 vcpus = 1
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
index 631dc923731b26195eae16d678b7b04c62bc2645..1949871ac986f3c029f5523b79a5af16c668b7ee 100644 (file)
@@ -8,7 +8,7 @@
   <os>
     <type arch='i686' machine='xenpv'>linux</type>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 881ed2b322f15f774be2502dbfc81b8f0df0b89f..633552c8b1dbc1da110ebc678eb8f39ab60c80c8 100644 (file)
@@ -4,6 +4,7 @@ maxmem = 579
 memory = 394
 vcpus = 1
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
index 04bb94ccf157ee5b294e5f5b885375cd2c0ec501..b86379e9886317ab99dea10082ec002211caea49 100644 (file)
@@ -8,7 +8,7 @@
   <os>
     <type arch='i686' machine='xenpv'>linux</type>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 8f5e9aa1ffab5951116c10afb9b6b9c0479516de..8b56e19e42b4fe73996a8ec2573ad106bac9eace 100755 (executable)
@@ -4,6 +4,7 @@ maxmem = 579
 memory = 394
 vcpus = 1
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
index f9624ba449e335599148ec68109f10bb31ebc248..a6e8e68c624c753e2c733eedd1d17e172348f9ec 100644 (file)
@@ -8,7 +8,7 @@
   <os>
     <type arch='i686' machine='xenpv'>linux</type>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 15134ea3f1dcc0d9aed301e275bc9fd6399ee031..eea3365f18adf8e21cada893413e0305485111ac 100644 (file)
@@ -4,6 +4,7 @@ maxmem = 579
 memory = 394
 vcpus = 1
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
index 04bb94ccf157ee5b294e5f5b885375cd2c0ec501..b86379e9886317ab99dea10082ec002211caea49 100644 (file)
@@ -8,7 +8,7 @@
   <os>
     <type arch='i686' machine='xenpv'>linux</type>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index b19029477c20ed4b389e72151a936ebee8deffbe..ed9c771efc2559938d6a4f3425f0f91c33e150a3 100755 (executable)
@@ -4,6 +4,7 @@ maxmem = 579
 memory = 394
 vcpus = 1
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
index f9624ba449e335599148ec68109f10bb31ebc248..a6e8e68c624c753e2c733eedd1d17e172348f9ec 100644 (file)
@@ -8,7 +8,7 @@
   <os>
     <type arch='i686' machine='xenpv'>linux</type>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index d0844f537735f6780e8208697444f79b68e2aaa7..2ac0f797617600c7bf01eebbd4f494b44f843bb1 100644 (file)
@@ -5,6 +5,7 @@ memory = 394
 vcpus = 4
 vcpu_avail = 3
 bootloader = "/usr/bin/pygrub"
+localtime = 0
 on_poweroff = "destroy"
 on_reboot = "restart"
 on_crash = "restart"
index 85e8891eed3af92985646c2a9f2ce82ceed6425f..a77eee9cf51645afaae3822e190f4f9f0981bd71 100644 (file)
@@ -8,7 +8,7 @@
   <os>
     <type arch='i686' machine='xenpv'>linux</type>
   </os>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
index 0cb3ad49d593b6d19cd8c387af0235ef92c20d5c..1a7e18305039a77b98d01a0e25fc7670fbab9668 100644 (file)
@@ -14,7 +14,7 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc' adjustment='reset'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>destroy</on_reboot>
   <on_crash>destroy</on_crash>
index 88c0f68f988d0b87b2cdd7950326df960fcce12d..4850bc02c860b6df20a62be58e00811939483673 100644 (file)
@@ -2,4 +2,5 @@
 (uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\
 (on_reboot 'destroy')(on_crash 'destroy')(image (linux \
 (kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')(args '(hd0,0)/grub/menu.lst')))\
+(localtime 0)\
 (device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\
index 56ff525377768570f45f7cfe1f0c9486854a212b..47c4a3ed6c9f0f76d7a4e47111385f580f76728e 100644 (file)
@@ -4,7 +4,9 @@
 (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(localtime 0)\
+(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w')))\
 (device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
 (script 'vif-bridge')(ip '192.0.2.1'))))\
index e7149b357d905c310e0d01cc1523387586fb8e2c..89d48b2796144a8f0cab2421192b81f14067025a 100644 (file)
@@ -1,6 +1,7 @@
 (vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\
 (uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')\
 (on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\
+(localtime 0)\
 (device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')\
 (script 'vif-bridge'))))\
index b8387e597eb71c18bf47f36d3274b5df722f624d..dd03f7bfbae159fa3527e349151617f287b593b2 100644 (file)
@@ -2,6 +2,8 @@
 (uuid '49a0c6ff-c066-5392-6498-3632d093c2e7')(bootloader '/usr/bin/pygrub')\
 (on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\
 (image (linux (args 'ro root=/dev/VolGroup00/LogVol00')))\
+(localtime 0)\
 (device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')\
-(mode 'w!')))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\
+(mode 'w!')))\
+(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\
 (script 'vif-bridge'))))\
index 960801adc9fe3a1950d175c5df8744a36b5ca2b6..b04c618163628ec01f7183b90b134893bc64bfd6 100644 (file)
@@ -4,5 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(localtime 0)\
+(device (vbd (dev 'xvda')\
 (uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\
index 960801adc9fe3a1950d175c5df8744a36b5ca2b6..b04c618163628ec01f7183b90b134893bc64bfd6 100644 (file)
@@ -4,5 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(localtime 0)\
+(device (vbd (dev 'xvda')\
 (uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\
index 1e1b381af15be5d95a579bc1f81cd87665c6451d..6341d040c3d35ce18b193324e7efba697333a0b9 100644 (file)
@@ -4,5 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (tap (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(localtime 0)\
+(device (tap (dev 'xvda')\
 (uname 'tap:qcow:/root/some.img')(mode 'w'))))\
index 6b66e435669fc29292aaecb5ab93709e9dc3f549..6a6a43a3747a9e32ff086798b7666abf9b281d2a 100644 (file)
@@ -4,5 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (tap (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(localtime 0)\
+(device (tap (dev 'xvda')\
 (uname 'tap:aio:/root/some.img')(mode 'w'))))\
index 6b66e435669fc29292aaecb5ab93709e9dc3f549..6a6a43a3747a9e32ff086798b7666abf9b281d2a 100644 (file)
@@ -4,5 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (tap (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(localtime 0)\
+(device (tap (dev 'xvda')\
 (uname 'tap:aio:/root/some.img')(mode 'w'))))\
index 1e79bcfa03077b55f9ae367c94d08a6484215063..b1caabb97e03e00e9dae9397c1ceabb3ca3cfa6a 100644 (file)
@@ -4,5 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (tap2 (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(localtime 0)\
+(device (tap2 (dev 'xvda')\
 (uname 'tap2:aio:/root/some.img')(mode 'w'))))\
index 1e79bcfa03077b55f9ae367c94d08a6484215063..b1caabb97e03e00e9dae9397c1ceabb3ca3cfa6a 100644 (file)
@@ -4,5 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (tap2 (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(localtime 0)\
+(device (tap2 (dev 'xvda')\
 (uname 'tap2:aio:/root/some.img')(mode 'w'))))\
index dac0aa392c3cd06a59f08737ac837d94850bec9a..8bf6d7a5fa85019b2c6574b311e39be96639d8b7 100644 (file)
@@ -4,5 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(localtime 0)\
+(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w'))))\
index dac0aa392c3cd06a59f08737ac837d94850bec9a..8bf6d7a5fa85019b2c6574b311e39be96639d8b7 100644 (file)
@@ -4,5 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))\
+(localtime 0)\
+(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w'))))\
index 7b2913191408b8ea347a5840f1df5acf1b04a17a..7f70adb5c2371c2d858b3f1f131a1c4b4c774843 100644 (file)
@@ -7,4 +7,5 @@
 core/test/5.91/x86_64/os&version="devel"  ')\
 (loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel none)\
 (serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:xvda')(uname 'file:/root/\'\\some.img')(mode 'w'))))\
index 400872d386eb7a6c9d72249c65b0578ccbe7e4d8..e1486b5f1ed7006ef4c5819ddcc7bbaa47109001 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index 95778928c3000e74ad3a84b66648944ae3e1d380..a396ceae1da5995ae4af94699315d47721f9022b 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index 49508321fb52b12ff3d705d4e113ab113e3bf644..edaa775a51a7aaa5673be1fe07800f96c2ad18e1 100644 (file)
@@ -7,4 +7,5 @@
 core/test/5.91/x86_64/os  ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\
 (boot c)(usb 1)(parallel none)(serial pty)\
 (device_model '/usr/lib/xen/bin/qemu-dm')))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w'))))\
index 4f911192978318973525213d96bd6dcd4675fd18..3ba7e963f75f8c4e57fb1041d126f4ebd74d4b53 100644 (file)
@@ -1,9 +1,10 @@
 (vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')(localtime 1)\
+(on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
-(localtime 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 1)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index 71df15b777ca49f79e745baf696d6436f1ef851e..20f9228c49dcf7463f1c75bc55cb07b3b9cfa44f 100644 (file)
@@ -3,6 +3,7 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
 (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
+(vnc 1)))(localtime 0)\
+(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
 (mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
 (script 'vif-bridge')(model 'e1000')(type ioemu))))\
index 7fe2544293568b4ab182de9b51efee4c525851f3..cab2d96337d0e844e1b296c84c50aefc7b5b4432 100644 (file)
@@ -3,6 +3,7 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
 (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
+(vnc 1)))(localtime 0)\
+(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
 (mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
 (script 'vif-bridge')(type netfront))))\
index 38504b112d685b242e2aebc0d963fb1dae4ea732..14c5e5e0b8644275e887e98ef358cbf088eef41a 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel tcp:localhost:9999)\
 (serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index f3bfbd794a5d45729c1cf6d1a7f01dda56fa49ac..16dcbf2dc4bf15fac589dd7bccae5168b65bd601 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
+(vnc 1)))(localtime 0)\
+(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
 (mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
 (script 'vif-bridge')(model 'e1000')(type ioemu))))\
index 9ecbbe08db9aa1a4a17a7dbdebebf0f9bf63c107..45a758596c7ea030dbd47d22fad18d1293a92f25 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index be40218211f246ea1c9b04592e6b8d145763aba0..90bd2b54687078cf4c14aadaaaefebfed9f661aa 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
+(vnc 1)))(localtime 0)\
+(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
 (mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
 (script 'vif-bridge')(model 'e1000')(type ioemu))))\
index 40243a7431a9e6e7a9af6a29cda7a8a8f41e6a5d..09f4a3354b55388dbf276d5a119b588719a873e2 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial null)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index 4e2dc78732482d2c85a8c8d577a21e47c9f15824..a6200166a3bb2f1bc552526a35acb4cb7031006d 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
+(vnc 1)))(localtime 0)\
+(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\
 (mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
 (script 'vif-bridge')(model 'e1000')(type ioemu))))\
index 7ae93158f2c1541b8bfe036534b0270fb89cb1e5..9ad9d42fbf11f65079b507646f5bf0683da4ca93 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pty)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index 8369bb4f704cb9278aaebe4ad40e38a57480fb9e..9fc7837e9612b8b0baa8e3d2c1d4a81d1fa1a014 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial stdio)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index 40120cf4c1494fed696cd642711939b1308b0f3c..337ad514eb8d0c04bba3498d60957d73c007b885 100644 (file)
@@ -5,6 +5,7 @@
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial telnet:localhost:9999,server,nowait)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index 7938a7bf6e289eed057b6934dc743cd6ffce1dd1..e77ed9f4f6ab929e102b41012fccb2344f5da63e 100644 (file)
@@ -5,6 +5,7 @@
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial tcp:localhost:9999,server,nowait)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index 3c19f25f573f756b2ea894725c14867540f69328..bb7487e8735d99c4edb910e4d709a06b3e2e728d 100644 (file)
@@ -5,6 +5,7 @@
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial udp:localhost:9998@localhost:9999)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index 67ceeaad6c318098ed593b6b3104a657ef556dc0..3686f422ef351b752ea7523d5aa595b54398cfaf 100644 (file)
@@ -5,6 +5,7 @@
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\
 (serial unix:/tmp/serial.sock,server,nowait)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index 4c37c35da800742a1d281ac0e597965ed6fd379b..c00f833e67b4932de3ef25621e8d9ef034beabe6 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
 (soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index c0ad2bc6e1bdf24fb067272be0c096a6ac85f909..e8733dc9193d4c87361d2a762d92096c7324ef0c 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice mouse)(parallel none)\
 (serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index ff1c695d48c77afbbd613ebba8b193070e1b7c27..6a192bbd44748a8d989d9883a1bf1adae628ad6c 100644 (file)
@@ -3,7 +3,8 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(parallel none)\
-(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
+(rtc_timeoffset 0)(localtime 0)))\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (type ioemu))))\
index 81fb92dee9eaef1a2c715ba4ac433fa606250634..b39c8326beff8c46d84ee32ce0746246b06605ca 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index b27e990a939471c7af5273f4a105d759c5315128..78ecfb5342574aaef8d8443d185ef40a042cf7e1 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
 (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
 (vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')))\
+(localtime 0)\
 (device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
index 908ae943a8607c90ec20e9b5a7bc3ec58b7e56ce..74c4174b4f46d471a5987179e1c99803aefad2e8 100644 (file)
@@ -3,7 +3,8 @@
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
 (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
-(vnc 1)(vncunused 1)(keymap 'ja')))(device (vbd (dev 'hda:disk')\
+(vnc 1)(vncunused 1)(keymap 'ja')))\
+(localtime 0)(device (vbd (dev 'hda:disk')\
 (uname 'file:/root/foo.img')(mode 'w')))(device (vbd (dev 'hdc:cdrom')\
 (uname 'file:/root/boot.iso')(mode 'r')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
index 81fb92dee9eaef1a2c715ba4ac433fa606250634..b39c8326beff8c46d84ee32ce0746246b06605ca 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
 (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\
+(localtime 0)\
 (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\
 (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\
 (model 'e1000')(type ioemu))))\
index 0c0c62e7bad2911e4d2d600442306a97e6c9c224..f595f806d1df9a5292d36fcd4b9bf19d8ea5d66b 100644 (file)
@@ -4,7 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(localtime 0)(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w')))\
 (device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
 (script 'vif-bridge'))))\
index d95ed82c87c93a1c0f5c23ff1f778051700e413c..d7367e6baae75548ec2cc0e9e5915f7c48b7f940 100644 (file)
@@ -4,7 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(localtime 0)(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w')))\
 (device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\
 (script 'vif-bridge')(model 'e1000'))))\
index 3430e31f5af81b94c09d4863e32ce5b38ae13498..d502d4b43f791b7f68328119953ead6ac799f41a 100644 (file)
@@ -4,7 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(localtime 0)(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w')))\
 (device (vif (mac '00:11:22:33:44:55')(script 'vif-routed')\
 (ip '172.14.5.6'))))\
index eeebee394824181812f84f0d3938d4293df4ec1e..d5c05e9697d50887bc0dd0a3e97d71dd5ccc07c5 100644 (file)
@@ -4,6 +4,7 @@
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
 (apic 1)(pae 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib/xen/bin/qemu-dm')(vnc 1)(vncunused 0)(vncdisplay 6)))\
+(localtime 0)\
 (device (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode 'w')))\
 (device (vbd (dev 'hdc:cdrom')(mode 'r')))\
 (device (vif (mac '00:16:3e:0a:7b:39')(model 'e1000')(type ioemu))))\
index fdc48cff612909eeda57cb48923e93367fc18bcf..5ab5d31369cb98c6fe51b2e5c5dd011f42a6a433 100644 (file)
@@ -4,7 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(localtime 0)(device (vbd (dev 'xvda')\
 (uname 'phy:/dev/MainVG/GuestLV')(mode 'w')))\
 (device (pci (dev (domain 0x0001)(bus 0x0c)(slot 0x1b)(func 0x2))\
 (dev (domain 0x0000)(bus 0x01)(slot 0x13)(func 0x0)))))\
index 236017e768a7a3888be71d328bb07a37e2b59367..7a3811ea5492872766c0b20cdc50c1a55bddc403 100644 (file)
@@ -2,4 +2,5 @@
 (uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pygrub')\
 (bootloader_args '-q')(on_poweroff 'destroy')(on_reboot 'destroy')\
 (on_crash 'destroy')(image (linux (args 'xenfb.video=8,1280,1024')))\
+(localtime 0)\
 (device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))\
index c11938edd6d59be06f1adf7972bf13ccc2551635..981f105f03bc57afa894447c85a5d91b30dd8e4f 100644 (file)
@@ -1,5 +1,7 @@
 (vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\
 (uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pypxeboot')\
 (bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')\
-(on_reboot 'destroy')(on_crash 'destroy')(device (vbd (dev 'xvda')\
+(on_reboot 'destroy')(on_crash 'destroy')\
+(localtime 0)\
+(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w'))))\
index df854cac092f22e622d36957dfcb36037a162888..809a7e55ba491299466be60ddfd1fef629859a18 100644 (file)
@@ -4,5 +4,5 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(localtime 0)(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w'))))\
index 5eb0133d20e1fa8b12be9c91284db0d836270509..70d2edf28a0d64564eec7f8e6091b91861d2fdb9 100644 (file)
@@ -4,7 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(localtime 0)(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\
 (device (vfb (type vnc)(vncunused 1)(vnclisten '127.0.0.1')\
 (vncpasswd '123456')(keymap 'ja'))))\
index c74098f3d78b34451b02a303aaafdb7e19807fc1..9bace13db8b5a66a0c4fe3826ebe7ae835754df6 100644 (file)
@@ -4,7 +4,7 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(localtime 0)(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\
 (device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')\
 (vncpasswd '123456')(keymap 'ja'))))\
index 1e22b83857d20e652c650c3de609db8157dbc9a6..c2c12907cad1d6e5489969fc52607cc6a23f5efc 100644 (file)
@@ -6,4 +6,5 @@
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
 core/test/5.91/x86_64/os  ')(vnc 1)(vncunused 0)(vncdisplay 6)\
 (vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))\
+(localtime 0)\
 (device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))\
index dac0aa392c3cd06a59f08737ac837d94850bec9a..90efcd7d729f752849c40db701ac7862b029944a 100644 (file)
@@ -4,5 +4,5 @@
 (image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
-core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')\
+core/test/5.91/x86_64/os  ')))(localtime 0)(device (vbd (dev 'xvda')\
 (uname 'file:/root/some.img')(mode 'w'))))\