[libvirt] [PATCHv3 0/3] Xen: Fix <clock> handling
Before version 3.1 xen only implemented clock/@offset='utc' and 'localtime'. With the introduction of managed domains in 3.1 xend keeps track of the rtc_timeoffset, even over reboots. This translates to libvirts clock/@offset='variable' variant. Be advised that only HV domains have a RTC. In addition xen also supports a variant where the offset is tracked to 'localtime', which is currently not supported by libvirt. To make matters worse, this was somehow broken in some versions of xen and was finally fixed with version xen-3.4. The following patch set ... * adds support for handling variable offsets relative to localtime, * fixes libvirt to use clock/@offset='variable' for newer xen versions, * adapts the test suit accordingly I've tested this on CenOS5 (xend-3.0.3 + 3.1.2 hypervisor?), UCS-2.3 (xen-3.2.1), UCS-2.4 (xen-3.4.3) and UCS-3.0 (xen-4.1.2). Since v1: + fix handling of direct-PV-domains + added handling of localtime=1 + rtc_timeoffset + fixed test suite Since v2: (on feedback by Eric) + add the adjustment='reset' attribute to force the old behaviour + handle adjustment='$timeDelta' as a short-cut for the conversion to variable. + simplify error path handling + update version numbers to 0.9.11 Philipp Hahn (3): Support clock=variable relative to localtime Xen: Fix <clock> handling Xen: Adapt <clock> tests docs/formatdomain.html.in | 18 ++- docs/schemas/domaincommon.rng | 30 +++- src/conf/domain_conf.c | 60 +++++++- src/conf/domain_conf.h | 17 ++- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 8 +- src/qemu/qemu_process.c | 2 +- src/xenxs/xen_sxpr.c | 167 +++++++++++++++----- src/xenxs/xen_xm.c | 123 ++++++++++++--- .../qemuxml2argv-clock-variable.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 2 +- .../sexpr2xml-disk-block-shareable.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 2 +- .../sexpr2xml-disk-drv-blktap-qcow.xml | 2 +- .../sexpr2xml-disk-drv-blktap-raw.xml | 2 +- .../sexpr2xml-disk-drv-blktap2-raw.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 2 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 2 +- .../sexpr2xml-pv-bootloader-cmdline.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 2 +- .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml | 2 +- .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv.xml | 2 +- tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg | 1 + tests/xmconfigdata/test-escape-paths.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- .../test-fullvirt-serial-dev-2-ports.xml | 2 +- .../test-fullvirt-serial-dev-2nd-port.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- .../test-fullvirt-usbtablet-no-bus.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-paravirt-net-e1000.cfg | 1 + tests/xmconfigdata/test-paravirt-net-e1000.xml | 2 +- tests/xmconfigdata/test-paravirt-net-vifname.cfg | 1 + tests/xmconfigdata/test-paravirt-net-vifname.xml | 2 +- .../test-paravirt-new-pvfb-vncdisplay.cfg | 1 + .../test-paravirt-new-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-new-pvfb.xml | 2 +- .../test-paravirt-old-pvfb-vncdisplay.cfg | 1 + .../test-paravirt-old-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-old-pvfb.xml | 2 +- tests/xmconfigdata/test-paravirt-vcpu.cfg | 1 + tests/xmconfigdata/test-paravirt-vcpu.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 1 + .../xml2sexpr-disk-block-shareable.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-block.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-qcow.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap2-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-escape.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 5 +- tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 1 + .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 3 +- .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 1 + .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-routed.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 2 +- .../xml2sexpr-pv-bootloader-cmdline.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv.sexpr | 2 +- 157 files changed, 525 insertions(+), 200 deletions(-)
Since Xen 3.1 the clock=variable semantic is supported. In addition to qemu/kvm Xen also knows about a variant where the offset is relative to 'localtime' instead of 'utc'. Extends the libvirt structure with a flag 'basis' to specify, if the offset is relative to 'localtime' or 'utc'. Extends the libvirt structure with a flag 'reset' to force the reset behaviour of 'localtime' and 'utc'; this is needed for backward compatibility with previous versions of libvirt, since they report incorrect XML. Adapt the only user 'qemu' to the new name. Extend the RelaxNG schema accordingly. Document the new 'basis' attribute in the HTML documentation. Adapt test for the new attribute. Signed-off-by: Philipp Hahn <hahn@univention.de> --- docs/formatdomain.html.in | 18 +++++- docs/schemas/domaincommon.rng | 30 ++++++++-- src/conf/domain_conf.c | 60 ++++++++++++++++++- src/conf/domain_conf.h | 17 +++++- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 8 ++- src/qemu/qemu_process.c | 2 +- .../qemuxml2argv-clock-variable.xml | 2 +- 8 files changed, 120 insertions(+), 18 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 29497a0..64ecdc9 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -920,11 +920,20 @@ <dt><code>utc</code></dt> <dd> The guest clock will always be synchronized to UTC when - booted</dd> + booted. + <span class="since">Since 0.9.11</span> 'utc' mode can be converted + to 'variable' mode, which can be controlled by using the + <code>adjustment</code> attribute. If the value is 'reset', the + conversion is never done and an error is returned. A numeric value + forces the conversion to 'variable' mode using the value as the + initial adjustment. The default is hypervisor specific. + </dd> <dt><code>localtime</code></dt> <dd> The guest clock will be synchronized to the host's configured timezone when booted, if any. + <span class="since">Since 0.9.11</span> <code>adjustment</code> + attribute (see 'utc' mode). </dd> <dt><code>timezone</code></dt> <dd> @@ -935,12 +944,15 @@ <dt><code>variable</code></dt> <dd> The guest clock will have an arbitrary offset applied - relative to UTC. The delta relative to UTC is specified + relative to UTC or localtime, depending on the <code>basis</code> + attribute. The delta relative to UTC (or localtime) is specified in seconds, using the <code>adjustment</code> attribute. The guest is free to adjust the RTC over time and expect that it will be honoured at next reboot. This is in - contrast to 'utc' mode, where the RTC adjustments are + contrast to 'utc' and 'localtime' mode, where the RTC adjustments are lost at each reboot. <span class="since">Since 0.7.7</span> + <span class="since">Since 0.9.11</span> the <code>basis</code> + attribute can be either 'utc' (default) or 'localtime'. </dd> </dl> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8111045..aaf4b6d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -551,12 +551,22 @@ <optional> <element name="clock"> <choice> - <attribute name="offset"> - <value>localtime</value> - </attribute> - <attribute name="offset"> - <value>utc</value> - </attribute> + <group> + <attribute name="offset"> + <choice> + <value>localtime</value> + <value>utc</value> + </choice> + </attribute> + <optional> + <attribute name='adjustment'> + <choice> + <ref name='timeDelta'/> + <value>reset</value> + </choice> + </attribute> + </optional> + </group> <group> <attribute name="offset"> <value>timezone</value> @@ -576,6 +586,14 @@ <ref name="timeDelta"/> </attribute> </optional> + <optional> + <attribute name="basis"> + <choice> + <value>utc</value> + <value>localtime</value> + </choice> + </attribute> + </optional> </group> </choice> <zeroOrMore> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index aa4b32d..5508fc9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -575,6 +575,10 @@ VIR_ENUM_IMPL(virDomainClockOffset, VIR_DOMAIN_CLOCK_OFFSET_LAST, "variable", "timezone"); +VIR_ENUM_IMPL(virDomainClockBasis, VIR_DOMAIN_CLOCK_BASIS_LAST, + "utc", + "localtime"); + VIR_ENUM_IMPL(virDomainTimerName, VIR_DOMAIN_TIMER_NAME_LAST, "platform", "pit", @@ -7467,10 +7471,52 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC; } switch (def->clock.offset) { + case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME: + case VIR_DOMAIN_CLOCK_OFFSET_UTC: + tmp = virXPathString("string(./clock/@adjustment)", ctxt); + if (tmp) { + if (STREQ(tmp, "reset")) { + def->clock.data.utc_reset = true; + } else { + char *conv = NULL; + unsigned long long val; + val = strtoll(tmp, &conv, 10); + if (conv == tmp || *conv != '\0') { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown clock adjustment '%s'"), tmp); + goto error; + } + switch (def->clock.offset) { + case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME: + def->clock.data.variable.basis = VIR_DOMAIN_CLOCK_BASIS_LOCALTIME; + break; + case VIR_DOMAIN_CLOCK_OFFSET_UTC: + def->clock.data.variable.basis = VIR_DOMAIN_CLOCK_BASIS_UTC; + break; + } + def->clock.data.variable.adjustment = val; + } + VIR_FREE(tmp); + } else { + def->clock.data.utc_reset = false; + } + break; + case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE: if (virXPathLongLong("number(./clock/@adjustment)", ctxt, - &def->clock.data.adjustment) < 0) - def->clock.data.adjustment = 0; + &def->clock.data.variable.adjustment) < 0) + def->clock.data.variable.adjustment = 0; + tmp = virXPathString("string(./clock/@basis)", ctxt); + if (tmp) { + if ((def->clock.data.variable.basis = virDomainClockBasisTypeFromString(tmp)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown clock basis '%s'"), tmp); + goto error; + } + VIR_FREE(tmp); + } else { + def->clock.data.variable.basis = VIR_DOMAIN_CLOCK_BASIS_UTC; + } break; case VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE: @@ -11830,9 +11876,15 @@ virDomainDefFormatInternal(virDomainDefPtr def, virBufferAsprintf(buf, " <clock offset='%s'", virDomainClockOffsetTypeToString(def->clock.offset)); switch (def->clock.offset) { + case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME: + case VIR_DOMAIN_CLOCK_OFFSET_UTC: + if (def->clock.data.utc_reset) + virBufferAddLit(buf, " adjustment='reset'"); + break; case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE: - virBufferAsprintf(buf, " adjustment='%lld'", - def->clock.data.adjustment); + virBufferAsprintf(buf, " adjustment='%lld' basis='%s'", + def->clock.data.variable.adjustment, + virDomainClockBasisTypeToString(def->clock.data.variable.basis)); break; case VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE: virBufferEscapeString(buf, " timezone='%s'", def->clock.data.timezone); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0a2795d..d3bb83e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1366,15 +1366,27 @@ enum virDomainClockOffsetType { VIR_DOMAIN_CLOCK_OFFSET_LAST, }; +enum virDomainClockBasis { + VIR_DOMAIN_CLOCK_BASIS_UTC = 0, + VIR_DOMAIN_CLOCK_BASIS_LOCALTIME = 1, + + VIR_DOMAIN_CLOCK_BASIS_LAST, +}; + typedef struct _virDomainClockDef virDomainClockDef; typedef virDomainClockDef *virDomainClockDefPtr; struct _virDomainClockDef { int offset; union { - /* Adjustment in seconds, relative to UTC, when + /* Bug-compatibility-mode for Xen utc|localtime */ + int utc_reset; + /* Adjustment in seconds, relative to UTC or LOCALTIME, when * offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE */ - long long adjustment; + struct { + long long adjustment; + int basis; + } variable; /* Timezone name, when * offset == VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME */ @@ -2069,6 +2081,7 @@ int virDomainStateReasonFromString(virDomainState state, const char *reason); VIR_ENUM_DECL(virDomainSeclabel) VIR_ENUM_DECL(virDomainClockOffset) +VIR_ENUM_DECL(virDomainClockBasis) VIR_ENUM_DECL(virDomainTimerName) VIR_ENUM_DECL(virDomainTimerTrack) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d6ad36c..f850742 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -258,6 +258,7 @@ virDomainChrTcpProtocolTypeFromString; virDomainChrTcpProtocolTypeToString; virDomainChrTypeFromString; virDomainChrTypeToString; +virDomainClockBasisTypeToString; virDomainClockOffsetTypeFromString; virDomainClockOffsetTypeToString; virDomainConfigFile; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0e26df1..3f0c3c1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3430,7 +3430,13 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) time_t now = time(NULL); struct tm nowbits; - now += def->data.adjustment; + if (def->data.variable.basis != VIR_DOMAIN_CLOCK_BASIS_UTC) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported clock basis '%s'"), + virDomainClockBasisTypeToString(def->data.variable.basis)); + goto error; + } + now += def->data.variable.adjustment; gmtime_r(&now, &nowbits); virBufferAsprintf(&buf, "base=%d-%02d-%02dT%02d:%02d:%02d", diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2d92d66..2f6f068 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -734,7 +734,7 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, event = virDomainEventRTCChangeNewFromObj(vm, offset); if (vm->def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE) - vm->def->clock.data.adjustment = offset; + vm->def->clock.data.variable.adjustment = offset; if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) VIR_WARN("unable to save domain status with RTC change"); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml index 9f52cca..eadefac 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml @@ -8,7 +8,7 @@ <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> </os> - <clock offset='variable' adjustment='123456'/> + <clock offset='variable' adjustment='123456' basis='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> -- 1.7.1
Hi, forgot one line to commit On Monday 06 February 2012 14:59:16 Philipp Hahn wrote:
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index aa4b32d..5508fc9 100644 ... @@ -7467,10 +7471,52 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC; } switch (def->clock.offset) { + case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME: + case VIR_DOMAIN_CLOCK_OFFSET_UTC: + tmp = virXPathString("string(./clock/@adjustment)", ctxt); + if (tmp) { + if (STREQ(tmp, "reset")) { + def->clock.data.utc_reset = true; + } else { + char *conv = NULL; + unsigned long long val; + val = strtoll(tmp, &conv, 10); + if (conv == tmp || *conv != '\0') { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown clock adjustment '%s'"), tmp); + goto error; + } + switch (def->clock.offset) { + case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME: + def->clock.data.variable.basis = VIR_DOMAIN_CLOCK_BASIS_LOCALTIME; + break; + case VIR_DOMAIN_CLOCK_OFFSET_UTC: + def->clock.data.variable.basis = VIR_DOMAIN_CLOCK_BASIS_UTC; + break; + } def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_VARIABLE; + def->clock.data.variable.adjustment = val; + } + VIR_FREE(tmp); + } else { + def->clock.data.utc_reset = false; + } + break; +
Sincerely Philipp -- Philipp Hahn Open Source Software Engineer hahn@univention.de Univention GmbH Linux for Your Business fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/
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='...'. Signed-off-by: Philipp Hahn <hahn@univention.de> --- src/xenxs/xen_sxpr.c | 167 ++++++++++++++++++++++++++++++++++++++------------ src/xenxs/xen_xm.c | 123 +++++++++++++++++++++++++++++-------- 2 files changed, 225 insertions(+), 65 deletions(-) diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index f8390ea..e8df5ea 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -1126,7 +1126,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; @@ -1247,7 +1247,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); @@ -1259,10 +1258,30 @@ 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) + vmlocaltime = strtol(value, NULL, 0); + /* 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; @@ -1280,14 +1299,17 @@ 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) + vmlocaltime = strtol(value, NULL, 0); + /* 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 +2217,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 +2278,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 +2432,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 +2462,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], diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index e580a3e..04dcded 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -414,9 +414,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; @@ -1450,7 +1472,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]; @@ -1557,26 +1579,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 && @@ -1615,8 +1617,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, -- 1.7.1
"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 becaus code was moved around. Signed-off-by: Philipp Hahn <hahn@univention.de> --- tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 2 +- .../sexpr2xml-disk-block-shareable.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 2 +- .../sexpr2xml-disk-drv-blktap-qcow.xml | 2 +- .../sexpr2xml-disk-drv-blktap-raw.xml | 2 +- .../sexpr2xml-disk-drv-blktap2-raw.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 2 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 2 +- .../sexpr2xml-pv-bootloader-cmdline.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 2 +- .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml | 2 +- .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv.xml | 2 +- tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg | 1 + tests/xmconfigdata/test-escape-paths.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- .../test-fullvirt-serial-dev-2-ports.xml | 2 +- .../test-fullvirt-serial-dev-2nd-port.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- .../test-fullvirt-usbtablet-no-bus.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-paravirt-net-e1000.cfg | 1 + tests/xmconfigdata/test-paravirt-net-e1000.xml | 2 +- tests/xmconfigdata/test-paravirt-net-vifname.cfg | 1 + tests/xmconfigdata/test-paravirt-net-vifname.xml | 2 +- .../test-paravirt-new-pvfb-vncdisplay.cfg | 1 + .../test-paravirt-new-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-new-pvfb.xml | 2 +- .../test-paravirt-old-pvfb-vncdisplay.cfg | 1 + .../test-paravirt-old-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-old-pvfb.xml | 2 +- tests/xmconfigdata/test-paravirt-vcpu.cfg | 1 + tests/xmconfigdata/test-paravirt-vcpu.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr | 4 +++- tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 1 + .../xml2sexpr-disk-block-shareable.sexpr | 4 +++- tests/xml2sexprdata/xml2sexpr-disk-block.sexpr | 4 +++- .../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr | 4 +++- .../xml2sexpr-disk-drv-blktap-qcow.sexpr | 4 +++- .../xml2sexpr-disk-drv-blktap-raw.sexpr | 4 +++- .../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr | 4 +++- .../xml2sexpr-disk-drv-blktap2-raw.sexpr | 4 +++- .../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr | 4 +++- tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr | 4 +++- tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 4 +++- tests/xml2sexprdata/xml2sexpr-escape.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 5 +++-- tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr | 3 ++- .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 3 ++- .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 1 + .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 3 ++- .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 3 ++- tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 3 ++- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 1 + .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr | 3 ++- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 3 ++- tests/xml2sexprdata/xml2sexpr-fv.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-routed.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 2 +- .../xml2sexpr-pv-bootloader-cmdline.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr | 4 +++- tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv.sexpr | 2 +- 147 files changed, 180 insertions(+), 117 deletions(-) diff --git a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml b/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml index 9221bdd..c2441bd 100644 --- a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml +++ b/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml index bfac0f4..4d065a7 100644 --- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml +++ b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml index 6be4d5d..986b414 100644 --- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml +++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml index d7e3054..a2d849f 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml index d9d7552..2ee205c 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml index 04824ba..742721a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml index 3e935db..8acf71f 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml index c6951de..72edf1a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml index 8aa3214..5fceb52 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml index 3f501e7..9620ecf 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml index 2c1c756..5601435 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml index d0ead27..b58ef23 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml index 9e6deae..0fad5a4 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml index bd38a25..fb9ff93 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml index f4836fb..f38491e 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml index da3b3ae..9b43a05 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml index 4dc218f..39f7ec5 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml index 57b8d27..13790a2 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml index e39b638..6b055aa 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml index 5e085f9..7aee695 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml index 5619376..e68f467 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml index db010ad..1e058d5 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml index faeed77..24fd4e1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml index 0967ac7..c55ba3f 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml index 3773d3b..6d6228f 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml index d46df09..e7cc1a6 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml index 34f25ac..5101adb 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml index 6c69214..c0c9a7a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml index bcc20dd..c97af34 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml index 93f20fa..ee6f2c6 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml index 1635584..c2ac6ed 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml index 1635584..c2ac6ed 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml index 4870863..5734327 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml index 74f4bdf..34604ab 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml index 5dbc64d..5298a6f 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml index e3c4e20..1942321 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml index 5dbc64d..5298a6f 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml index a1249ba..75244f8 100644 --- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml +++ b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml index 91fd656..eb761ae 100644 --- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml +++ b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml index a519551..c19a281 100644 --- a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml +++ b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml index 5a82775..172f52e 100644 --- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml +++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml b/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml index fe0ecb6..391129a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml index b336d77..c7a1fbe 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml index 920c058..ea340a6 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml index 6466192..098dd23 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml index 0d6bf11..4df1798 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml index f5e7843..256e744 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml index 70f44fc..a772c83 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml index 70f44fc..a772c83 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml @@ -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_... </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> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml index 766c78d..af29825 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml @@ -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> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv.xml b/tests/sexpr2xmldata/sexpr2xml-pv.xml index 8aa3214..5fceb52 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv.xml @@ -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_... </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> diff --git a/tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg b/tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg index b8570f2..c9abadd 100644 --- a/tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg +++ b/tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg @@ -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" diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml index 05a4860..bc4e2f3 100644 --- a/tests/xmconfigdata/test-escape-paths.xml +++ b/tests/xmconfigdata/test-escape-paths.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg index 4dd7585..178aecd 100644 --- a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg @@ -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" diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml index 20c6d94..012095f 100644 --- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg index d4fb429..44f5ac7 100644 --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg @@ -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" diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml index 4afe38a..25c398c 100644 --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml index 6826cde..c2a1522 100644 --- a/tests/xmconfigdata/test-fullvirt-localtime.xml +++ b/tests/xmconfigdata/test-fullvirt-localtime.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-net-ioemu.xml b/tests/xmconfigdata/test-fullvirt-net-ioemu.xml index a8dfaf5..e5c9ca2 100644 --- a/tests/xmconfigdata/test-fullvirt-net-ioemu.xml +++ b/tests/xmconfigdata/test-fullvirt-net-ioemu.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml index 2b92033..4624652 100644 --- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml +++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml index a8dfaf5..e5c9ca2 100644 --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg index 4ec862c..5d2ab81 100755 --- a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg +++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg @@ -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" diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml index 5a7ebde..9fb49cb 100644 --- a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml +++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml index 2c36bd5..19dcce1 100644 --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml index 5dcb3ce..8f99a6c 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml index 539aeae..a69ce00 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml index d9dfc74..b2cc1a2 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-file.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml index d7fd23d..a85f07a 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-null.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml index fdfb344..6304d4f 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml index 0afe4e9..6b0dcb0 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml index 91f4c1e..ad9f1df 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml index 64d8183..b5381f9 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml index 9307710..8cbd7eb 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml index 16abde3..ca9d0c7 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml index 3ba9fc4..bcd8a37 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml index 6d82e38..58caa02 100644 --- a/tests/xmconfigdata/test-fullvirt-sound.xml +++ b/tests/xmconfigdata/test-fullvirt-sound.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml index 709f084..be26c9b 100644 --- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml index 5eeb9c0..a878016 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml +++ b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml @@ -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'> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml index b4f309e..031e6ff 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml @@ -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> diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml index a8dfaf5..e5c9ca2 100644 --- a/tests/xmconfigdata/test-fullvirt-utc.xml +++ b/tests/xmconfigdata/test-fullvirt-utc.xml @@ -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> diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml index a7a27d3..3b9374e 100644 --- a/tests/xmconfigdata/test-no-source-cdrom.xml +++ b/tests/xmconfigdata/test-no-source-cdrom.xml @@ -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> diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.cfg b/tests/xmconfigdata/test-paravirt-net-e1000.cfg index 591f2ab..bcc16fb 100755 --- a/tests/xmconfigdata/test-paravirt-net-e1000.cfg +++ b/tests/xmconfigdata/test-paravirt-net-e1000.cfg @@ -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" diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml index 9e6505e..5afcfa8 100644 --- a/tests/xmconfigdata/test-paravirt-net-e1000.xml +++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml @@ -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> diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.cfg b/tests/xmconfigdata/test-paravirt-net-vifname.cfg index 3d685ca..98ce75b 100644 --- a/tests/xmconfigdata/test-paravirt-net-vifname.cfg +++ b/tests/xmconfigdata/test-paravirt-net-vifname.cfg @@ -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" diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.xml b/tests/xmconfigdata/test-paravirt-net-vifname.xml index 22c908f..2840bcf 100644 --- a/tests/xmconfigdata/test-paravirt-net-vifname.xml +++ b/tests/xmconfigdata/test-paravirt-net-vifname.xml @@ -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> diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg index 881ed2b..633552c 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg +++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.cfg @@ -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" diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml index 2c1d50e..211446f 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml @@ -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> diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.cfg b/tests/xmconfigdata/test-paravirt-new-pvfb.cfg index 8f5e9aa..8b56e19 100755 --- a/tests/xmconfigdata/test-paravirt-new-pvfb.cfg +++ b/tests/xmconfigdata/test-paravirt-new-pvfb.cfg @@ -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" diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml index 9cbaec0..a429490 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml @@ -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> diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg index 15134ea..eea3365 100644 --- a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg +++ b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg @@ -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" diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml index 2c1d50e..211446f 100644 --- a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml +++ b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml @@ -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> diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.cfg b/tests/xmconfigdata/test-paravirt-old-pvfb.cfg index b190294..ed9c771 100755 --- a/tests/xmconfigdata/test-paravirt-old-pvfb.cfg +++ b/tests/xmconfigdata/test-paravirt-old-pvfb.cfg @@ -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" diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.xml b/tests/xmconfigdata/test-paravirt-old-pvfb.xml index 9cbaec0..a429490 100644 --- a/tests/xmconfigdata/test-paravirt-old-pvfb.xml +++ b/tests/xmconfigdata/test-paravirt-old-pvfb.xml @@ -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> diff --git a/tests/xmconfigdata/test-paravirt-vcpu.cfg b/tests/xmconfigdata/test-paravirt-vcpu.cfg index d0844f5..2ac0f79 100644 --- a/tests/xmconfigdata/test-paravirt-vcpu.cfg +++ b/tests/xmconfigdata/test-paravirt-vcpu.cfg @@ -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" diff --git a/tests/xmconfigdata/test-paravirt-vcpu.xml b/tests/xmconfigdata/test-paravirt-vcpu.xml index 5817f80..a9c75db 100644 --- a/tests/xmconfigdata/test-paravirt-vcpu.xml +++ b/tests/xmconfigdata/test-paravirt-vcpu.xml @@ -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> diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml index 31df1c7..6fc2124 100644 --- a/tests/xmconfigdata/test-pci-devs.xml +++ b/tests/xmconfigdata/test-pci-devs.xml @@ -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> diff --git a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr b/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr index 88c0f68..4850bc0 100644 --- a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr index 56ff525..47c4a3e 100644 --- a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr index e7149b3..89d48b2 100644 --- a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr index b8387e5..dd03f7b 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr index 960801a..b04c618 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr index 960801a..b04c618 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr index 1e1b381..6341d04 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr index 6b66e43..6a6a43a 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr index 6b66e43..6a6a43a 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr index 1e79bcf..b1caabb 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr index 1e79bcf..b1caabb 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr index dac0aa3..8bf6d7a 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr index dac0aa3..8bf6d7a 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-escape.sexpr b/tests/xml2sexprdata/xml2sexpr-escape.sexpr index 7b29131..7f70adb 100644 --- a/tests/xml2sexprdata/xml2sexpr-escape.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-escape.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr index 400872d..e1486b5 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr index 9577892..a396cea 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr index 4950832..edaa775 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr index 4f91119..3ba7e96 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr index 71df15b..20f9228 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr index 7fe2544..cab2d96 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr index 38504b1..14c5e5e 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr index f3bfbd7..16dcbf2 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr index 9ecbbe0..45a7585 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr index be40218..90bd2b5 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr index 40243a7..09f4a33 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr index 4e2dc78..a620016 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr index 7ae9315..9ad9d42 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr index 8369bb4..9fc7837 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr index 40120cf..337ad51 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr index 7938a7b..e77ed9f 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr index 3c19f25..bb7487e 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr index 67ceeaa..3686f42 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr index 4c37c35..c00f833 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr index c0ad2bc..e8733dc 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr index ff1c695..6a192bb 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr index 81fb92d..b39c832 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr index b27e990..78ecfb5 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr @@ -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')\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr index 908ae94..74c4174 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr @@ -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')\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv.sexpr b/tests/xml2sexprdata/xml2sexpr-fv.sexpr index 81fb92d..b39c832 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr b/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr index 0c0c62e..f595f80 100644 --- a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr b/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr index d95ed82..d7367e6 100644 --- a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr b/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr index 3430e31..d502d4b 100644 --- a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr b/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr index eeebee3..d5c05e9 100644 --- a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr @@ -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))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr b/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr index fdc48cf..5ab5d31 100644 --- a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr @@ -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)))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr index 236017e..7a3811e 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr index c11938e..981f105 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr index df854ca..809a7e5 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr index 5eb0133..70d2edf 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr index c74098f..9bace13 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr index 1e22b83..c2c1290 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr @@ -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'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv.sexpr b/tests/xml2sexprdata/xml2sexpr-pv.sexpr index dac0aa3..90efcd7 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv.sexpr @@ -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'))))\ -- 1.7.1
participants (1)
-
Philipp Hahn