subject:"\[libvirt\] \[PATCH 2\/6\] Add new clock mode allowing variable adjustments"

Re: [libvirt] [PATCH 2/6] Add new clock mode allowing variable adjustments

2010-03-01 Thread Daniel Veillard

On Thu, Feb 18, 2010 at 05:54:28PM +, Daniel P. Berrange wrote:
 This introduces a third option for clock offset synchronization,
 that allows an arbitrary / variable adjustment to be set. In
 essence the XML contains the time delta in seconds, relative to
 UTC.
 
   clock offset='variable' adjustment='123465'/
 
 The difference from 'utc' mode, is that management apps should
 track adjustments and preserve them at next reboot.

  hum ... if the management layer start to track time of delta w.r.t.
UTC as defined by node clock, I also assume they manage the variations
in clock when migrating too (or that the nodes clocks are actually
properly sync'ed).

 * docs/schemas/domain.rng: Schema for new clock mode
 * src/conf/domain_conf.c, src/conf/domain_conf.h: Parse
   new clock time delta
 * src/libvirt_private.syms, src/util/xml.c, src/util/xml.h: Add
   virXPathLongLong() method
 ---
  docs/schemas/domain.rng  |   25 +---
  src/conf/domain_conf.c   |   18 +-
  src/conf/domain_conf.h   |5 
  src/libvirt_private.syms |1 +
  src/util/xml.c   |   54 
 ++
  src/util/xml.h   |5 +++-
  6 files changed, 101 insertions(+), 7 deletions(-)
 
 diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
 index 1ff0944..d295bfe 100644
 --- a/docs/schemas/domain.rng
 +++ b/docs/schemas/domain.rng
 @@ -297,12 +297,24 @@
define name=clock
  optional
element name=clock
 -attribute name=offset
 -  choice
 + choice
 +  attribute name=offset

  hum isn't that inserting tabs in the XML that we remove from time to
  time :-) ?

  valuelocaltime/value
 +   /attribute
 +  attribute name=offset
  valueutc/value
 -  /choice
 -/attribute
 +   /attribute
 +   group
 +attribute name=offset
 +  valuevariable/value
 + /attribute
 + optional
 +   attribute name=adjustment
 + ref name=timeDelta/
 +   /attribute
 + /optional
 +   /group
 + /choice
  empty/
/element
  /optional
 @@ -1567,4 +1579,9 @@
param name='pattern'[a-zA-Z0-9\-_]+/param
  /data
/define
 +  define name=timeDelta
 +data type=string

  actually we could use XSD integer there
