On 07/10/2012 09:22 AM, Hendrik Schwartke wrote: > The access, modification and change times are added to storage > volumes and corresponding xml representations. > --- > docs/formatstorage.html.in | 13 +++++++++++++ > docs/schemas/storagevol.rng | 23 +++++++++++++++++++++++ > src/conf/storage_conf.c | 12 ++++++++++++ > src/conf/storage_conf.h | 9 +++++++++ > src/storage/storage_backend.c | 20 ++++++++++++++++++++ > 5 files changed, 77 insertions(+) > </dd> > +<dt><code>timestamps</code></dt> > +<dd>Provides timing information about the volume. The three sub elements > +<code>atime</code>,<code>mtime</code> and<code>ctime</code> hold the > + access, modification and respectively the change time of the volume. The Grammar: hold the access, modification, and change times of the volume, where known. no need to mention 'respectively'. > +++ b/src/conf/storage_conf.c > @@ -1272,6 +1272,18 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, > > virBufferAddLit(buf,"</permissions>\n"); > > + virBufferAddLit(buf, "<timestamps>\n"); > + virBufferAsprintf(buf, "<atime>%llu.%lu</atime>\n", > + (unsigned long long) def->timestamps.atime.tv_sec, > + def->timestamps.atime.tv_nsec); Technically, tv_nsec is a signed long, and you should be using %ld instead of %lu. > +++ b/src/storage/storage_backend.c > @@ -1156,6 +1156,9 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target, > unsigned long long *capacity) > { > struct stat sb; > + struct timespec *const atime=&target->timestamps.atime, Space on either side of '='. > > + atime->tv_sec = sb.st_atime; > + mtime->tv_sec = sb.st_mtime; > + catime->tv_sec = sb.st_ctime; > +#if _BSD_SOURCE || _SVID_SOURCE > + atime->tv_nsec = sb.st_atim.tv_nsec; Yuck. I've nearly got consensus to use the gnulib stat-time module, in which case this would instead be the much simpler:

#include "stat-time.h" ... atime = get_stat_atime(sb); mtime = get_stat_mtime(sb); ctime = get_stat_mtime(sb);

But before we can use the gnulib stat-time module, we have to update .gnulib and bootstrap.conf; and I'm holding off on the .gnulib update until after fixed Automake is available in at least Fedora 17 (right now, unless you are manually using automake 1.11.6 or newer, you are injecting a security bug into every other package that uses automake).

Also, with gnulib's stat-time module, my earlier suggestion to include birthtime would be as simple as: btime = get_state_birthtime(sb); along with filtering the display: if (btime->tv_nsec == -1) { /* birth time not available */ }

On 07/13/2012 08:38 AM, Hendrik Schwartke wrote: > !!! DON'T PUSH until stat-time lgpl 3 issue is fixed > !!! To tests this change lgpl version to 3 in bootstrap.conf:176 > > The access, birth, modification and change times are added to > storage volumes and corresponding xml representations. > --- > bootstrap.conf | 1 + > docs/formatstorage.html.in | 13 +++++++++++++ > docs/schemas/storagevol.rng | 36 ++++++++++++++++++++++++++++++++++++ > src/conf/storage_conf.c | 18 ++++++++++++++++++ > src/conf/storage_conf.h | 13 +++++++++++++ > src/storage/storage_backend.c | 6 ++++++ > 6 files changed, 87 insertions(+) > > diff --git a/bootstrap.conf b/bootstrap.conf > index 9b42cbf..da0b960 100644 > --- a/bootstrap.conf > +++ b/bootstrap.conf > @@ -115,6 +115,7 @@ vc-list-files > vsnprintf > waitpid > warnings > +stat-time > ' Insert in sorted order. > @@ -172,6 +177,14 @@ > contains the MAC (eg SELinux) label string. > <span class="since">Since 0.4.1</span> > </dd> > +<dt><code>timestamps</code></dt> > +<dd>Provides timing information about the volume. The four sub elements since btime is omitted on Linux, maybe this would read better as 'Up to four sub-elements are present, where' > +<code>atime</code>,<code>btime</code>,<code>ctime</code> and<code>mtime</code> > + hold the access, birth, change and modification time of the volume, where known. > + The used time format is&lt;seconds&gt;.&lt;nanoseconds&gt; since the beginning > + of the epoch. This is a readonly attribute and is ignored when creating > + a volume.<span class="since">Since 0.10.0</span> > +<define name='timestamps'> > +<optional> > +<element name='timestamps'> > +<optional> > +<element name='atime'> > +<data type="string"> > +<param name="pattern">[0-9]+\.[0-9]+</param> > +</data> It might be worth writing the regex to permit eliding the sub-second resolution, on file systems that only have 1 second resolution. Given

that we are repeating this<data> four times, it might be worth defining it, for a shorter diff: <element name='atime'> <ref name='timestamp'/> </element> ... <define name='timestamp'> <data type='string'> <param name='pattern'>[0-9]+(\.[0-9]+)?</param> </data> </define> > +++ b/src/conf/storage_conf.c > @@ -1277,6 +1277,24 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, > > virBufferAddLit(buf,"</permissions>\n"); > > + virBufferAddLit(buf, "<timestamps>\n"); > + virBufferAsprintf(buf, "<atime>%llu.%ld</atime>\n", > + (unsigned long long) def->timestamps.atime.tv_sec, > + def->timestamps.atime.tv_nsec); Eliding a sub-second suffix when tv_nsec == 0 would be easier with a helper function: void virStorageVolTimestampFormat(virBufferPtr buf, const char *name, struct timespec *ts) { if (ts->tv_nsec< 0)

return; virBufferAsprintf(buf, "<%s>%llu", name, (unsigned long long) ts->tv_sec); if (ts->tv_nsec) virBufferAsprintf(buf, ".%ld", tv->tv_nsec); virBufferAsprintf(buf, "</%s>\n", name); } called as: virStorageVolTimestampFormat(buf, "atime",&def->timestamps.atime); virStorageVolTimestampFormat(buf, "atime",&def->timestamps.btime); and so on. Actually, I'd list atime, mtime, ctime, btime - in that order - rather than trying to sort the names alphabetically (that is, match typical 'struct stat' ordering).

> +typedef virStorageTimestamps *virStorageTimestampsPtr; > +struct _virStorageTimestamps { > + struct timespec atime; > + /* if btime.tv_sec == -1&& btime.tv_nsec == -1 than > + * birth time is unknown Doesn't gnulib guarantee that tv_nsec == -1 in isolation is sufficient to point out an unknown value? That is, checking tv_sec == -1 is overhead.

Looking nicer. I'll have to ping upstream on gnulib about the last holdout on the relicensing of stat-time; and I'm also still waiting for the security fix in updated automake to hit Fedora.

On 07/13/2012 08:38 AM, Hendrik Schwartke wrote: > !!! DON'T PUSH until stat-time lgpl 3 issue is fixed > !!! To tests this change lgpl version to 3 in bootstrap.conf:176 > > The access, birth, modification and change times are added to > storage volumes and corresponding xml representations. > --- > bootstrap.conf | 1 + > docs/formatstorage.html.in | 13 +++++++++++++ > docs/schemas/storagevol.rng | 36 ++++++++++++++++++++++++++++++++++++ > src/conf/storage_conf.c | 18 ++++++++++++++++++ > src/conf/storage_conf.h | 13 +++++++++++++ > src/storage/storage_backend.c | 6 ++++++ > 6 files changed, 87 insertions(+) > > diff --git a/bootstrap.conf b/bootstrap.conf > index 9b42cbf..da0b960 100644 > --- a/bootstrap.conf > +++ b/bootstrap.conf > @@ -115,6 +115,7 @@ vc-list-files > vsnprintf > waitpid > warnings > +stat-time > ' Insert in sorted order. > @@ -172,6 +177,14 @@ > contains the MAC (eg SELinux) label string. > <span class="since">Since 0.4.1</span> > </dd> > +<dt><code>timestamps</code></dt> > +<dd>Provides timing information about the volume. The four sub elements since btime is omitted on Linux, maybe this would read better as 'Up to four sub-elements are present, where' > +<code>atime</code>,<code>btime</code>,<code>ctime</code> and<code>mtime</code> > + hold the access, birth, change and modification time of the volume, where known. > + The used time format is&lt;seconds&gt;.&lt;nanoseconds&gt; since the beginning > + of the epoch. This is a readonly attribute and is ignored when creating > + a volume.<span class="since">Since 0.10.0</span> > +<define name='timestamps'> > +<optional> > +<element name='timestamps'> > +<optional> > +<element name='atime'> > +<data type="string"> > +<param name="pattern">[0-9]+\.[0-9]+</param> > +</data> It might be worth writing the regex to permit eliding the sub-second resolution, on file systems that only have 1 second resolution. Given that we are repeating this<data> four times, it might be worth defining it, for a shorter diff: <element name='atime'> <ref name='timestamp'/> </element> ... <define name='timestamp'> <data type='string'> <param name='pattern'>[0-9]+(\.[0-9]+)?</param> </data> </define> > +++ b/src/conf/storage_conf.c > @@ -1277,6 +1277,24 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, > > virBufferAddLit(buf,"</permissions>\n"); > > + virBufferAddLit(buf, "<timestamps>\n"); > + virBufferAsprintf(buf, "<atime>%llu.%ld</atime>\n", > + (unsigned long long) def->timestamps.atime.tv_sec, > + def->timestamps.atime.tv_nsec); Eliding a sub-second suffix when tv_nsec == 0 would be easier with a helper function: void virStorageVolTimestampFormat(virBufferPtr buf, const char *name, struct timespec *ts) { if (ts->tv_nsec< 0) return; virBufferAsprintf(buf, "<%s>%llu", name, (unsigned long long) ts->tv_sec); if (ts->tv_nsec) virBufferAsprintf(buf, ".%ld", tv->tv_nsec); virBufferAsprintf(buf, "</%s>\n", name); } called as: virStorageVolTimestampFormat(buf, "atime",&def->timestamps.atime); virStorageVolTimestampFormat(buf, "atime",&def->timestamps.btime); and so on. Actually, I'd list atime, mtime, ctime, btime - in that order - rather than trying to sort the names alphabetically (that is, match typical 'struct stat' ordering). > +typedef virStorageTimestamps *virStorageTimestampsPtr; > +struct _virStorageTimestamps { > + struct timespec atime; > + /* if btime.tv_sec == -1&& btime.tv_nsec == -1 than > + * birth time is unknown Doesn't gnulib guarantee that tv_nsec == -1 in isolation is sufficient to point out an unknown value? That is, checking tv_sec == -1 is overhead. Looking nicer. I'll have to ping upstream on gnulib about the last holdout on the relicensing of stat-time; and I'm also still waiting for the security fix in updated automake to hit Fedora.

The access, birth, modification and change times are added to storage volumes and corresponding xml representations. --- bootstrap.conf | 1 + docs/formatstorage.html.in | 16 ++++++++++++++++ docs/schemas/storagevol.rng | 34 ++++++++++++++++++++++++++++++++++ src/conf/storage_conf.c | 20 ++++++++++++++++++++ src/conf/storage_conf.h | 13 +++++++++++++ src/storage/storage_backend.c | 6 ++++++ 6 files changed, 90 insertions(+) diff --git a/bootstrap.conf b/bootstrap.conf index 9b42cbf..d80d92d 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -90,6 +90,7 @@ sigaction sigpipe snprintf socket +stat-time stdarg stpcpy strchrnul diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index d0e4319..2a578e9 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -141,6 +141,11 @@ &lt;mode&gt;0744&lt;/mode&gt; &lt;label&gt;virt_image_t&lt;/label&gt; &lt;/permissions&gt; +&lt;timestamps&gt; +&lt;atime&gt;1341933637.27319099&lt;/atime&gt; +&lt;ctime&gt;1341930622.47245868&lt;/ctime&gt; +&lt;mtime&gt;1341930622.47245868&lt;/mtime&gt; +&lt;/timestamps&gt; &lt;encryption type='...'&gt; ... &lt;/encryption&gt; @@ -172,6 +177,17 @@ contains the MAC (eg SELinux) label string. <span class="since">Since 0.4.1</span> </dd> +<dt><code>timestamps</code></dt> +<dd>Provides timing information about the volume. Up to four sub-elements are + present, where<code>atime</code>,<code>btime</code>,<code>ctime</code> + and<code>mtime</code> hold the access, birth, change and modification time + of the volume, where known. The used time format is +&lt;seconds&gt;.&lt;nanoseconds&gt; since the beginning of the epoch. If + nanosecond resolution isn't supported by the host OS or filesystem then the + nanoseconds part is omitted. It is also omitted when zero. This is a + readonly attribute and is ignored when creating a volume. +<span class="since">Since 0.10.0</span> +</dd> <dt><code>encryption</code></dt> <dd>If present, specifies how the volume is encrypted. See the<a href="formatstorageencryption.html">Storage Encryption</a> page diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 7a74331..f981b47 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -63,6 +63,39 @@ </optional> </define> +<define name='timestamps'> +<optional> +<element name='timestamps'> +<optional> +<element name='atime'> +<ref name='timestamp'/> +</element> +</optional> +<optional> +<element name='btime'> +<ref name='timestamp'/> +</element> +</optional> +<optional> +<element name='ctime'> +<ref name='timestamp'/> +</element> +</optional> +<optional> +<element name='mtime'> +<ref name='timestamp'/> +</element> +</optional> +</element> +</optional> +</define> + +<define name='timestamp'> +<data type='string'> +<param name="pattern">[0-9]+(\.[0-9]+)?</param> +</data> +</define> + <define name='target'> <element name='target'> <optional> @@ -72,6 +105,7 @@ </optional> <ref name='format'/> <ref name='permissions'/> +<ref name='timestamps'/> <optional> <ref name='encryption'/> </optional> diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 36a3bb9..bc8e8be 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1241,6 +1241,19 @@ virStorageVolDefParseFile(virStoragePoolDefPtr pool, return virStorageVolDefParse(pool, NULL, filename); } +static void +virStorageVolTimestampFormat(virBufferPtr buf, const char *name, + struct timespec *ts) +{ + if (ts->tv_nsec< 0) + return; + virBufferAsprintf(buf, "<%s>%llu", name, + (unsigned long long) ts->tv_sec); + if (ts->tv_nsec) + virBufferAsprintf(buf, ".%09ld", ts->tv_nsec); + virBufferAsprintf(buf, "</%s>\n", name); +} + static int virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferPtr buf, @@ -1277,6 +1290,13 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferAddLit(buf,"</permissions>\n"); + virBufferAddLit(buf, "<timestamps>\n"); + virStorageVolTimestampFormat(buf, "atime",&def->timestamps.atime); + virStorageVolTimestampFormat(buf, "btime",&def->timestamps.btime); + virStorageVolTimestampFormat(buf, "ctime",&def->timestamps.ctime); + virStorageVolTimestampFormat(buf, "mtime",&def->timestamps.mtime); + virBufferAddLit(buf, "</timestamps>\n"); + if (def->encryption) { virBufferAdjustIndent(buf, 4); if (virStorageEncryptionFormat(buf, def->encryption)< 0) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 5733b57..b67ef64 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -46,6 +46,18 @@ struct _virStoragePerms { /* Storage volumes */ +typedef struct _virStorageTimestamps virStorageTimestamps; +typedef virStorageTimestamps *virStorageTimestampsPtr; +struct _virStorageTimestamps { + struct timespec atime; + /* if btime.tv_nsec == -1 then + * birth time is unknown + */ + struct timespec btime; + struct timespec ctime; + struct timespec mtime; +}; + /* * How the volume's data is stored on underlying @@ -77,6 +89,7 @@ struct _virStorageVolTarget { char *path; int format; virStoragePerms perms; + virStorageTimestamps timestamps; int type; /* only used by disk backend for partition type */ /* Currently used only in virStorageVolDef.target, not in .backingstore. */ virStorageEncryptionPtr encryption; diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 6ea0881..c665711 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -57,6 +57,7 @@ #include "storage_backend.h" #include "logging.h" #include "virfile.h" +#include "stat-time.h" #if WITH_STORAGE_LVM # include "storage_backend_logical.h" @@ -1208,6 +1209,11 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target, target->perms.uid = sb.st_uid; target->perms.gid = sb.st_gid; + target->timestamps.atime = get_stat_atime(&sb); + target->timestamps.btime = get_stat_birthtime(&sb); + target->timestamps.ctime = get_stat_ctime(&sb); + target->timestamps.mtime = get_stat_mtime(&sb); + VIR_FREE(target->perms.label); #if HAVE_SELINUX

On 07/25/2012 01:43 AM, Hendrik Schwartke wrote: > The access, birth, modification and change times are added to > storage volumes and corresponding xml representations. Listing the actual output XML in the commit message will help future readers. > --- > bootstrap.conf | 1 + > docs/formatstorage.html.in | 16 ++++++++++++++++ > docs/schemas/storagevol.rng | 34 ++++++++++++++++++++++++++++++++++ > src/conf/storage_conf.c | 20 ++++++++++++++++++++ > src/conf/storage_conf.h | 13 +++++++++++++ > src/storage/storage_backend.c | 6 ++++++ > 6 files changed, 90 insertions(+) We should really update at least one test to validate our rng changes. For that matter, 'make check' fails without at least some updates, because your code blindly outputs<timestamps> with contents of 0 for a default-initialized struct, and with no way to parse input, the xml2xml round-trip test can't validate our output code. > +++ b/docs/formatstorage.html.in > @@ -141,6 +141,11 @@ > &lt;mode&gt;0744&lt;/mode&gt; > &lt;label&gt;virt_image_t&lt;/label&gt; > &lt;/permissions&gt; > +&lt;timestamps&gt; > +&lt;atime&gt;1341933637.27319099&lt;/atime&gt; That's only 8 digits for subsecond resolution. Are you truncating a trailing 0, or are you missing a leading 0? Thinking about it more, it's easier for end users to parse a fixed-length 9-digit number with trailing zeros and always have it be scaled correctly than it is to make them parse an arbitrary length number and then scale it to 9 digits, so I'd prefer leaving trailing zeros intact and only omit the subsecond resolution when it is exactly 0, at least on output. > @@ -172,6 +177,17 @@ > contains the MAC (eg SELinux) label string. > <span class="since">Since 0.4.1</span> > </dd> > +<dt><code>timestamps</code></dt> > +<dd>Provides timing information about the volume. Up to four sub-elements are > + present, where<code>atime</code>,<code>btime</code>,<code>ctime</code> > + and<code>mtime</code> hold the access, birth, change and modification time > + of the volume, where known. The used time format is > +&lt;seconds&gt;.&lt;nanoseconds&gt; since the beginning of the epoch. If > + nanosecond resolution isn't supported by the host OS or filesystem then the > + nanoseconds part is omitted. It is also omitted when zero. This is a > + readonly attribute and is ignored when creating a volume. > +<span class="since">Since 0.10.0</span> Long lines; I reformatted to fit in 80 columns. Technically, while<btime> and<ctime> must be ignored (as we can't really fake them), we could use futimens during creation to honor <atime> and<mtime> as a future extension, if we thought it was worth the ability to let people create volumes with hand-controlled timestamps. Doesn't affect this patch, though. > +++ b/docs/schemas/storagevol.rng > @@ -63,6 +63,39 @@ > </optional> > </define> > > +<define name='timestamps'> > +<optional> > +<element name='timestamps'> > +<optional> > +<element name='atime'> > +<ref name='timestamp'/> > +</element> > +</optional> If we want to allow creation to specify timestamps, then we should allow <interleave> of these subelements. In fact, I see no harm in allowing that now. > + > +<define name='timestamp'> > +<data type='string'> > +<param name="pattern">[0-9]+(\.[0-9]+)?</param> On output, we could enforce {9} instead of + in this regex. But if we ever allow input, then this is too strict (we want {0,9} to allow the user to give a shortened form, and deal with scaling the value appropriately on our input parse). > @@ -1277,6 +1290,13 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, > > virBufferAddLit(buf,"</permissions>\n"); > > + virBufferAddLit(buf, "<timestamps>\n"); > + virStorageVolTimestampFormat(buf, "atime",&def->timestamps.atime); > + virStorageVolTimestampFormat(buf, "btime",&def->timestamps.btime); > + virStorageVolTimestampFormat(buf, "ctime",&def->timestamps.ctime); > + virStorageVolTimestampFormat(buf, "mtime",&def->timestamps.mtime); I really do think laying this out in 'struct stat' order makes more sense; atim, mtim, ctim, then btim. XPath notation will be able to find it regardless of our ordering. I don't know why we use -Waggregate-return; gcc doesn't like stat-time.h as a result; so I had to disable it for now; maybe upstream gnulib will let us change the signature to something that modifies a pointer argument instead of returning an aggregate, but that's a change for down the road. Another nice followup patch would be adding timestamps to directory storagepool output XML. Everything else looked good. Thanks again for your patience. Here's what I squashed in, before pushing: diff --git i/docs/formatstorage.html.in w/docs/formatstorage.html.in index 2a578e9..9f93db8 100644 --- i/docs/formatstorage.html.in +++ w/docs/formatstorage.html.in @@ -142,9 +142,9 @@ &lt;label&gt;virt_image_t&lt;/label&gt; &lt;/permissions&gt; &lt;timestamps&gt; -&lt;atime&gt;1341933637.27319099&lt;/atime&gt; -&lt;ctime&gt;1341930622.47245868&lt;/ctime&gt; -&lt;mtime&gt;1341930622.47245868&lt;/mtime&gt; +&lt;atime&gt;1341933637.273190990&lt;/atime&gt; +&lt;mtime&gt;1341930622.047245868&lt;/mtime&gt; +&lt;ctime&gt;1341930622.047245868&lt;/ctime&gt; &lt;/timestamps&gt; &lt;encryption type='...'&gt; ... @@ -178,14 +178,16 @@ <span class="since">Since 0.4.1</span> </dd> <dt><code>timestamps</code></dt> -<dd>Provides timing information about the volume. Up to four sub-elements are - present, where<code>atime</code>,<code>btime</code>, <code>ctime</code> - and<code>mtime</code> hold the access, birth, change and modification time - of the volume, where known. The used time format is -&lt;seconds&gt;.&lt;nanoseconds&gt; since the beginning of the epoch. If - nanosecond resolution isn't supported by the host OS or filesystem then the - nanoseconds part is omitted. It is also omitted when zero. This is a - readonly attribute and is ignored when creating a volume. +<dd>Provides timing information about the volume. Up to four + sub-elements are present, + where<code>atime</code>,<code>btime</code>,<code>ctime</code> + and<code>mtime</code> hold the access, birth, change and + modification time of the volume, where known. The used time + format is&lt;seconds&gt;.&lt;nanoseconds&gt; since the + beginning of the epoch (1 Jan 1970). If nanosecond resolution + is 0 or otherwise unsupported by the host OS or filesystem, + then the nanoseconds part is omitted. This is a readonly + attribute and is ignored when creating a volume. <span class="since">Since 0.10.0</span> </dd> <dt><code>encryption</code></dt> diff --git i/docs/schemas/storagevol.rng w/docs/schemas/storagevol.rng index 7b35520..8335b61 100644 --- i/docs/schemas/storagevol.rng +++ w/docs/schemas/storagevol.rng @@ -66,33 +66,35 @@ <define name='timestamps'> <optional> <element name='timestamps'> -<optional> -<element name='atime'> -<ref name='timestamp'/> -</element> -</optional> -<optional> -<element name='btime'> -<ref name='timestamp'/> -</element> -</optional> -<optional> -<element name='ctime'> -<ref name='timestamp'/> -</element> -</optional> -<optional> -<element name='mtime'> -<ref name='timestamp'/> -</element> -</optional> +<interleave> +<optional> +<element name='atime'> +<ref name='timestamp'/> +</element> +</optional> +<optional> +<element name='btime'> +<ref name='timestamp'/> +</element> +</optional> +<optional> +<element name='ctime'> +<ref name='timestamp'/> +</element> +</optional> +<optional> +<element name='mtime'> +<ref name='timestamp'/> +</element> +</optional> +</interleave> </element> </optional> </define> <define name='timestamp'> <data type='string'> -<param name="pattern">[0-9]+(\.[0-9]+)?</param> +<param name="pattern">[0-9]+(\.[0-9]{0,9})?</param> </data> </define> diff --git i/m4/virt-compile-warnings.m4 w/m4/virt-compile-warnings.m4 index 1817047..9dee000 100644 --- i/m4/virt-compile-warnings.m4 +++ w/m4/virt-compile-warnings.m4 @@ -55,6 +55,8 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dontwarn="$dontwarn -Wunsafe-loop-optimizations" # Things like virAsprintf mean we can't use this dontwarn="$dontwarn -Wformat-nonliteral" + # Gnulib's stat-time.h violates this + dontwarn="$dontwarn -Waggregate-return" # We might fundamentally need some of these disabled forever, but # ideally we'd turn many of them on diff --git i/src/conf/storage_conf.c w/src/conf/storage_conf.c index 66b5682..3132aae 100644 --- i/src/conf/storage_conf.c +++ w/src/conf/storage_conf.c @@ -286,9 +286,11 @@ virStorageVolDefFree(virStorageVolDefPtr def) { VIR_FREE(def->target.path); VIR_FREE(def->target.perms.label); + VIR_FREE(def->target.timestamps); virStorageEncryptionFree(def->target.encryption); VIR_FREE(def->backingStore.path); VIR_FREE(def->backingStore.perms.label); + VIR_FREE(def->backingStore.timestamps); virStorageEncryptionFree(def->backingStore.encryption); VIR_FREE(def); } @@ -1301,12 +1303,14 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferAddLit(buf,"</permissions>\n"); - virBufferAddLit(buf, "<timestamps>\n"); - virStorageVolTimestampFormat(buf, "atime",&def->timestamps.atime); - virStorageVolTimestampFormat(buf, "btime",&def->timestamps.btime); - virStorageVolTimestampFormat(buf, "ctime",&def->timestamps.ctime); - virStorageVolTimestampFormat(buf, "mtime",&def->timestamps.mtime); - virBufferAddLit(buf, "</timestamps>\n"); + if (def->timestamps) { + virBufferAddLit(buf, "<timestamps>\n"); + virStorageVolTimestampFormat(buf, "atime", &def->timestamps->atime); + virStorageVolTimestampFormat(buf, "mtime", &def->timestamps->mtime); + virStorageVolTimestampFormat(buf, "ctime", &def->timestamps->ctime); + virStorageVolTimestampFormat(buf, "btime", &def->timestamps->btime); + virBufferAddLit(buf, "</timestamps>\n"); + } if (def->encryption) { virBufferAdjustIndent(buf, 4); diff --git i/src/conf/storage_conf.h w/src/conf/storage_conf.h index 4477195..4fb99df 100644 --- i/src/conf/storage_conf.h +++ w/src/conf/storage_conf.h @@ -89,7 +89,7 @@ struct _virStorageVolTarget { char *path; int format; virStoragePerms perms; - virStorageTimestamps timestamps; + virStorageTimestampsPtr timestamps; int type; /* only used by disk backend for partition type */ /* Currently used only in virStorageVolDef.target, not in .backingstore. */ virStorageEncryptionPtr encryption; diff --git i/src/storage/storage_backend.c w/src/storage/storage_backend.c index e05cadd..4a2109e 100644 --- i/src/storage/storage_backend.c +++ w/src/storage/storage_backend.c @@ -1,7 +1,7 @@ /* * storage_backend.c: internal storage driver backend contract * - * Copyright (C) 2007-2011 Red Hat, Inc. + * Copyright (C) 2007-2012 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -1215,10 +1215,14 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target, target->perms.uid = sb.st_uid; target->perms.gid = sb.st_gid; - target->timestamps.atime = get_stat_atime(&sb); - target->timestamps.btime = get_stat_birthtime(&sb); - target->timestamps.ctime = get_stat_ctime(&sb); - target->timestamps.mtime = get_stat_mtime(&sb); + if (!target->timestamps&& VIR_ALLOC(target->timestamps)< 0) { + virReportOOMError(); + return -1; + } + target->timestamps->atime = get_stat_atime(&sb); + target->timestamps->btime = get_stat_birthtime(&sb); + target->timestamps->ctime = get_stat_ctime(&sb); + target->timestamps->mtime = get_stat_mtime(&sb); VIR_FREE(target->perms.label); diff --git i/tests/storagevolxml2xmlin/vol-file.xml w/tests/storagevolxml2xmlin/vol-file.xml index fdca510..d3f65f6 100644 --- i/tests/storagevolxml2xmlin/vol-file.xml +++ w/tests/storagevolxml2xmlin/vol-file.xml @@ -11,5 +11,10 @@ <group>0</group> <label>virt_image_t</label> </permissions> +<timestamps> +<atime>1341933637.273190990</atime> +<mtime>1341930622.047245868</mtime> +<ctime>1341930622.047245868</ctime> +</timestamps> </target> </volume>