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

DISK: Fix auto format detection when attaching VHD disk images

Browse source
This commit is contained in:
Mark Pizzolato 2018-05-07 12:22:33 -07:00
parent 3afc778dc4
commit e266271612
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sim_disk.c
View file

@ -1528,6 +1528,8 @@ switch (DK_GET_FMT (uptr)) { /* case on format */
sim_disk_set_fmt (uptr, 0, "VHD", NULL); /* set file format to VHD */ sim_disk_set_fmt (uptr, 0, "VHD", NULL); /* set file format to VHD */
sim_vhd_disk_close (uptr->fileref); /* close vhd file*/ sim_vhd_disk_close (uptr->fileref); /* close vhd file*/
uptr->fileref = NULL; uptr->fileref = NULL;
open_function = sim_vhd_disk_open;
size_function = sim_vhd_disk_size;
break; break;
} }
if (NULL != (uptr->fileref = sim_os_disk_open_raw (cptr, "rb"))) { if (NULL != (uptr->fileref = sim_os_disk_open_raw (cptr, "rb"))) {
@ -1562,8 +1564,11 @@ switch (DK_GET_FMT (uptr)) { /* case on format */
} }
uptr->filename = (char *) calloc (CBUFSIZE, sizeof (char));/* alloc name buf */ uptr->filename = (char *) calloc (CBUFSIZE, sizeof (char));/* alloc name buf */
uptr->disk_ctx = ctx = (struct disk_context *)calloc(1, sizeof(struct disk_context)); uptr->disk_ctx = ctx = (struct disk_context *)calloc(1, sizeof(struct disk_context));
if ((uptr->filename == NULL) || (uptr->disk_ctx == NULL)) if ((uptr->filename == NULL) || (uptr->disk_ctx == NULL)) {
free (uptr->filename);
free (uptr->disk_ctx);
return _err_return (uptr, SCPE_MEM); return _err_return (uptr, SCPE_MEM);
}
strncpy (uptr->filename, cptr, CBUFSIZE); /* save name */ strncpy (uptr->filename, cptr, CBUFSIZE); /* save name */
ctx->sector_size = (uint32)sector_size; /* save sector_size */ ctx->sector_size = (uint32)sector_size; /* save sector_size */
ctx->capac_factor = ((dptr->dwidth / dptr->aincr) == 16) ? 2 : 1; /* save capacity units (word: 2, byte: 1) */ ctx->capac_factor = ((dptr->dwidth / dptr->aincr) == 16) ? 2 : 1; /* save capacity units (word: 2, byte: 1) */