80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #4750 from 86Box/tc1995

Browse Source 
Minor but important changes to minivhd's dynamic/diff vhd handling
This commit is contained in:
Miran Grča
2024-08-26 00:34:49 +02:00
committed by GitHub
parent 3e1991390f 8c98dcf5e8
commit ff01fb0835
1 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/disk/minivhd/minivhd_io.c
View File

@@ -37,6 +37,7 @@
#ifndef _FILE_OFFSET_BITS #ifndef _FILE_OFFSET_BITS
# define _FILE_OFFSET_BITS 64 # define _FILE_OFFSET_BITS 64
#endif #endif
#include <stdarg.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
@@ -45,6 +46,10 @@
#include <time.h> #include <time.h>
#include "minivhd.h" #include "minivhd.h"
#include "internal.h" #include "internal.h"
#define HAVE_STDARG_H
#include "cpu.h"
#include <86box/86box.h>
/* /*
* The following bit array macros adapted from: * The following bit array macros adapted from:
@@ -334,36 +339,38 @@ mvhd_sparse_diff_write(MVHDMeta *vhdm, uint32_t offset, int num_sectors, void *i
int sib = 0; int sib = 0;
ls = offset + transfer_sectors; ls = offset + transfer_sectors;
for (s = offset; s < ls; s++) { if (offset < total_sectors) {
blk = s / vhdm->sect_per_block; for (s = offset; s < ls; s++) {
sib = s % vhdm->sect_per_block; blk = s / vhdm->sect_per_block;
if (vhdm->bitmap.curr_block != blk && prev_blk >= 0) { sib = s % vhdm->sect_per_block;
/* Write the sector bitmap for the previous block, before we replace it. */ if (vhdm->bitmap.curr_block != blk && prev_blk >= 0) {
write_curr_sect_bitmap(vhdm); /* Write the sector bitmap for the previous block, before we replace it. */
} write_curr_sect_bitmap(vhdm);
if (vhdm->block_offset[blk] == MVHD_SPARSE_BLK) {
/* "read" the sector bitmap first, before creating a new block, as the bitmap will be
zero either way */
read_sect_bitmap(vhdm, blk);
create_block(vhdm, blk);
}
if (blk != prev_blk) {
if (vhdm->bitmap.curr_block != blk) {
read_sect_bitmap(vhdm, blk);
mvhd_fseeko64(vhdm->f, (uint64_t)sib * MVHD_SECTOR_SIZE, SEEK_CUR);
} else {
addr = (((int64_t) vhdm->block_offset[blk]) + vhdm->bitmap.sector_count + sib) *
MVHD_SECTOR_SIZE;
mvhd_fseeko64(vhdm->f, addr, SEEK_SET);
} }
prev_blk = blk;
}
fwrite(buff, MVHD_SECTOR_SIZE, 1, vhdm->f); if (vhdm->block_offset[blk] == MVHD_SPARSE_BLK) {
VHD_SETBIT(vhdm->bitmap.curr_bitmap, sib); /* "read" the sector bitmap first, before creating a new block, as the bitmap will be
buff += MVHD_SECTOR_SIZE; zero either way */
read_sect_bitmap(vhdm, blk);
create_block(vhdm, blk);
}
if (blk != prev_blk) {
if (vhdm->bitmap.curr_block != blk) {
read_sect_bitmap(vhdm, blk);
mvhd_fseeko64(vhdm->f, (uint64_t)sib * MVHD_SECTOR_SIZE, SEEK_CUR);
} else {
addr = (((int64_t) vhdm->block_offset[blk]) + vhdm->bitmap.sector_count + sib) *
MVHD_SECTOR_SIZE;
mvhd_fseeko64(vhdm->f, addr, SEEK_SET);
}
prev_blk = blk;
}
fwrite(buff, MVHD_SECTOR_SIZE, 1, vhdm->f);
VHD_SETBIT(vhdm->bitmap.curr_bitmap, sib);
buff += MVHD_SECTOR_SIZE;
}
} }
/* And write the sector bitmap for the last block we visited to disk */ /* And write the sector bitmap for the last block we visited to disk */