mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-19 15:33:56 +00:00
Code Issues Releases Activity

Handle the case in which ncyls is 0.

Browse Source 
While here, update copyright.
This commit is contained in:
Marcel Moolenaar 2015-06-11 15:18:54 +00:00
parent 2697d1ee89
commit f863f42be3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=284270
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/mkimg/vhd.c
View File

@ -1,5 +1,5 @@
/*-
* Copyright (c) 2014 Marcel Moolenaar
* Copyright (c) 2014, 2015 Marcel Moolenaar
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -120,17 +120,19 @@ vhd_geometry(uint64_t image_size, struct vhd_geom *geom)
lba_t imgsz;
long cth;
imgsz = image_size / VHD_SECTOR_SIZE;
/* Respect command line options if possible. */
if (nheads > 1 && nheads < 256 &&
nsecs > 1 && nsecs < 256 &&
ncyls < 65536) {
geom->cylinders = ncyls;
geom->cylinders = (ncyls != 0) ? ncyls :
imgsz / (nheads * nsecs);
geom->heads = nheads;
geom->sectors = nsecs;
return;
}
imgsz = image_size / VHD_SECTOR_SIZE;
if (imgsz > 65536 * 16 * 255)
imgsz = 65536 * 16 * 255;
if (imgsz >= 65535 * 16 * 63) {