folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DISK: Properly allow/disallow containers of reasonable/unreasonavle sizes

Browse source 
As reported in #1065
This commit is contained in:
Mark Pizzolato 2021-10-31 04:32:54 -07:00
parent e6611c61b3
commit b4fa00cebf
1 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
sim_disk.c
View file

@ -2875,25 +2875,37 @@ if (container_size && (container_size != (t_offset)-1)) {
sim_messagef (SCPE_OK, "%s: No File System found on '%s', skipping autosizing\n", sim_uname (uptr), cptr); sim_messagef (SCPE_OK, "%s: No File System found on '%s', skipping autosizing\n", sim_uname (uptr), cptr);
} }
} }
if ((container_size != current_unit_size) && if (filesystem_size != (t_offset)-1) {
((DKUF_F_VHD == DK_GET_FMT (uptr)) || (0 != (uptr->flags & UNIT_RO)) || if (filesystem_size > current_unit_size) {
(ctx->footer))) { if (!sim_quiet) {
if (!sim_quiet) { uptr->capac = (t_addr)(filesystem_size/(ctx->capac_factor*((dptr->flags & DEV_SECTORS) ? 512 : 1)));
int32 saved_switches = sim_switches; sim_printf ("%s: The file system on the %s disk container is larger than simulated device (%s > ", sim_uname (uptr), cptr, sprint_capac (dptr, uptr));
const char *container_dtype = ctx->footer ? (const char *)ctx->footer->DriveType : ""; uptr->capac = saved_capac;
sim_printf ("%s)\n", sprint_capac (dptr, uptr));
sim_switches = SWMASK ('R'); }
uptr->capac = (t_addr)(container_size/(ctx->capac_factor*((dptr->flags & DEV_SECTORS) ? 512 : 1))); sim_disk_detach (uptr);
sim_printf ("%s: non expandable %s%sdisk container '%s' is %s than simulated device (%s %s ", return SCPE_FSSIZE;
sim_uname (uptr), container_dtype, (*container_dtype != '\0') ? " " : "", cptr, }
(container_size < current_unit_size) ? "smaller" : "larger", sprint_capac (dptr, uptr), }
(container_size < current_unit_size) ? "<" : ">"); if ((container_size != current_unit_size)) {
uptr->capac = saved_capac; if ((DKUF_F_VHD == DK_GET_FMT (uptr)) &&
sim_printf ("%s)\n", sprint_capac (dptr, uptr)); (0 == (uptr->flags & UNIT_RO))) {
sim_switches = saved_switches; if (!sim_quiet) {
int32 saved_switches = sim_switches;
const char *container_dtype = ctx->footer ? (const char *)ctx->footer->DriveType : "";
sim_switches = SWMASK ('R');
uptr->capac = (t_addr)(container_size/(ctx->capac_factor*((dptr->flags & DEV_SECTORS) ? 512 : 1)));
sim_printf ("%s: non expandable %s%sdisk container '%s' is smaller than simulated device (%s < ",
sim_uname (uptr), container_dtype, (*container_dtype != '\0') ? " " : "", cptr,
sprint_capac (dptr, uptr));
uptr->capac = saved_capac;
sim_printf ("%s)\n", sprint_capac (dptr, uptr));
sim_switches = saved_switches;
}
sim_disk_detach (uptr);
return SCPE_OPENERR;
} }
sim_disk_detach (uptr);
return SCPE_OPENERR;
} }
} }
else { /* Autosize by changing capacity */ else { /* Autosize by changing capacity */