mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix bug [ 625676 ] VC++ do not support S_ISBLK. Block devices are not supported on win32 anyway.

Browse Source
This commit is contained in:
Christophe Bothamy 2002-10-21 23:51:49 +00:00
parent b43ca82b5e
commit 957e1b5abe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/iodev/harddrv.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: harddrv.cc,v 1.82 2002-10-21 11:22:26 bdenney Exp $
// $Id: harddrv.cc,v 1.83 2002-10-21 23:51:49 cbothamy Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -162,7 +162,7 @@ bx_hard_drive_c::init(bx_devices_c *d, bx_cmos_c *cmos)
char string[5];
BX_HD_THIS devices = d;
BX_DEBUG(("Init $Id: harddrv.cc,v 1.82 2002-10-21 11:22:26 bdenney Exp $"));
BX_DEBUG(("Init $Id: harddrv.cc,v 1.83 2002-10-21 23:51:49 cbothamy Exp $"));
for (channel=0; channel<BX_MAX_ATA_CHANNEL; channel++) {
if (bx_options.ata[channel].Opresent->get() == 1) {
@ -3110,10 +3110,12 @@ int concat_image_t::open (const char* pathname0)
if (ret) {
BX_PANIC(("fstat() returns error!"));
}
#ifdef S_ISBLK
if (S_ISBLK(stat_buf.st_mode)) {
BX_PANIC(("block devices should REALLY NOT be used with --enable-split-hd. "
"Please reconfigure with --disable-split-hd"));
}
#endif
if ((stat_buf.st_size % 512) != 0) {
BX_PANIC(("size of disk image must be multiple of 512 bytes"));
}