Re: [libvirt] [PATCHv5 2/3] Xen: Fix <clock> handling

On 02/08/2012 09:32 AM, Philipp Hahn wrote: Applying this patch causes 'make check' to fail on xml2sexprtest, sexpr2xmltest, and xmconfigtest for me. I didn't look into it, other than seeing lots of: $ make -C tests check TESTS=xmconfigtest VIR_TEST_DEBUG=1 ... 64) Xen XM-2-XML Format no-source-cdrom ... Offset 414 Expect [/] Actual [ adjustment='reset'/] ... FAILED If patch 3/3 fixes things, then I will squash the two together (we want 'git bisect' to succeed as often as possible). strtol() is awkward (I'm surprised 'make syntax-check' isn't flagging it). another strtol(). I didn't spot any other problems, so conditional ack once I review 3/3 and squash this in: diff --git i/src/xenxs/xen_sxpr.c w/src/xenxs/xen_sxpr.c index c9bacb2..b26b2bc 100644 --- i/src/xenxs/xen_sxpr.c +++ w/src/xenxs/xen_sxpr.c @@ -1263,8 +1263,13 @@ xenParseSxpr(const struct sexpr *root, 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); + if (value) { + if (virStrToLong_i(value, NULL, 0, &vmlocaltime) < 0) { + XENXS_ERROR(VIR_ERR_INTERNAL_ERROR, + _("unknown localtime offset %s"), value); + goto error; + } + } /* only managed HVM domains since 3.1.0 have persistent rtc_timeoffset */ if (xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) { if (vmlocaltime) @@ -1300,8 +1305,13 @@ xenParseSxpr(const struct sexpr *root, } } else { const char *value = sexpr_node(root, "domain/image/linux/localtime"); - if (value) - vmlocaltime = strtol(value, NULL, 0); + if (value) { + if (virStrToLong_i(value, NULL, 0, &vmlocaltime) < 0) { + XENXS_ERROR(VIR_ERR_INTERNAL_ERROR, + _("unknown localtime offset %s"), value); + goto error; + } + } /* PV domains do not have an emulated RTC and the offset is fixed. */ if (vmlocaltime) def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME; -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org