mktree.c does not compile with v14 ?
I am trying to compile mktree.c with [v14-rc1] but get this:
$ make mktree cc -g -Wall -Wstrict-prototypes -Wno-trigraphs -I/home/suka/src/linux-cr/include -I/home/suka/src/linux-cr/arch/x86/include -DCHECKPOINT_DEBUG mktree.c -lm -o mktree mktree.c: In function ‘cr_read_head’: mktree.c:563: error: ‘struct cr_hdr_head’ has no member named ‘uts_len’ mktree.c: In function ‘cr_write_head’: mktree.c:639: error: ‘struct cr_hdr_head’ has no member named ‘uts_len’ make: *** [mktree] Error 1
The kernel cr_hdr_head has members ->uts_release_len, ->uts_version_len, ->uts_machine_len but no ->uts_len
Thanks,
Sukadev
_______________________________________________
Containers mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/containers
A message that is not in the archive (sent off-list or not yet received): 20090331005703.GA19223-r/[email protected]
Hi Suka,
SB> I am trying to compile mktree.c with [v14-rc1] but get this:
I had the same problem and had to fix up mktree.c a bit. Oren said he had a fix for this, but I haven't seen it yet. So, I've included mine at the bottom in case it helps.
Signature · 8 lines
Dan Smith IBM Linux Technology Center email: danms-r/[email protected] Signed-off-by: Dan Smith <danms-r/[email protected]> --- mktree.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-)
mktree.c +18 -9
@@ -560,18 +560,24 @@ static int cr_read_head(struct cr_ctx *ctx)if (ret <0 )return ret; - len = hh->uts_len; + len = hh->uts_release_len + hh->uts_version_len + hh->uts_machine_len;if (len <0 || len >BUFSIZE /4 )return -EINVAL ; ptr = (char *) (hh +1 ); - ret =cr_read_obj_buffer (ctx, ptr, len); + len =0 ; + + ret =cr_read_obj_buffer (ctx, ptr, hh->uts_release_len);if (ret <0 )return ret; - ret =cr_read_obj_buffer (ctx, ptr + len, len); + len += hh->uts_release_len; + + ret =cr_read_obj_buffer (ctx, ptr + len, hh->uts_version_len);if (ret <0 )return ret; - ret =cr_read_obj_buffer (ctx, ptr +2 *len, len); + len += hh->uts_version_len; + + ret =cr_read_obj_buffer (ctx, ptr + len, hh->uts_machine_len);if (ret <0 )return ret;
@@ -627,7 +633,7 @@ static int cr_write_head(struct cr_ctx *ctx)struct cr_hdr h;struct cr_hdr_head *hh;char *ptr; -int len, ret; +int len =0 , ret; h.type =CR_HDR_HEAD ; h.len =sizeof (*hh);
@@ -636,16 +642,19 @@ static int cr_write_head(struct cr_ctx *ctx)if (ret <0 )return ret; - len = hh->uts_len; ptr = (char *) (hh +1 ); - ret =cr_write_obj_buffer (ctx, ptr, len); + ret =cr_write_obj_buffer (ctx, ptr, hh->uts_release_len);if (ret <0 )return ret; - ret =cr_write_obj_buffer (ctx, ptr + len, len); + len += hh->uts_release_len; + + ret =cr_write_obj_buffer (ctx, ptr + len, hh->uts_version_len);if (ret <0 )return ret; - ret =cr_write_obj_buffer (ctx, ptr +2 *len, len); + len += hh->uts_version_len; + + ret =cr_write_obj_buffer (ctx, ptr + len, hh->uts_machine_len);return ret; }
Signature · 1 line
1.5.6.3
Yes, the version I uploaded was broken :(
Please try v14-rc2 from the same tree.
Oren.
Quoted 10 lines · Sukadev Bhattiprolu
I am trying to compile
mktree.cwith [v14-rc1] but get this:$ make mktree cc -g -Wall -Wstrict-prototypes -Wno-trigraphs -I/home/suka/src/linux-cr/include -I/home/suka/src/linux-cr/arch/x86/include -DCHECKPOINT_DEBUG mktree.c -lm -o mktree mktree.c: In function ‘cr_read_head’: mktree.c:563: error: ‘struct cr_hdr_head’ has no member named ‘uts_len’ mktree.c: In function ‘cr_write_head’: mktree.c:639: error: ‘struct cr_hdr_head’ has no member named ‘uts_len’ make: *** [mktree] Error 1
Quoted 8 lines
The kernel
cr_hdr_headhas members ->uts_release_len, ->uts_version_len, ->uts_machine_len but no ->uts_lenThanks,
Sukadev
_______________________________________________
Containers mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/containers