| Message ID | 22270.31712.901168.686841@mariner.uk.xensource.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/01/2016 09:47 PM, Ian Jackson wrote: > Changlong Xie writes ("Re: [PATCH v13 00/26] COarse-grain LOck-stepping Virtual Machines for Non-stop Service"): >> https://github.com/Pating/xen/tree/changlox/colo_v14 >> >> Just add A-B for p12,p14,20,p23,p25,p26 in this version, no other changes. >> >> *Note*, dont merge >> https://github.com/Pating/xen/commit/1ab693c8b64309da96aa6cac96dc480f4ba31d6a, >> i'll send out it separately > > Thanks. I have pushed this to staging.od Good news :) > > I found that it didn't build on i386. I folded the change below into > "libxc/save: support COLO save". > Thanks for your correction > Ian. > > diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c > index 3c0c86d..b861c7d 100644 > --- a/tools/libxc/xc_sr_save.c > +++ b/tools/libxc/xc_sr_save.c > @@ -555,7 +555,7 @@ static int colo_merge_secondary_dirty_bitmap(struct xc_sr_context *ctx) > pfn = pfns[i]; > if (pfn > ctx->save.p2m_size) > { > - PERROR("Invalid pfn %#lx", pfn ); > + PERROR("Invalid pfn 0x%" PRIpfn "", (unsigned long)pfn ); > rc = -1; > goto err; > } > > > . >
diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 3c0c86d..b861c7d 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -555,7 +555,7 @@ static int colo_merge_secondary_dirty_bitmap(struct xc_sr_context *ctx) pfn = pfns[i]; if (pfn > ctx->save.p2m_size) { - PERROR("Invalid pfn %#lx", pfn ); + PERROR("Invalid pfn 0x%" PRIpfn "", (unsigned long)pfn ); rc = -1; goto err; }
Changlong Xie writes ("Re: [PATCH v13 00/26] COarse-grain LOck-stepping Virtual Machines for Non-stop Service"): > https://github.com/Pating/xen/tree/changlox/colo_v14 > > Just add A-B for p12,p14,20,p23,p25,p26 in this version, no other changes. > > *Note*, dont merge > https://github.com/Pating/xen/commit/1ab693c8b64309da96aa6cac96dc480f4ba31d6a, > i'll send out it separately Thanks. I have pushed this to staging. I found that it didn't build on i386. I folded the change below into "libxc/save: support COLO save". Ian.