http://www.w3.org/TR/xmlschema-2/#integer
but this won't change much

 +  param name=pattern(-|\+)?[0-9]+/param
 +/data
 +  /define
  /grammar
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
 index f86b4eb..49d5d19 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
 @@ -231,7 +231,8 @@ VIR_ENUM_IMPL(virDomainNetdevMacvtap, 
 VIR_DOMAIN_NETDEV_MACVTAP_MODE_LAST,
  
  VIR_ENUM_IMPL(virDomainClockOffset, VIR_DOMAIN_CLOCK_OFFSET_LAST,
utc,
 -  localtime);
 +  localtime,
 +  variable);
  
  #define virDomainReportError(code, fmt...)   \
  virReportErrorHelper(NULL, VIR_FROM_DOMAIN, code, __FILE__,  \
 @@ -3492,6 +3493,13 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr 
 caps,
  } else {
  def-clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
  }
 +switch (def-clock.offset) {
 +case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE:
 +if (virXPathLongLong(./clock/@adjustment, ctxt,
 + def-clock.adjustment)  0)
 +def-clock.adjustment = 0;

   Hum, should probably give an error message here 

 +break;
 +}
  
  def-os.bootloader = virXPathString(string(./bootloader), ctxt);
  def-os.bootloaderArgs = virXPathString(string(./bootloader_args), 
 ctxt);
 @@ -5399,8 +5407,14 @@ char *virDomainDefFormat(virDomainDefPtr def,
  if (virCPUDefFormatBuf(buf, def-cpu,   , 0)  0)
  goto cleanup;
  
 -virBufferVSprintf(buf,   clock offset='%s'/\n,
 +virBufferVSprintf(buf,   clock offset='%s',
virDomainClockOffsetTypeToString(def-clock.offset));
 +switch (def-clock.offset) {
 +case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE:
 +virBufferVSprintf(buf,  adjustment='%lld', def-clock.adjustment);
 +break;
 +}
 +virBufferAddLit(buf, /\n);
  
  if (virDomainLifecycleDefFormat(buf, def-onPoweroff,
  on_poweroff)  0)
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
 index fbbe683..f5fe016 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
 @@ -612,6 +612,7 @@ struct _virSecurityLabelDef {
  enum virDomainClockOffsetType {
  VIR_DOMAIN_CLOCK_OFFSET_UTC = 0,
  VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME = 1,
 +VIR_DOMAIN_CLOCK_OFFSET_VARIABLE = 2,
  
  VIR_DOMAIN_CLOCK_OFFSET_LAST,
  };
 @@ -620,6 +621,10 @@ typedef struct _virDomainClockDef virDomainClockDef;
  typedef virDomainClockDef *virDomainClockDefPtr;
  struct _virDomainClockDef {
  int offset;
 +
 +

Re: [libvirt] [PATCH 2/6] Add new clock mode allowing variable adjustments

2010-03-01 Thread Jim Meyering

Daniel P. Berrange wrote:
 Here's the change to the syntax-check rule,
 followed by the change to the code to make those files comply.
 If everyone agrees, I'll reverse the order before pushing,
 so that make syntax-check passes after each commit.

 ACK, this makes sense - since we clearly keep re-introducing tabs
 in these files.

Thanks for the quick ACK.
Pushed.

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 2/6] Add new clock mode allowing variable adjustments

2010-02-18 Thread Daniel P. Berrange

This introduces a third option for clock offset synchronization,
that allows an arbitrary / variable adjustment to be set. In
essence the XML contains the time delta in seconds, relative to
UTC.

  clock offset='variable' adjustment='123465'/

The difference from 'utc' mode, is that management apps should
track adjustments and preserve them at next reboot.

* docs/schemas/domain.rng: Schema for new clock mode
* src/conf/domain_conf.c, src/conf/domain_conf.h: Parse
  new clock time delta
* src/libvirt_private.syms, src/util/xml.c, src/util/xml.h: Add
  virXPathLongLong() method
---
 docs/schemas/domain.rng  |   25 +---
 src/conf/domain_conf.c   |   18 +-
 src/conf/domain_conf.h   |5 
 src/libvirt_private.syms |1 +
 src/util/xml.c   |   54 ++
 src/util/xml.h   |5 +++-
 6 files changed, 101 insertions(+), 7 deletions(-)

diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index 1ff0944..d295bfe 100644
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -297,12 +297,24 @@
   define name=clock
 optional
   element name=clock
-attribute name=offset
-  choice
+   choice
+  attribute name=offset
 valuelocaltime/value
+ /attribute
+  attribute name=offset
 valueutc/value
-  /choice
-/attribute
+ /attribute
+ group
+attribute name=offset
+  valuevariable/value
+   /attribute
+   optional
+ attribute name=adjustment
+   ref name=timeDelta/
+ /attribute
+   /optional
+ /group
+   /choice
 empty/
   /element
 /optional
@@ -1567,4 +1579,9 @@
   param name='pattern'[a-zA-Z0-9\-_]+/param
 /data
   /define
+  define name=timeDelta
+data type=string
+  param name=pattern(-|\+)?[0-9]+/param
+/data
+  /define
 /grammar
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f86b4eb..49d5d19 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -231,7 +231,8 @@ VIR_ENUM_IMPL(virDomainNetdevMacvtap, 
VIR_DOMAIN_NETDEV_MACVTAP_MODE_LAST,
 
 VIR_ENUM_IMPL(virDomainClockOffset, VIR_DOMAIN_CLOCK_OFFSET_LAST,
   utc,
-  localtime);
+  localtime,
+  variable);
 
 #define virDomainReportError(code, fmt...)   \
 virReportErrorHelper(NULL, VIR_FROM_DOMAIN, code, __FILE__,  \
@@ -3492,6 +3493,13 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr 
caps,
 } else {
 def-clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
 }
+switch (def-clock.offset) {
+case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE:
+if (virXPathLongLong(./clock/@adjustment, ctxt,
+ def-clock.adjustment)  0)
+def-clock.adjustment = 0;
+break;
+}
 
 def-os.bootloader = virXPathString(string(./bootloader), ctxt);
 def-os.bootloaderArgs = virXPathString(string(./bootloader_args), ctxt);
@@ -5399,8 +5407,14 @@ char *virDomainDefFormat(virDomainDefPtr def,
 if (virCPUDefFormatBuf(buf, def-cpu,   , 0)  0)
 goto cleanup;
 
-virBufferVSprintf(buf,   clock offset='%s'/\n,
+virBufferVSprintf(buf,   clock offset='%s',
   virDomainClockOffsetTypeToString(def-clock.offset));
+switch (def-clock.offset) {
+case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE:
+virBufferVSprintf(buf,  adjustment='%lld', def-clock.adjustment);
+break;
+}
+virBufferAddLit(buf, /\n);
 
 if (virDomainLifecycleDefFormat(buf, def-onPoweroff,
 on_poweroff)  0)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index fbbe683..f5fe016 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -612,6 +612,7 @@ struct _virSecurityLabelDef {
 enum virDomainClockOffsetType {
 VIR_DOMAIN_CLOCK_OFFSET_UTC = 0,
 VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME = 1,
+VIR_DOMAIN_CLOCK_OFFSET_VARIABLE = 2,
 
 VIR_DOMAIN_CLOCK_OFFSET_LAST,
 };
@@ -620,6 +621,10 @@ typedef struct _virDomainClockDef virDomainClockDef;
 typedef virDomainClockDef *virDomainClockDefPtr;
 struct _virDomainClockDef {
 int offset;
+
+/* Adjustment in seconds, relative to UTC, when
+ * offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE */
+long long adjustment;
 };
 
 #define VIR_DOMAIN_CPUMASK_LEN 1024
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 1af34bd..41bde8e 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -629,6 +629,7 @@ virXPathStringLimit;
 virXPathBoolean;
 virXPathNumber;
 virXPathULong;
+virXPathLongLong;
 virXPathULongLong;
 virXPathLongHex;
 virXPathULongHex;
diff --git a/src/util/xml.c b/src/util/xml.c
index 46ea9aa..14c8345 100644
--- a/src/util/xml.c
+++ b/src/util/xml.c
@@ -364,6 +364,60 @@ virXPathULongLong(const

[libvirt] [PATCH 2/6] Add new clock mode allowing variable adjustments

2010-02-02 Thread Daniel P. Berrange

This introduces a third option for clock offset synchronization,
that allows an arbitrary / variable adjustment to be set. In
essence the XML contains the time delta in seconds, relative to
UTC.

  clock offset='variable' adjustment='123465'/

The difference from 'utc' mode, is that management apps should
track adjustments and preserve them at next reboot.

* docs/schemas/domain.rng: Schema for new clock mode
* src/conf/domain_conf.c, src/conf/domain_conf.h: Parse
  new clock time delta
* src/libvirt_private.syms, src/util/xml.c, src/util/xml.h: Add
  virXPathLongLong() method
---
 docs/schemas/domain.rng  |   25 +---
 src/conf/domain_conf.c   |   14 ++-
 src/conf/domain_conf.h   |5 
 src/libvirt_private.syms |1 +
 src/util/xml.c   |   55 ++
 src/util/xml.h   |4 +++
 6 files changed, 98 insertions(+), 6 deletions(-)

diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index bb6d00d..5c48a8b 100644
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -297,12 +297,24 @@
   define name=clock
 optional
   element name=clock
-attribute name=offset
-  choice
+   choice
+  attribute name=offset
 valuelocaltime/value
+ /attribute
+  attribute name=offset
 valueutc/value
-  /choice
-/attribute
+ /attribute
+ group
+attribute name=offset
+  valuevariable/value
+   /attribute
+   optional
+ attribute name=adjustment
+   ref name=timeDelta/
+ /attribute
+   /optional
+ /group
+   /choice
 empty/
   /element
 /optional
@@ -1526,4 +1538,9 @@
   param name='pattern'[a-zA-Z0-9\-_]+/param
 /data
   /define
+  define name=timeDelta
+data type=string
+  param name=pattern(-|\+)?[0-9]+/param
+/data
+  /define
 /grammar
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1daf6f4..0c502b9 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -224,7 +224,8 @@ VIR_ENUM_IMPL(virDomainSeclabel, VIR_DOMAIN_SECLABEL_LAST,
 
 VIR_ENUM_IMPL(virDomainClockOffset, VIR_DOMAIN_CLOCK_OFFSET_LAST,
   utc,
-  localtime);
+  localtime,
+  variable);
 
 
 #define virDomainReportError(conn, code, fmt...)   \
@@ -3479,6 +3480,11 @@ static virDomainDefPtr 
virDomainDefParseXML(virConnectPtr conn,
 } else {
 def-clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
 }
+if (def-clock.offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE) {
+if (virXPathLongLong(conn, ./clock/@adjustment, ctxt,
+ def-clock.adjustment)  0)
+def-clock.adjustment = 0;
+}
 
 def-os.bootloader = virXPathString(conn, string(./bootloader), ctxt);
 def-os.bootloaderArgs = virXPathString(conn, string(./bootloader_args), 
ctxt);
@@ -5419,8 +5425,12 @@ char *virDomainDefFormat(virConnectPtr conn,
 if (virCPUDefFormatBuf(conn, buf, def-cpu,   , 0)  0)
 goto cleanup;
 
-virBufferVSprintf(buf,   clock offset='%s'/\n,
+virBufferVSprintf(buf,   clock offset='%s',
   virDomainClockOffsetTypeToString(def-clock.offset));
+if (def-clock.offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE) {
+virBufferVSprintf(buf,  adjustment='%lld', def-clock.adjustment);
+}
+virBufferAddLit(buf, /\n);
 
 if (virDomainLifecycleDefFormat(conn, buf, def-onPoweroff,
 on_poweroff)  0)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 5653b18..4df28e5 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -597,6 +597,7 @@ struct _virSecurityLabelDef {
 enum virDomainClockOffsetType {
 VIR_DOMAIN_CLOCK_OFFSET_UTC = 0,
 VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME = 1,
+VIR_DOMAIN_CLOCK_OFFSET_VARIABLE = 2,
 
 VIR_DOMAIN_CLOCK_OFFSET_LAST,
 };
@@ -605,6 +606,10 @@ typedef struct _virDomainClockDef virDomainClockDef;
 typedef virDomainClockDef *virDomainClockDefPtr;
 struct _virDomainClockDef {
 int offset;
+
+/* Adjustment in seconds, relative to UTC, when
+ * offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE */
+long long adjustment;
 };
 
 #define VIR_DOMAIN_CPUMASK_LEN 1024
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index e882ae4..39b7c45 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -625,6 +625,7 @@ virXPathStringLimit;
 virXPathBoolean;
 virXPathNumber;
 virXPathULong;
+virXPathLongLong;
 virXPathULongLong;
 virXPathLongHex;
 virXPathULongHex;
diff --git a/src/util/xml.c b/src/util/xml.c
index 4fa443d..52786d0 100644
--- a/src/util/xml.c
+++ b/src/util/xml.c
@@ -374,6 +374,61 @@ virXPathULongLong(virConnectPtr conn,
 return (ret);
 }
 
+/**
+ * virXPathULongLong:
+ * @xpath: the XPath string to evaluate
+ *

Re: [libvirt] [PATCH 2/6] Add new clock mode allowing variable adjustments

Re: [libvirt] [PATCH 2/6] Add new clock mode allowing variable adjustments

[libvirt] [PATCH 2/6] Add new clock mode allowing variable adjustments

[libvirt] [PATCH 2/6] Add new clock mode allowing variable adjustments

4 matches

Site Navigation

Mail list logo

Footer information