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

Some workaround for bug report

Browse Source 
1824189  Qemu hard disk image not reckognized
This commit is contained in:
Stanislav Shwartsman 2008-01-14 20:47:11 +00:00
parent 0a8105e95e
commit 08eb75d985
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bochs/iodev/harddrv.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: harddrv.cc,v 1.204 2007-12-17 18:08:27 vruppert Exp $
// $Id: harddrv.cc,v 1.205 2008-01-14 20:47:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -174,7 +174,7 @@ void bx_hard_drive_c::init(void)
char ata_name[20];
bx_list_c *base;
BX_DEBUG(("Init $Id: harddrv.cc,v 1.204 2007-12-17 18:08:27 vruppert Exp $"));
BX_DEBUG(("Init $Id: harddrv.cc,v 1.205 2008-01-14 20:47:11 sshwarts Exp $"));
for (channel=0; channel<BX_MAX_ATA_CHANNEL; channel++) {
sprintf(ata_name, "ata.%d.resources", channel);
@ -428,12 +428,11 @@ void bx_hard_drive_c::init(void)
disk_size = BX_HD_THIS channels[channel].drives[device].hard_drive->hd_size;
if (image_mode != BX_ATA_MODE_VMWARE3 && image_mode != BX_ATA_MODE_VMWARE4) {
cyl = (int)(disk_size / (heads * spt * 512));
if (disk_size == (Bit64u)(cyl * heads * spt * 512)) {
BX_HD_THIS channels[channel].drives[device].hard_drive->cylinders = cyl;
SIM->get_param_num("cylinders", base)->set(cyl);
} else {
if (disk_size != (Bit64u)(cyl * heads * spt * 512)) {
BX_PANIC(("ata%d-%d: geometry autodetection failed", channel, device));
}
BX_HD_THIS channels[channel].drives[device].hard_drive->cylinders = cyl;
SIM->get_param_num("cylinders", base)->set(cyl);
} else {
cyl = BX_HD_THIS channels[channel].drives[device].hard_drive->cylinders;
heads = BX_HD_THIS channels[channel].drives[device].hard_drive->heads;