1*4882a593SmuzhiyunFrom a8ac01aa3e3ea5e6a9a1620aa8fa7e9da3458120 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Manuel Bouyer <bouyer@netbsd.org> 3*4882a593SmuzhiyunDate: Tue, 26 Jan 2021 23:47:55 +0100 4*4882a593SmuzhiyunSubject: [PATCH] libs/light: fix tv_sec printf format 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunDon't assume tv_sec is a unsigned long, it is 64 bits on NetBSD 32 bits. 10*4882a593SmuzhiyunUse %jd and cast to (intmax_t) instead 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSigned-off-by: Manuel Bouyer <bouyer@netbsd.org> 13*4882a593SmuzhiyunReviewed-by: Roger Pau Monné <roger.pau@citrix.com> 14*4882a593Smuzhiyun[Retrieved (and backported) from: 15*4882a593Smuzhiyunhttps://gitlab.com/xen-project/xen/-/commit/a8ac01aa3e3ea5e6a9a1620aa8fa7e9da3458120] 16*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun tools/libs/light/libxl_create.c | 8 ++++---- 19*4882a593Smuzhiyun 1 file changed, 4 insertions(+), 4 deletions(-) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c 22*4882a593Smuzhiyunindex 8616113e72..9848d65f36 100644 23*4882a593Smuzhiyun--- a/tools/libxl/libxl_create.c 24*4882a593Smuzhiyun+++ b/tools/libxl/libxl_create.c 25*4882a593Smuzhiyun@@ -496,7 +496,7 @@ int libxl__domain_build(libxl__gc *gc, 26*4882a593Smuzhiyun vments[2] = "image/ostype"; 27*4882a593Smuzhiyun vments[3] = "hvm"; 28*4882a593Smuzhiyun vments[4] = "start_time"; 29*4882a593Smuzhiyun- vments[5] = GCSPRINTF("%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); 30*4882a593Smuzhiyun+ vments[5] = GCSPRINTF("%jd.%02d", (intmax_t)start_time.tv_sec,(int)start_time.tv_usec/10000); 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun localents = libxl__calloc(gc, 13, sizeof(char *)); 33*4882a593Smuzhiyun i = 0; 34*4882a593Smuzhiyun@@ -535,7 +535,7 @@ int libxl__domain_build(libxl__gc *gc, 35*4882a593Smuzhiyun vments[i++] = "image/kernel"; 36*4882a593Smuzhiyun vments[i++] = (char *) state->pv_kernel.path; 37*4882a593Smuzhiyun vments[i++] = "start_time"; 38*4882a593Smuzhiyun- vments[i++] = GCSPRINTF("%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); 39*4882a593Smuzhiyun+ vments[i++] = GCSPRINTF("%jd.%02d", (intmax_t)start_time.tv_sec,(int)start_time.tv_usec/10000); 40*4882a593Smuzhiyun if (state->pv_ramdisk.path) { 41*4882a593Smuzhiyun vments[i++] = "image/ramdisk"; 42*4882a593Smuzhiyun vments[i++] = (char *) state->pv_ramdisk.path; 43*4882a593Smuzhiyun@@ -1502,7 +1502,7 @@ static void domcreate_stream_done(libxl__egc *egc, 44*4882a593Smuzhiyun vments[2] = "image/ostype"; 45*4882a593Smuzhiyun vments[3] = "hvm"; 46*4882a593Smuzhiyun vments[4] = "start_time"; 47*4882a593Smuzhiyun- vments[5] = GCSPRINTF("%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); 48*4882a593Smuzhiyun+ vments[5] = GCSPRINTF("%jd.%02d", (intmax_t)start_time.tv_sec,(int)start_time.tv_usec/10000); 49*4882a593Smuzhiyun break; 50*4882a593Smuzhiyun case LIBXL_DOMAIN_TYPE_PV: 51*4882a593Smuzhiyun vments = libxl__calloc(gc, 11, sizeof(char *)); 52*4882a593Smuzhiyun@@ -1512,7 +1512,7 @@ static void domcreate_stream_done(libxl__egc *egc, 53*4882a593Smuzhiyun vments[i++] = "image/kernel"; 54*4882a593Smuzhiyun vments[i++] = (char *) state->pv_kernel.path; 55*4882a593Smuzhiyun vments[i++] = "start_time"; 56*4882a593Smuzhiyun- vments[i++] = GCSPRINTF("%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); 57*4882a593Smuzhiyun+ vments[i++] = GCSPRINTF("%jd.%02d", (intmax_t)start_time.tv_sec,(int)start_time.tv_usec/10000); 58*4882a593Smuzhiyun if (state->pv_ramdisk.path) { 59*4882a593Smuzhiyun vments[i++] = "image/ramdisk"; 60*4882a593Smuzhiyun vments[i++] = (char *) state->pv_ramdisk.path; 61*4882a593Smuzhiyun-- 62*4882a593SmuzhiyunGitLab 63*4882a593Smuzhiyun 64