Re: svn commit: r319125 - head/usr.bin/mkimg

[Ngie Cooper]

> On May 31, 2017, at 02:48, Emmanuel Vadot  wrote:
> 
> On Wed, 31 May 2017 00:20:45 -0700
> "Ngie Cooper (yaneurabeya)"  wrote:
> 
>> 
>>> On May 29, 2017, at 05:51, Emmanuel Vadot  wrote:
>>> 
>>> Author: manu
>>> Date: Mon May 29 12:51:02 2017
>>> New Revision: 319125
>>> URL: https://svnweb.freebsd.org/changeset/base/319125
>>> 
>>> Log:
>>> mkimg: Correct an off by one error in the PMBR size
>>> 
>>> The PMBR last sector should be number of sector - 1 (As stated in UEFI Spec
>>> 2.6 page 118 table 17).
>>> This fixes warning printed by linux tools like parted or fdisk.
>> 
>> This commit broke all of the mkimg gpt tests. For example: 
>> https://ci.freebsd.org/job/FreeBSD-head-amd64-test/3280/testReport/junit/usr.bin.mkimg/mkimg_test/gpt_1x1_4096_qcow/
>>  .
>> -Ngie
> 
> Sorry about that and thanks for the fix.

No worries -- it turns out I broke something by accident as well, and I 
fixed both items at the same time.
Take it easy :),
-Ngie
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r319125 - head/usr.bin/mkimg

[Emmanuel Vadot]

On Wed, 31 May 2017 00:20:45 -0700
"Ngie Cooper (yaneurabeya)"  wrote:

> 
> > On May 29, 2017, at 05:51, Emmanuel Vadot  wrote:
> > 
> > Author: manu
> > Date: Mon May 29 12:51:02 2017
> > New Revision: 319125
> > URL: https://svnweb.freebsd.org/changeset/base/319125
> > 
> > Log:
> >  mkimg: Correct an off by one error in the PMBR size
> > 
> >  The PMBR last sector should be number of sector - 1 (As stated in UEFI Spec
> >  2.6 page 118 table 17).
> >  This fixes warning printed by linux tools like parted or fdisk.
> 
> This commit broke all of the mkimg gpt tests. For example: 
> https://ci.freebsd.org/job/FreeBSD-head-amd64-test/3280/testReport/junit/usr.bin.mkimg/mkimg_test/gpt_1x1_4096_qcow/
>  .
> -Ngie

 Sorry about that and thanks for the fix.

-- 
Emmanuel Vadot  
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r319125 - head/usr.bin/mkimg

[Ngie Cooper (yaneurabeya)]

> On May 29, 2017, at 05:51, Emmanuel Vadot  wrote:
> 
> Author: manu
> Date: Mon May 29 12:51:02 2017
> New Revision: 319125
> URL: https://svnweb.freebsd.org/changeset/base/319125
> 
> Log:
>  mkimg: Correct an off by one error in the PMBR size
> 
>  The PMBR last sector should be number of sector - 1 (As stated in UEFI Spec
>  2.6 page 118 table 17).
>  This fixes warning printed by linux tools like parted or fdisk.

This commit broke all of the mkimg gpt tests. For example: 
https://ci.freebsd.org/job/FreeBSD-head-amd64-test/3280/testReport/junit/usr.bin.mkimg/mkimg_test/gpt_1x1_4096_qcow/
 .
-Ngie


signature.asc
Description: Message signed with OpenPGP using GPGMail

svn commit: r319125 - head/usr.bin/mkimg

[Emmanuel Vadot]

Author: manu
Date: Mon May 29 12:51:02 2017
New Revision: 319125
URL: https://svnweb.freebsd.org/changeset/base/319125

Log:
  mkimg: Correct an off by one error in the PMBR size
  
  The PMBR last sector should be number of sector - 1 (As stated in UEFI Spec
  2.6 page 118 table 17).
  This fixes warning printed by linux tools like parted or fdisk.
  
  Sponsored by: Gandi.net

Modified:
  head/usr.bin/mkimg/gpt.c

Modified: head/usr.bin/mkimg/gpt.c
==
--- head/usr.bin/mkimg/gpt.cMon May 29 11:37:08 2017(r319124)
+++ head/usr.bin/mkimg/gpt.cMon May 29 12:51:02 2017(r319125)
@@ -152,7 +152,7 @@ gpt_write_pmbr(lba_t blks, void *bootcod
uint32_t secs;
int error;
 
-   secs = (blks > UINT32_MAX) ? UINT32_MAX : (uint32_t)blks;
+   secs = (blks > UINT32_MAX) ? UINT32_MAX : (uint32_t)blks - 1;
 
pmbr = malloc(secsz);
if (pmbr == NULL)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"