diff --git a/bochs/.bochsrc b/bochs/.bochsrc index 0bcf15b5f..3d2f897ed 100644 --- a/bochs/.bochsrc +++ b/bochs/.bochsrc @@ -173,7 +173,7 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2=0x360, irq=9 # This defines the type and characteristics of all attached ata devices: # type= type of attached device [disk|cdrom] # mode= only valid for disks [flat|concat|external|dll|sparse|vmware3] -# mode= only valid for disks [undoable|growing|volatile|z-undoable|z-volatile] +# mode= only valid for disks [undoable|growing|volatile] # path= path of the image # cylinders= only valid for disks # heads= only valid for disks @@ -182,7 +182,7 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2=0x360, irq=9 # biosdetect= type of biosdetection [none|auto], only for disks on ata0 [cmos] # translation=type of transation of the bios, only for disks [none|lba|large|rechs|auto] # model= string returned by identify device command -# journal= optional filename of the redolog for (z-)undoable and (z-)volatile disks +# journal= optional filename of the redolog for undoable and volatile disks # # Point this at a hard disk image file, cdrom iso file, or physical cdrom # device. To create a hard disk image, try running bximage. It will help you diff --git a/bochs/CHANGES b/bochs/CHANGES index 5c1d41ba4..3b48be51f 100644 --- a/bochs/CHANGES +++ b/bochs/CHANGES @@ -91,7 +91,7 @@ Patches applied: - I/O devices - harddisks - per device selectable Harddisk modes : - - undoable, volatile, growing, z-undoable, z-volatile disks support + - undoable, volatile, growing disks support - sparse disks support (contributed by justinSB) - vmware3 disks support (contributed by Sharvil Nanavati) - fix non detection of hard drives by minix2 diff --git a/bochs/iodev/harddrv.cc b/bochs/iodev/harddrv.cc index 1e15f5284..16cab8d2f 100644 --- a/bochs/iodev/harddrv.cc +++ b/bochs/iodev/harddrv.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: harddrv.cc,v 1.111 2003-09-22 23:32:23 cbothamy Exp $ +// $Id: harddrv.cc,v 1.112 2003-10-29 01:12:07 cbothamy Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2002 MandrakeSoft S.A. @@ -159,7 +159,7 @@ bx_hard_drive_c::init(void) Bit8u channel; char string[5]; - BX_DEBUG(("Init $Id: harddrv.cc,v 1.111 2003-09-22 23:32:23 cbothamy Exp $")); + BX_DEBUG(("Init $Id: harddrv.cc,v 1.112 2003-10-29 01:12:07 cbothamy Exp $")); for (channel=0; channelget() == 1) { @@ -316,17 +316,23 @@ bx_hard_drive_c::init(void) #if BX_COMPRESSED_HD_SUPPORT case BX_ATA_MODE_Z_UNDOABLE: + BX_PANIC(("z-undoable disk support not implemented")); +#if 0 BX_INFO(("HD on ata%d-%d: '%s' 'z-undoable' mode ", channel, device, bx_options.atadevice[channel][device].Opath->getptr ())); channels[channel].drives[device].hard_drive = new z_undoable_image_t(disk_size, bx_options.atadevice[channel][device].Ojournal->getptr()); +#endif break; case BX_ATA_MODE_Z_VOLATILE: + BX_PANIC(("z-volatile disk support not implemented")); +#if 0 BX_INFO(("HD on ata%d-%d: '%s' 'z-volatile' mode ", channel, device, bx_options.atadevice[channel][device].Opath->getptr ())); channels[channel].drives[device].hard_drive = new z_volatile_image_t(disk_size, bx_options.atadevice[channel][device].Ojournal->getptr()); +#endif break; #endif //BX_COMPRESSED_HD_SUPPORT