Skip to contentSkip to conversation

xl: Add missing start_time entry when create and restore VMs

PATCH Superseded Yang Hongyang 2 participants 4 messages May 14, 2010 – May 15, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xl: Add missing start_time entry when create and restore VMs

Add missing start_time entry when create and restore VMs.

tools/libxl/libxl.c +18 -4
diff -r baccadfd9418 tools/libxl/libxl.c
@@ -264,30 +264,37 @@
 int libxl_domain_build(struct libxl_ctx *ctx, libxl_domain_build_info *info, uint32_t domid, libxl_domain_build_state *state)
 {
     char **vments = NULL, **localents = NULL;
+    struct timeval start_time;
     int i, ret;
 
     ret = build_pre(ctx, domid, info, state);
     if (ret) goto out;
 
+    gettimeofday(&start_time, NULL);
+
     if (info->hvm) {
         ret = build_hvm(ctx, domid, info, state);
         if (ret) goto out;
 
-        vments = libxl_calloc(ctx, 5, sizeof(char *));
+        vments = libxl_calloc(ctx, 7, sizeof(char *));
         vments[0] = "rtc/timeoffset";
         vments[1] = (info->u.hvm.timeoffset) ? info->u.hvm.timeoffset : "";
         vments[2] = "image/ostype";
         vments[3] = "hvm";
+        vments[4] = "start_time";
+        vments[5] = libxl_sprintf(ctx, "%lu.%d", start_time.tv_sec,(int)start_time.tv_usec/10000);
     } else {
         ret = build_pv(ctx, domid, info, state);
         if (ret) goto out;
 
-        vments = libxl_calloc(ctx, 9, sizeof(char *));
+        vments = libxl_calloc(ctx, 11, sizeof(char *));
         i = 0;
         vments[i++] = "image/ostype";
         vments[i++] = "linux";
         vments[i++] = "image/kernel";
         vments[i++] = (char*) info->kernel;
+        vments[i++] = "start_time";
+        vments[i++] = libxl_sprintf(ctx, "%lu.%d", start_time.tv_sec,(int)start_time.tv_usec/10000);
         if (info->u.pv.ramdisk) {
             vments[i++] = "image/ramdisk";
             vments[i++] = (char*) info->u.pv.ramdisk;
@@ -307,6 +314,7 @@
                          libxl_device_model_info *dm_info)
 {
     char **vments = NULL, **localents = NULL;
+    struct timeval start_time;
     int i, ret, esave, flags;
 
     ret = build_pre(ctx, domid, info, state);
@@ -315,19 +323,25 @@
     ret = restore_common(ctx, domid, info, state, fd);
     if (ret) goto out;
 
+    gettimeofday(&start_time, NULL);
+
     if (info->hvm) {
-        vments = libxl_calloc(ctx, 5, sizeof(char *));
+        vments = libxl_calloc(ctx, 7, sizeof(char *));
         vments[0] = "rtc/timeoffset";
         vments[1] = (info->u.hvm.timeoffset) ? info->u.hvm.timeoffset : "";
         vments[2] = "image/ostype";
         vments[3] = "hvm";
+        vments[4] = "start_time";
+        vments[5] = libxl_sprintf(ctx, "%lu.%d", start_time.tv_sec,(int)start_time.tv_usec/10000);
     } else {
-        vments = libxl_calloc(ctx, 9, sizeof(char *));
+        vments = libxl_calloc(ctx, 11, sizeof(char *));
         i = 0;
         vments[i++] = "image/ostype";
         vments[i++] = "linux";
         vments[i++] = "image/kernel";
         vments[i++] = (char*) info->kernel;
+        vments[i++] = "start_time";
+        vments[i++] = libxl_sprintf(ctx, "%lu.%d", start_time.tv_sec,(int)start_time.tv_usec/10000);
         if (info->u.pv.ramdisk) {
             vments[i++] = "image/ramdisk";
             vments[i++] = (char*) info->u.pv.ramdisk;
Signature · 2 lines
Regards
Yang Hongyang
#1 lore raw
Quoted 2 lines

+ vments[5] = libxl_sprintf(ctx, "%lu.%d", start_time.tv_sec,(int)start_time.tv_usec/10000);
+ vments[i++] = libxl_sprintf(ctx, "%lu.%d",start_time.tv_sec,(int)start_time.tv_usec/10000);

I don't think these work as intended. For example, if tv_usec is 10000, I think you want xxx.01 printed, not xxx.1. Maybe you want %lu.%02d?

And in any case, is there a reason to limit the precision to two digits? Why not %lu.%06d?

#2 lore raw
Quoted 6 lines · Dan Magenheimer
Quoted 2 lines

+ vments[5] = libxl_sprintf(ctx, "%lu.%d", start_time.tv_sec,(int)start_time.tv_usec/10000);
+ vments[i++] = libxl_sprintf(ctx, "%lu.%d",start_time.tv_sec,(int)start_time.tv_usec/10000);

I don't think these work as intended. For example, if tv_usec is 10000, I think you want xxx.01 printed, not xxx.1. Maybe you want %lu.%02d?

Ah sorry, you're right, I'll fix that, Thank you.

Quoted 4 lines

And in any case, is there a reason to limit the precision to two digits? Why not %lu.%06d?

I see no reason too. But the current start_time is limit to two digits(vms created from 'xm create'). So I limit the precision to two digits.

Quoted 1 line
Signature · 2 lines
Regards
Yang Hongyang
#3 lore raw

PATCH v2 1/1 xl: Add missing start_time entry when create and restore VMs

In reply to Yang Hongyang

v1->v2:
when tv_usec is 10000, should print xxx.01, not xxx.1.

=================================================================

Add missing start_time entry when create and restore VMs.

tools/libxl/libxl.c +18 -4
diff -r baccadfd9418 tools/libxl/libxl.c
@@ -264,30 +264,37 @@
 int libxl_domain_build(struct libxl_ctx *ctx, libxl_domain_build_info *info, uint32_t domid, libxl_domain_build_state *state)
 {
     char **vments = NULL, **localents = NULL;
+    struct timeval start_time;
     int i, ret;
 
     ret = build_pre(ctx, domid, info, state);
     if (ret) goto out;
 
+    gettimeofday(&start_time, NULL);
+
     if (info->hvm) {
         ret = build_hvm(ctx, domid, info, state);
         if (ret) goto out;
 
-        vments = libxl_calloc(ctx, 5, sizeof(char *));
+        vments = libxl_calloc(ctx, 7, sizeof(char *));
         vments[0] = "rtc/timeoffset";
         vments[1] = (info->u.hvm.timeoffset) ? info->u.hvm.timeoffset : "";
         vments[2] = "image/ostype";
         vments[3] = "hvm";
+        vments[4] = "start_time";
+        vments[5] = libxl_sprintf(ctx, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000);
     } else {
         ret = build_pv(ctx, domid, info, state);
         if (ret) goto out;
 
-        vments = libxl_calloc(ctx, 9, sizeof(char *));
+        vments = libxl_calloc(ctx, 11, sizeof(char *));
         i = 0;
         vments[i++] = "image/ostype";
         vments[i++] = "linux";
         vments[i++] = "image/kernel";
         vments[i++] = (char*) info->kernel;
+        vments[i++] = "start_time";
+        vments[i++] = libxl_sprintf(ctx, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000);
         if (info->u.pv.ramdisk) {
             vments[i++] = "image/ramdisk";
             vments[i++] = (char*) info->u.pv.ramdisk;
@@ -307,6 +314,7 @@
                          libxl_device_model_info *dm_info)
 {
     char **vments = NULL, **localents = NULL;
+    struct timeval start_time;
     int i, ret, esave, flags;
 
     ret = build_pre(ctx, domid, info, state);
@@ -315,19 +323,25 @@
     ret = restore_common(ctx, domid, info, state, fd);
     if (ret) goto out;
 
+    gettimeofday(&start_time, NULL);
+
     if (info->hvm) {
-        vments = libxl_calloc(ctx, 5, sizeof(char *));
+        vments = libxl_calloc(ctx, 7, sizeof(char *));
         vments[0] = "rtc/timeoffset";
         vments[1] = (info->u.hvm.timeoffset) ? info->u.hvm.timeoffset : "";
         vments[2] = "image/ostype";
         vments[3] = "hvm";
+        vments[4] = "start_time";
+        vments[5] = libxl_sprintf(ctx, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000);
     } else {
-        vments = libxl_calloc(ctx, 9, sizeof(char *));
+        vments = libxl_calloc(ctx, 11, sizeof(char *));
         i = 0;
         vments[i++] = "image/ostype";
         vments[i++] = "linux";
         vments[i++] = "image/kernel";
         vments[i++] = (char*) info->kernel;
+        vments[i++] = "start_time";
+        vments[i++] = libxl_sprintf(ctx, "%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000);
         if (info->u.pv.ramdisk) {
             vments[i++] = "image/ramdisk";
             vments[i++] = (char*) info->u.pv.ramdisk;
Signature · 2 lines
Regards
Yang Hongyang