X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fide.c;h=4dd5db63d95c23683ab5ef7f4802244120facb12;hb=4a8f339db9b852ccd1d4d785906ef71b6b848350;hp=206a8effccd9ab8b36be93352072b9ddee473d9f;hpb=94966f95239e03c7df97bd71d6be3e1316239d21;p=palacios.git diff --git a/palacios/src/devices/ide.c b/palacios/src/devices/ide.c index 206a8ef..4dd5db6 100644 --- a/palacios/src/devices/ide.c +++ b/palacios/src/devices/ide.c @@ -292,10 +292,12 @@ static inline int is_lba_enabled(struct ide_channel * channel) { static void ide_raise_irq(struct ide_internal * ide, struct ide_channel * channel) { if (channel->ctrl_reg.irq_disable == 0) { - //PrintError("Raising IDE Interrupt %d\n", channel->irq); + PrintDebug(ide->vm,VCORE_NONE, "Raising IDE Interrupt %d\n", channel->irq); channel->dma_status.int_gen = 1; v3_raise_irq(ide->vm, channel->irq); + } else { + PrintDebug(ide->vm,VCORE_NONE, "IDE Interrupt %d cannot be raised as irq is disabled on channel\n",channel->irq); } } @@ -304,7 +306,7 @@ static void drive_reset(struct ide_drive * drive) { drive->sector_count = 0x01; drive->sector_num = 0x01; - PrintDebug("Resetting drive %s\n", drive->model); + PrintDebug(VM_NONE,VCORE_NONE, "Resetting drive %s\n", drive->model); if (drive->drive_type == BLOCK_CDROM) { drive->cylinder = 0xeb14; @@ -371,7 +373,7 @@ static void print_prd_table(struct ide_internal * ide, struct ide_channel * chan struct ide_dma_prd prd_entry; int index = 0; - V3_Print("Dumping PRD table\n"); + V3_Print(VM_NONE, VCORE_NONE,"Dumping PRD table\n"); while (1) { uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * index); @@ -380,11 +382,11 @@ static void print_prd_table(struct ide_internal * ide, struct ide_channel * chan ret = v3_read_gpa_memory(&(ide->vm->cores[0]), prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry); if (ret != sizeof(struct ide_dma_prd)) { - PrintError("Could not read PRD\n"); + PrintError(VM_NONE, VCORE_NONE, "Could not read PRD\n"); return; } - V3_Print("\tPRD Addr: %x, PRD Len: %d, EOT: %d\n", + V3_Print(VM_NONE, VCORE_NONE,"\tPRD Addr: %x, PRD Len: %d, EOT: %d\n", prd_entry.base_addr, (prd_entry.size == 0) ? 0x10000 : prd_entry.size, prd_entry.end_of_table); @@ -414,7 +416,7 @@ static int dma_read(struct guest_info * core, struct ide_internal * ide, struct print_prd_table(ide, channel); #endif - PrintDebug("DMA read for %d bytes\n", bytes_left); + PrintDebug(core->vm_info, core, "DMA read for %d bytes\n", bytes_left); // Loop through the disk data while (bytes_left > 0) { @@ -423,16 +425,16 @@ static int dma_read(struct guest_info * core, struct ide_internal * ide, struct uint_t prd_offset = 0; int ret; - PrintDebug("PRD table address = %x\n", channel->dma_prd_addr); + PrintDebug(core->vm_info, core, "PRD table address = %x\n", channel->dma_prd_addr); ret = v3_read_gpa_memory(core, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry); if (ret != sizeof(struct ide_dma_prd)) { - PrintError("Could not read PRD\n"); + PrintError(core->vm_info, core, "Could not read PRD\n"); return -1; } - PrintDebug("PRD Addr: %x, PRD Len: %d, EOT: %d\n", + PrintDebug(core->vm_info, core, "PRD Addr: %x, PRD Len: %d, EOT: %d\n", prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table); // loop through the PRD data.... @@ -453,7 +455,7 @@ static int dma_read(struct guest_info * core, struct ide_internal * ide, struct if (ata_read(ide, channel, drive->data_buf, 1) == -1) { - PrintError("Failed to read next disk sector\n"); + PrintError(core->vm_info, core, "Failed to read next disk sector\n"); return -1; } } else if (drive->drive_type == BLOCK_CDROM) { @@ -461,23 +463,23 @@ static int dma_read(struct guest_info * core, struct ide_internal * ide, struct bytes_to_write = (prd_bytes_left > ATAPI_BLOCK_SIZE) ? ATAPI_BLOCK_SIZE : prd_bytes_left; if (atapi_read_chunk(ide, channel) == -1) { - PrintError("Failed to read next disk sector\n"); + PrintError(core->vm_info, core, "Failed to read next disk sector\n"); return -1; } } else { /* - PrintError("How does this work (ATAPI CMD=%x)???\n", drive->cd_state.atapi_cmd); + PrintError(core->vm_info, core, "How does this work (ATAPI CMD=%x)???\n", drive->cd_state.atapi_cmd); return -1; */ int cmd_ret = 0; - //V3_Print("DMA of command packet\n"); + //V3_Print(core->vm_info, core, "DMA of command packet\n"); bytes_to_write = (prd_bytes_left > bytes_left) ? bytes_left : prd_bytes_left; prd_bytes_left = bytes_to_write; - // V3_Print("Writing ATAPI cmd OP DMA (cmd=%x) (len=%d)\n", drive->cd_state.atapi_cmd, prd_bytes_left); + // V3_Print(core->vm_info, core, "Writing ATAPI cmd OP DMA (cmd=%x) (len=%d)\n", drive->cd_state.atapi_cmd, prd_bytes_left); cmd_ret = v3_write_gpa_memory(core, prd_entry.base_addr + prd_offset, bytes_to_write, drive->data_buf); @@ -503,7 +505,7 @@ static int dma_read(struct guest_info * core, struct ide_internal * ide, struct } } - PrintDebug("Writing DMA data to guest Memory ptr=%p, len=%d\n", + PrintDebug(core->vm_info, core, "Writing DMA data to guest Memory ptr=%p, len=%d\n", (void *)(addr_t)(prd_entry.base_addr + prd_offset), bytes_to_write); drive->current_lba++; @@ -511,11 +513,11 @@ static int dma_read(struct guest_info * core, struct ide_internal * ide, struct ret = v3_write_gpa_memory(core, prd_entry.base_addr + prd_offset, bytes_to_write, drive->data_buf); if (ret != bytes_to_write) { - PrintError("Failed to copy data into guest memory... (ret=%d)\n", ret); + PrintError(core->vm_info, core, "Failed to copy data into guest memory... (ret=%d)\n", ret); return -1; } - PrintDebug("\t DMA ret=%d, (prd_bytes_left=%d) (bytes_left=%d)\n", ret, prd_bytes_left, bytes_left); + PrintDebug(core->vm_info, core, "\t DMA ret=%d, (prd_bytes_left=%d) (bytes_left=%d)\n", ret, prd_bytes_left, bytes_left); drive->transfer_index += ret; prd_bytes_left -= ret; @@ -527,14 +529,14 @@ static int dma_read(struct guest_info * core, struct ide_internal * ide, struct if (drive->drive_type == BLOCK_DISK) { if (drive->transfer_index % HD_SECTOR_SIZE) { - PrintError("We currently don't handle sectors that span PRD descriptors\n"); + PrintError(core->vm_info, core, "We currently don't handle sectors that span PRD descriptors\n"); return -1; } } else if (drive->drive_type == BLOCK_CDROM) { if (atapi_cmd_is_data_op(drive->cd_state.atapi_cmd)) { if (drive->transfer_index % ATAPI_BLOCK_SIZE) { - PrintError("We currently don't handle ATAPI BLOCKS that span PRD descriptors\n"); - PrintError("transfer_index=%d, transfer_length=%d\n", + PrintError(core->vm_info, core, "We currently don't handle ATAPI BLOCKS that span PRD descriptors\n"); + PrintError(core->vm_info, core, "transfer_index=%d, transfer_length=%d\n", drive->transfer_index, drive->transfer_length); return -1; } @@ -543,7 +545,7 @@ static int dma_read(struct guest_info * core, struct ide_internal * ide, struct if ((prd_entry.end_of_table == 1) && (bytes_left > 0)) { - PrintError("DMA table not large enough for data transfer...\n"); + PrintError(core->vm_info, core, "DMA table not large enough for data transfer...\n"); return -1; } } @@ -583,7 +585,7 @@ static int dma_write(struct guest_info * core, struct ide_internal * ide, struct uint_t bytes_left = drive->transfer_length; - PrintDebug("DMA write from %d bytes\n", bytes_left); + PrintDebug(core->vm_info, core, "DMA write from %d bytes\n", bytes_left); // Loop through disk data while (bytes_left > 0) { @@ -592,16 +594,16 @@ static int dma_write(struct guest_info * core, struct ide_internal * ide, struct uint_t prd_offset = 0; int ret; - PrintDebug("PRD Table address = %x\n", channel->dma_prd_addr); + PrintDebug(core->vm_info, core, "PRD Table address = %x\n", channel->dma_prd_addr); ret = v3_read_gpa_memory(core, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry); if (ret != sizeof(struct ide_dma_prd)) { - PrintError("Could not read PRD\n"); + PrintError(core->vm_info, core, "Could not read PRD\n"); return -1; } - PrintDebug("PRD Addr: %x, PRD Len: %d, EOT: %d\n", + PrintDebug(core->vm_info, core, "PRD Addr: %x, PRD Len: %d, EOT: %d\n", prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table); @@ -622,15 +624,15 @@ static int dma_write(struct guest_info * core, struct ide_internal * ide, struct ret = v3_read_gpa_memory(core, prd_entry.base_addr + prd_offset, bytes_to_write, drive->data_buf); if (ret != bytes_to_write) { - PrintError("Faild to copy data from guest memory... (ret=%d)\n", ret); + PrintError(core->vm_info, core, "Faild to copy data from guest memory... (ret=%d)\n", ret); return -1; } - PrintDebug("\t DMA ret=%d (prd_bytes_left=%d) (bytes_left=%d)\n", ret, prd_bytes_left, bytes_left); + PrintDebug(core->vm_info, core, "\t DMA ret=%d (prd_bytes_left=%d) (bytes_left=%d)\n", ret, prd_bytes_left, bytes_left); if (ata_write(ide, channel, drive->data_buf, 1) == -1) { - PrintError("Failed to write data to disk\n"); + PrintError(core->vm_info, core, "Failed to write data to disk\n"); return -1; } @@ -645,15 +647,15 @@ static int dma_write(struct guest_info * core, struct ide_internal * ide, struct channel->dma_tbl_index++; if (drive->transfer_index % HD_SECTOR_SIZE) { - PrintError("We currently don't handle sectors that span PRD descriptors\n"); + PrintError(core->vm_info, core, "We currently don't handle sectors that span PRD descriptors\n"); return -1; } if ((prd_entry.end_of_table == 1) && (bytes_left > 0)) { - PrintError("DMA table not large enough for data transfer...\n"); - PrintError("\t(bytes_left=%u) (transfer_length=%u)...\n", + PrintError(core->vm_info, core, "DMA table not large enough for data transfer...\n"); + PrintError(core->vm_info, core, "\t(bytes_left=%u) (transfer_length=%u)...\n", bytes_left, drive->transfer_length); - PrintError("PRD Addr: %x, PRD Len: %d, EOT: %d\n", + PrintError(core->vm_info, core, "PRD Addr: %x, PRD Len: %d, EOT: %d\n", prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table); print_prd_table(ide, channel); @@ -694,7 +696,7 @@ static int write_dma_port(struct guest_info * core, ushort_t port, void * src, u uint_t channel_flag = (port & DMA_CHANNEL_FLAG) >> 3; struct ide_channel * channel = &(ide->channels[channel_flag]); - PrintDebug("IDE: Writing DMA Port %x (%s) (val=%x) (len=%d) (channel=%d)\n", + PrintDebug(core->vm_info, core, "IDE: Writing DMA Port %x (%s) (val=%x) (len=%d) (channel=%d)\n", port, dma_port_to_str(port_offset), *(uint32_t *)src, length, channel_flag); switch (port_offset) { @@ -709,13 +711,13 @@ static int write_dma_port(struct guest_info * core, ushort_t port, void * src, u if (channel->dma_cmd.read == 1) { // DMA Read if (dma_read(core, ide, channel) == -1) { - PrintError("Failed DMA Read\n"); + PrintError(core->vm_info, core, "Failed DMA Read\n"); return -1; } } else { // DMA write if (dma_write(core, ide, channel) == -1) { - PrintError("Failed DMA Write\n"); + PrintError(core->vm_info, core, "Failed DMA Write\n"); return -1; } } @@ -729,7 +731,7 @@ static int write_dma_port(struct guest_info * core, ushort_t port, void * src, u uint8_t val = *(uint8_t *)src; if (length != 1) { - PrintError("Invalid read length for DMA status port\n"); + PrintError(core->vm_info, core, "Invalid read length for DMA status port\n"); return -1; } @@ -749,7 +751,7 @@ static int write_dma_port(struct guest_info * core, ushort_t port, void * src, u int i = 0; if (addr_index + length > 4) { - PrintError("DMA Port space overrun port=%x len=%d\n", port_offset, length); + PrintError(core->vm_info, core, "DMA Port space overrun port=%x len=%d\n", port_offset, length); return -1; } @@ -757,12 +759,12 @@ static int write_dma_port(struct guest_info * core, ushort_t port, void * src, u addr_buf[addr_index + i] = *((uint8_t *)src + i); } - PrintDebug("Writing PRD Port %x (val=%x)\n", port_offset, channel->dma_prd_addr); + PrintDebug(core->vm_info, core, "Writing PRD Port %x (val=%x)\n", port_offset, channel->dma_prd_addr); break; } default: - PrintError("IDE: Invalid DMA Port (%d) (%s)\n", port, dma_port_to_str(port_offset)); + PrintError(core->vm_info, core, "IDE: Invalid DMA Port (%d) (%s)\n", port, dma_port_to_str(port_offset)); break; } @@ -776,16 +778,16 @@ static int read_dma_port(struct guest_info * core, uint16_t port, void * dst, ui uint_t channel_flag = (port & DMA_CHANNEL_FLAG) >> 3; struct ide_channel * channel = &(ide->channels[channel_flag]); - PrintDebug("Reading DMA port %d (%x) (channel=%d)\n", port, port, channel_flag); + PrintDebug(core->vm_info, core, "Reading DMA port %d (%x) (channel=%d)\n", port, port, channel_flag); if (port_offset + length > 16) { - PrintError("DMA Port Read: Port overrun (port_offset=%d, length=%d)\n", port_offset, length); + PrintError(core->vm_info, core, "DMA Port Read: Port overrun (port_offset=%d, length=%d)\n", port_offset, length); return -1; } memcpy(dst, channel->dma_ports + port_offset, length); - PrintDebug("\tval=%x (len=%d)\n", *(uint32_t *)dst, length); + PrintDebug(core->vm_info, core, "\tval=%x (len=%d)\n", *(uint32_t *)dst, length); return length; } @@ -798,17 +800,17 @@ static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, u struct ide_drive * drive = get_selected_drive(channel); if (length != 1) { - PrintError("Invalid Write Length on IDE command Port %x\n", port); + PrintError(core->vm_info, core, "Invalid Write Length on IDE command Port %x\n", port); return -1; } - PrintDebug("IDE: Writing Command Port %x (%s) (val=%x)\n", port, io_port_to_str(port), *(uint8_t *)src); + PrintDebug(core->vm_info, core, "IDE: Writing Command Port %x (%s) (val=%x)\n", port, io_port_to_str(port), *(uint8_t *)src); channel->cmd_reg = *(uint8_t *)src; switch (channel->cmd_reg) { - case 0xa1: // ATAPI Identify Device Packet + case ATAPI_PIDENTIFY: // ATAPI Identify Device Packet if (drive->drive_type != BLOCK_CDROM) { drive_reset(drive); @@ -824,7 +826,7 @@ static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, u ide_raise_irq(ide, channel); } break; - case 0xec: // Identify Device + case ATAPI_IDENTIFY: // Identify Device if (drive->drive_type != BLOCK_DISK) { drive_reset(drive); @@ -840,7 +842,7 @@ static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, u } break; - case 0xa0: // ATAPI Command Packet + case ATAPI_PACKETCMD: // ATAPI Command Packet if (drive->drive_type != BLOCK_CDROM) { ide_abort_command(ide, channel); } @@ -852,33 +854,45 @@ static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, u channel->status.data_req = 1; channel->status.error = 0; - // reset the data buffer... + // reset the datxgoto-la buffer... drive->transfer_length = ATAPI_PACKET_SIZE; drive->transfer_index = 0; break; - case 0x20: // Read Sectors with Retry - case 0x21: // Read Sectors without Retry + case ATAPI_READ: // Read Sectors with Retry + case ATAPI_READ_ONCE: // Read Sectors without Retry drive->hd_state.cur_sector_num = 1; if (ata_read_sectors(ide, channel) == -1) { - PrintError("Error reading sectors\n"); + PrintError(core->vm_info, core, "Error reading sectors\n"); return -1; } break; - case 0x24: // Read Sectors Extended + case ATAPI_READ_EXT: // Read Sectors Extended drive->hd_state.cur_sector_num = 1; if (ata_read_sectors_ext(ide, channel) == -1) { - PrintError("Error reading extended sectors\n"); + PrintError(core->vm_info, core, "Error reading extended sectors\n"); return -1; } break; - case 0xc8: // Read DMA with retry - case 0xc9: { // Read DMA + case ATAPI_WRITE: {// Write Sector + drive->hd_state.cur_sector_num = 1; + + if (ata_write_sectors(ide, channel) == -1) { + PrintError(core->vm_info, core, "Error writing sectors\n"); + return -1; + } + break; + } + + + + case ATAPI_READDMA: // Read DMA with retry + case ATAPI_READDMA_ONCE: { // Read DMA uint32_t sect_cnt = (drive->sector_count == 0) ? 256 : drive->sector_count; if (ata_get_lba(ide, channel, &(drive->current_lba)) == -1) { @@ -894,14 +908,14 @@ static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, u if (channel->dma_status.active == 1) { // DMA Read if (dma_read(core, ide, channel) == -1) { - PrintError("Failed DMA Read\n"); + PrintError(core->vm_info, core, "Failed DMA Read\n"); return -1; } } break; } - case 0xca: { // Write DMA + case ATAPI_WRITEDMA: { // Write DMA uint32_t sect_cnt = (drive->sector_count == 0) ? 256 : drive->sector_count; if (ata_get_lba(ide, channel, &(drive->current_lba)) == -1) { @@ -917,28 +931,28 @@ static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, u if (channel->dma_status.active == 1) { // DMA Write if (dma_write(core, ide, channel) == -1) { - PrintError("Failed DMA Write\n"); + PrintError(core->vm_info, core, "Failed DMA Write\n"); return -1; } } break; } - case 0xe0: // Standby Now 1 - case 0xe1: // Set Idle Immediate - case 0xe2: // Standby - case 0xe3: // Set Idle 1 - case 0xe6: // Sleep Now 1 - case 0x94: // Standby Now 2 - case 0x95: // Idle Immediate (CFA) - case 0x96: // Standby 2 - case 0x97: // Set idle 2 - case 0x99: // Sleep Now 2 + case ATAPI_STANDBYNOW1: // Standby Now 1 + case ATAPI_IDLEIMMEDIATE: // Set Idle Immediate + case ATAPI_STANDBY: // Standby + case ATAPI_SETIDLE1: // Set Idle 1 + case ATAPI_SLEEPNOW1: // Sleep Now 1 + case ATAPI_STANDBYNOW2: // Standby Now 2 + case ATAPI_IDLEIMMEDIATE2: // Idle Immediate (CFA) + case ATAPI_STANDBY2: // Standby 2 + case ATAPI_SETIDLE2: // Set idle 2 + case ATAPI_SLEEPNOW2: // Sleep Now 2 channel->status.val = 0; channel->status.ready = 1; ide_raise_irq(ide, channel); break; - case 0xef: // Set Features + case ATAPI_SETFEATURES: // Set Features // Prior to this the features register has been written to. // This command tells the drive to check if the new value is supported (the value is drive specific) // Common is that bit0=DMA enable @@ -955,14 +969,14 @@ static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, u ide_raise_irq(ide, channel); break; - case 0x91: // Initialize Drive Parameters - case 0x10: // recalibrate? + case ATAPI_SPECIFY: // Initialize Drive Parameters + case ATAPI_RECAL: // recalibrate? channel->status.error = 0; channel->status.ready = 1; channel->status.seek_complete = 1; ide_raise_irq(ide, channel); break; - case 0xc6: { // Set multiple mode (IDE Block mode) + case ATAPI_SETMULT: { // Set multiple mode (IDE Block mode) // This makes the drive transfer multiple sectors before generating an interrupt uint32_t tmp_sect_num = drive->sector_num; // GCC SUCKS @@ -985,7 +999,7 @@ static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, u break; } - case 0x08: // Reset Device + case ATAPI_DEVICE_RESET: // Reset Device drive_reset(drive); channel->error_reg.val = 0x01; channel->status.busy = 0; @@ -995,7 +1009,7 @@ static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, u channel->status.error = 0; break; - case 0xe5: // Check power mode + case ATAPI_CHECKPOWERMODE1: // Check power mode drive->sector_count = 0xff; /* 0x00=standby, 0x80=idle, 0xff=active or idle */ channel->status.busy = 0; channel->status.ready = 1; @@ -1004,10 +1018,10 @@ static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, u channel->status.error = 0; break; - case 0xc4: // read multiple sectors + case ATAPI_MULTREAD: // read multiple sectors drive->hd_state.cur_sector_num = drive->hd_state.mult_sector_num; default: - PrintError("Unimplemented IDE command (%x)\n", channel->cmd_reg); + PrintError(core->vm_info, core, "Unimplemented IDE command (%x)\n", channel->cmd_reg); return -1; } @@ -1020,29 +1034,44 @@ static int write_data_port(struct guest_info * core, ushort_t port, void * src, struct ide_channel * channel = get_selected_channel(ide, port); struct ide_drive * drive = get_selected_drive(channel); - // PrintDebug("IDE: Writing Data Port %x (val=%x, len=%d)\n", - // port, *(uint32_t *)src, length); - + PrintDebug(core->vm_info, core, "IDE: Writing Data Port %x (val=%x, len=%d)\n", + port, *(uint32_t *)src, length); + memcpy(drive->data_buf + drive->transfer_index, src, length); drive->transfer_index += length; // Transfer is complete, dispatch the command if (drive->transfer_index >= drive->transfer_length) { - switch (channel->cmd_reg) { - case 0x30: // Write Sectors - PrintError("Writing Data not yet implemented\n"); - return -1; - - case 0xa0: // ATAPI packet command - if (atapi_handle_packet(core, ide, channel) == -1) { - PrintError("Error handling ATAPI packet\n"); - return -1; - } - break; - default: - PrintError("Unhandld IDE Command %x\n", channel->cmd_reg); - return -1; - } + switch (channel->cmd_reg) { + + case ATAPI_WRITE: // Write Sectors + + channel->status.busy = 1; + channel->status.data_req = 0; + + if (ata_write(ide, channel, drive->data_buf, drive->transfer_length/HD_SECTOR_SIZE) == -1) { + PrintError(core->vm_info, core, "Error writing to disk\n"); + return -1; + } + + PrintDebug(core->vm_info, core, "IDE: Write sectors complete\n"); + + channel->status.error = 0; + channel->status.busy = 0; + + ide_raise_irq(ide, channel); + break; + + case ATAPI_PACKETCMD: // ATAPI packet command + if (atapi_handle_packet(core, ide, channel) == -1) { + PrintError(core->vm_info, core, "Error handling ATAPI packet\n"); + return -1; + } + break; + default: + PrintError(core->vm_info, core, "Unhandld IDE Command %x\n", channel->cmd_reg); + return -1; + } } return length; @@ -1056,7 +1085,7 @@ static int read_hd_data(uint8_t * dst, uint_t length, struct ide_internal * ide, if (drive->transfer_index >= drive->transfer_length) { - PrintError("Buffer overrun... (xfer_len=%d) (cur_idx=%x) (post_idx=%d)\n", + PrintError(VM_NONE, VCORE_NONE, "Buffer overrun... (xfer_len=%d) (cur_idx=%x) (post_idx=%d)\n", drive->transfer_length, drive->transfer_index, drive->transfer_index + length); return -1; @@ -1067,13 +1096,13 @@ static int read_hd_data(uint8_t * dst, uint_t length, struct ide_internal * ide, drive->current_lba++; if (ata_read(ide, channel, drive->data_buf, 1) == -1) { - PrintError("Could not read next disk sector\n"); + PrintError(VM_NONE, VCORE_NONE, "Could not read next disk sector\n"); return -1; } } /* - PrintDebug("Reading HD Data (Val=%x), (len=%d) (offset=%d)\n", + PrintDebug(VM_NONE, VCORE_NONE, "Reading HD Data (Val=%x), (len=%d) (offset=%d)\n", *(uint32_t *)(drive->data_buf + data_offset), length, data_offset); */ @@ -1092,12 +1121,12 @@ static int read_hd_data(uint8_t * dst, uint_t length, struct ide_internal * ide, (drive->transfer_index == drive->transfer_length)) { if (drive->transfer_index < drive->transfer_length) { // An increment is complete, but there is still more data to be transferred... - PrintDebug("Integral Complete, still transferring more sectors\n"); + PrintDebug(VM_NONE, VCORE_NONE, "Integral Complete, still transferring more sectors\n"); channel->status.data_req = 1; drive->irq_flags.c_d = 0; } else { - PrintDebug("Final Sector Transferred\n"); + PrintDebug(VM_NONE, VCORE_NONE, "Final Sector Transferred\n"); // This was the final read of the request channel->status.data_req = 0; @@ -1125,14 +1154,14 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct ide_internal * ide, // int req_offset = drive->transfer_index % drive->req_len; if (drive->cd_state.atapi_cmd != 0x28) { - PrintDebug("IDE: Reading CD Data (len=%d) (req_len=%d)\n", length, drive->req_len); - PrintDebug("IDE: transfer len=%d, transfer idx=%d\n", drive->transfer_length, drive->transfer_index); + PrintDebug(VM_NONE, VCORE_NONE, "IDE: Reading CD Data (len=%d) (req_len=%d)\n", length, drive->req_len); + PrintDebug(VM_NONE, VCORE_NONE, "IDE: transfer len=%d, transfer idx=%d\n", drive->transfer_length, drive->transfer_index); } if (drive->transfer_index >= drive->transfer_length) { - PrintError("Buffer Overrun... (xfer_len=%d) (cur_idx=%d) (post_idx=%d)\n", + PrintError(VM_NONE, VCORE_NONE, "Buffer Overrun... (xfer_len=%d) (cur_idx=%d) (post_idx=%d)\n", drive->transfer_length, drive->transfer_index, drive->transfer_index + length); return -1; @@ -1141,7 +1170,7 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct ide_internal * ide, if ((data_offset == 0) && (drive->transfer_index > 0)) { if (atapi_update_data_buf(ide, channel) == -1) { - PrintError("Could not update CDROM data buffer\n"); + PrintError(VM_NONE, VCORE_NONE, "Could not update CDROM data buffer\n"); return -1; } } @@ -1162,7 +1191,7 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct ide_internal * ide, // Update the request length in the cylinder regs if (atapi_update_req_len(ide, channel, drive->transfer_length - drive->transfer_index) == -1) { - PrintError("Could not update request length after completed increment\n"); + PrintError(VM_NONE, VCORE_NONE, "Could not update request length after completed increment\n"); return -1; } } else { @@ -1213,7 +1242,7 @@ static int ide_read_data_port(struct guest_info * core, ushort_t port, void * ds struct ide_channel * channel = get_selected_channel(ide, port); struct ide_drive * drive = get_selected_drive(channel); - // PrintDebug("IDE: Reading Data Port %x (len=%d)\n", port, length); + // PrintDebug(core->vm_info, core, "IDE: Reading Data Port %x (len=%d)\n", port, length); if ((channel->cmd_reg == 0xec) || (channel->cmd_reg == 0xa1)) { @@ -1222,12 +1251,12 @@ static int ide_read_data_port(struct guest_info * core, ushort_t port, void * ds if (drive->drive_type == BLOCK_CDROM) { if (read_cd_data((uint8_t *)dst, length, ide, channel) == -1) { - PrintError("IDE: Could not read CD Data (atapi cmd=%x)\n", drive->cd_state.atapi_cmd); + PrintError(core->vm_info, core, "IDE: Could not read CD Data (atapi cmd=%x)\n", drive->cd_state.atapi_cmd); return -1; } } else if (drive->drive_type == BLOCK_DISK) { if (read_hd_data((uint8_t *)dst, length, ide, channel) == -1) { - PrintError("IDE: Could not read HD Data\n"); + PrintError(core->vm_info, core, "IDE: Could not read HD Data\n"); return -1; } } else { @@ -1243,11 +1272,11 @@ static int write_port_std(struct guest_info * core, ushort_t port, void * src, u struct ide_drive * drive = get_selected_drive(channel); if (length != 1) { - PrintError("Invalid Write length on IDE port %x\n", port); + PrintError(core->vm_info, core, "Invalid Write length on IDE port %x\n", port); return -1; } - PrintDebug("IDE: Writing Standard Port %x (%s) (val=%x)\n", port, io_port_to_str(port), *(uint8_t *)src); + PrintDebug(core->vm_info, core, "IDE: Writing Standard Port %x (%s) (val=%x)\n", port, io_port_to_str(port), *(uint8_t *)src); switch (port) { // reset and interrupt enable @@ -1305,7 +1334,7 @@ static int write_port_std(struct guest_info * core, ushort_t port, void * src, u // Selecting a non-present device is a no-no if (drive->drive_type == BLOCK_NONE) { - PrintDebug("Attempting to select a non-present drive\n"); + PrintDebug(core->vm_info, core, "Attempting to select a non-present drive\n"); channel->error_reg.abort = 1; channel->status.error = 1; } else { @@ -1322,7 +1351,7 @@ static int write_port_std(struct guest_info * core, ushort_t port, void * src, u break; } default: - PrintError("IDE: Write to unknown Port %x\n", port); + PrintError(core->vm_info, core, "IDE: Write to unknown Port %x\n", port); return -1; } return length; @@ -1335,11 +1364,11 @@ static int read_port_std(struct guest_info * core, ushort_t port, void * dst, ui struct ide_drive * drive = get_selected_drive(channel); if (length != 1) { - PrintError("Invalid Read length on IDE port %x\n", port); + PrintError(core->vm_info, core, "Invalid Read length on IDE port %x\n", port); return -1; } - PrintDebug("IDE: Reading Standard Port %x (%s)\n", port, io_port_to_str(port)); + PrintDebug(core->vm_info, core, "IDE: Reading Standard Port %x (%s)\n", port, io_port_to_str(port)); if ((port == PRI_ADDR_REG_PORT) || (port == SEC_ADDR_REG_PORT)) { @@ -1404,11 +1433,11 @@ static int read_port_std(struct guest_info * core, ushort_t port, void * dst, ui break; default: - PrintError("Invalid Port: %x\n", port); + PrintError(core->vm_info, core, "Invalid Port: %x\n", port); return -1; } - PrintDebug("\tVal=%x\n", *(uint8_t *)dst); + PrintDebug(core->vm_info, core, "\tVal=%x\n", *(uint8_t *)dst); return length; } @@ -1442,6 +1471,9 @@ static void init_channel(struct ide_channel * channel) { int i = 0; channel->error_reg.val = 0x01; + + //** channel->features = 0x0; + channel->drive_head.val = 0x00; channel->status.val = 0x00; channel->cmd_reg = 0x00; @@ -1460,29 +1492,27 @@ static void init_channel(struct ide_channel * channel) { static int pci_config_update(struct pci_device * pci_dev, uint32_t reg_num, void * src, uint_t length, void * private_data) { - PrintDebug("PCI Config Update\n"); + PrintDebug(VM_NONE, VCORE_NONE, "PCI Config Update\n"); /* struct ide_internal * ide = (struct ide_internal *)(private_data); - PrintDebug("\t\tInterupt register (Dev=%s), irq=%d\n", ide->ide_pci->name, ide->ide_pci->config_header.intr_line); + PrintDebug(VM_NONE, VCORE_NONE, info, "\t\tInterupt register (Dev=%s), irq=%d\n", ide->ide_pci->name, ide->ide_pci->config_header.intr_line); */ return 0; } static int init_ide_state(struct ide_internal * ide) { - int i; /* * Check if the PIIX 3 actually represents both IDE channels in a single PCI entry */ - for (i = 0; i < 1; i++) { - init_channel(&(ide->channels[i])); + init_channel(&(ide->channels[0])); + ide->channels[0].irq = PRI_DEFAULT_IRQ ; - // JRL: this is a terrible hack... - ide->channels[i].irq = PRI_DEFAULT_IRQ + i; - } + init_channel(&(ide->channels[1])); + ide->channels[1].irq = SEC_DEFAULT_IRQ ; return 0; @@ -1503,130 +1533,202 @@ static int ide_free(struct ide_internal * ide) { #ifdef V3_CONFIG_CHECKPOINT #include -static int ide_save(struct v3_chkpt_ctx * ctx, void * private_data) { + +static int ide_save_extended(struct v3_chkpt *chkpt, char *id, void * private_data) { struct ide_internal * ide = (struct ide_internal *)private_data; + struct v3_chkpt_ctx *ctx=0; int ch_num = 0; int drive_num = 0; char buf[128]; + ctx=v3_chkpt_open_ctx(chkpt,id); + + if (!ctx) { + PrintError(VM_NONE, VCORE_NONE, "Failed to open context for save\n"); + goto savefailout; + } + + // nothing saved yet + + v3_chkpt_close_ctx(ctx);ctx=0; + + for (ch_num = 0; ch_num < 2; ch_num++) { - struct v3_chkpt_ctx * ch_ctx = NULL; struct ide_channel * ch = &(ide->channels[ch_num]); - snprintf(buf, 128, "channel-%d", ch_num); - ch_ctx = v3_chkpt_open_ctx(ctx->chkpt, ctx, buf); + snprintf(buf, 128, "%s-%d", id, ch_num); - v3_chkpt_save_8(ch_ctx, "ERROR", &(ch->error_reg.val)); - v3_chkpt_save_8(ch_ctx, "FEATURES", &(ch->features.val)); - v3_chkpt_save_8(ch_ctx, "DRIVE_HEAD", &(ch->drive_head.val)); - v3_chkpt_save_8(ch_ctx, "STATUS", &(ch->status.val)); - v3_chkpt_save_8(ch_ctx, "CMD_REG", &(ch->cmd_reg)); - v3_chkpt_save_8(ch_ctx, "CTRL_REG", &(ch->ctrl_reg.val)); - v3_chkpt_save_8(ch_ctx, "DMA_CMD", &(ch->dma_cmd.val)); - v3_chkpt_save_8(ch_ctx, "DMA_STATUS", &(ch->dma_status.val)); - v3_chkpt_save_32(ch_ctx, "PRD_ADDR", &(ch->dma_prd_addr)); - v3_chkpt_save_32(ch_ctx, "DMA_TBL_IDX", &(ch->dma_tbl_index)); + ctx = v3_chkpt_open_ctx(chkpt, buf); + + if (!ctx) { + PrintError(VM_NONE, VCORE_NONE, "Unable to open context to save channel %d\n",ch_num); + goto savefailout; + } + V3_CHKPT_SAVE(ctx, "ERROR", ch->error_reg.val, savefailout); + V3_CHKPT_SAVE(ctx, "FEATURES", ch->features.val, savefailout); + V3_CHKPT_SAVE(ctx, "DRIVE_HEAD", ch->drive_head.val, savefailout); + V3_CHKPT_SAVE(ctx, "STATUS", ch->status.val, savefailout); + V3_CHKPT_SAVE(ctx, "CMD_REG", ch->cmd_reg, savefailout); + V3_CHKPT_SAVE(ctx, "CTRL_REG", ch->ctrl_reg.val, savefailout); + V3_CHKPT_SAVE(ctx, "DMA_CMD", ch->dma_cmd.val, savefailout); + V3_CHKPT_SAVE(ctx, "DMA_STATUS", ch->dma_status.val, savefailout); + V3_CHKPT_SAVE(ctx, "PRD_ADDR", ch->dma_prd_addr, savefailout); + V3_CHKPT_SAVE(ctx, "DMA_TBL_IDX", ch->dma_tbl_index, savefailout); + + v3_chkpt_close_ctx(ctx); ctx=0; for (drive_num = 0; drive_num < 2; drive_num++) { - struct v3_chkpt_ctx * drive_ctx = NULL; struct ide_drive * drive = &(ch->drives[drive_num]); - snprintf(buf, 128, "drive-%d-%d", ch_num, drive_num); - drive_ctx = v3_chkpt_open_ctx(ctx->chkpt, ch_ctx, buf); + snprintf(buf, 128, "%s-%d-%d", id, ch_num, drive_num); + + ctx = v3_chkpt_open_ctx(chkpt, buf); - v3_chkpt_save_8(drive_ctx, "DRIVE_TYPE", &(drive->drive_type)); - v3_chkpt_save_8(drive_ctx, "SECTOR_COUNT", &(drive->sector_count)); - v3_chkpt_save_8(drive_ctx, "SECTOR_NUM", &(drive->sector_num)); - v3_chkpt_save_16(drive_ctx, "CYLINDER", &(drive->cylinder)); + if (!ctx) { + PrintError(VM_NONE, VCORE_NONE, "Unable to open context to save drive %d\n",drive_num); + goto savefailout; + } + + V3_CHKPT_SAVE(ctx, "DRIVE_TYPE", drive->drive_type, savefailout); + V3_CHKPT_SAVE(ctx, "SECTOR_COUNT", drive->sector_count, savefailout); + V3_CHKPT_SAVE(ctx, "SECTOR_NUM", drive->sector_num, savefailout); + V3_CHKPT_SAVE(ctx, "CYLINDER", drive->cylinder,savefailout); - v3_chkpt_save_64(drive_ctx, "CURRENT_LBA", &(drive->current_lba)); - v3_chkpt_save_32(drive_ctx, "TRANSFER_LENGTH", &(drive->transfer_length)); - v3_chkpt_save_32(drive_ctx, "TRANSFER_INDEX", &(drive->transfer_index)); + V3_CHKPT_SAVE(ctx, "CURRENT_LBA", drive->current_lba, savefailout); + V3_CHKPT_SAVE(ctx, "TRANSFER_LENGTH", drive->transfer_length, savefailout); + V3_CHKPT_SAVE(ctx, "TRANSFER_INDEX", drive->transfer_index, savefailout); - v3_chkpt_save(drive_ctx, "DATA_BUF", DATA_BUFFER_SIZE, drive->data_buf); + V3_CHKPT_SAVE(ctx, "DATA_BUF", drive->data_buf, savefailout); /* For now we'll just pack the type specific data at the end... */ /* We should probably add a new context here in the future... */ if (drive->drive_type == BLOCK_CDROM) { - v3_chkpt_save(drive_ctx, "ATAPI_SENSE_DATA", 18, drive->cd_state.sense.buf); - v3_chkpt_save_8(drive_ctx, "ATAPI_CMD", &(drive->cd_state.atapi_cmd)); - v3_chkpt_save(drive_ctx, "ATAPI_ERR_RECOVERY", 12, drive->cd_state.err_recovery.buf); + V3_CHKPT_SAVE(ctx, "ATAPI_SENSE_DATA", drive->cd_state.sense.buf, savefailout); + V3_CHKPT_SAVE(ctx, "ATAPI_CMD", drive->cd_state.atapi_cmd, savefailout); + V3_CHKPT_SAVE(ctx, "ATAPI_ERR_RECOVERY", drive->cd_state.err_recovery.buf, savefailout); } else if (drive->drive_type == BLOCK_DISK) { - v3_chkpt_save_32(drive_ctx, "ACCESSED", &(drive->hd_state.accessed)); - v3_chkpt_save_32(drive_ctx, "MULT_SECT_NUM", &(drive->hd_state.mult_sector_num)); - v3_chkpt_save_32(drive_ctx, "CUR_SECT_NUM", &(drive->hd_state.cur_sector_num)); + V3_CHKPT_SAVE(ctx, "ACCESSED", drive->hd_state.accessed, savefailout); + V3_CHKPT_SAVE(ctx, "MULT_SECT_NUM", drive->hd_state.mult_sector_num, savefailout); + V3_CHKPT_SAVE(ctx, "CUR_SECT_NUM", drive->hd_state.cur_sector_num, savefailout); + } else if (drive->drive_type == BLOCK_NONE) { + // no drive connected, so no data + } else { + PrintError(VM_NONE, VCORE_NONE, "Invalid drive type %d\n",drive->drive_type); + goto savefailout; } + + v3_chkpt_close_ctx(ctx); ctx=0; } } +// goodout: return 0; + + savefailout: + PrintError(VM_NONE, VCORE_NONE, "Failed to save IDE\n"); + if (ctx) {v3_chkpt_close_ctx(ctx); } + return -1; } -static int ide_load(struct v3_chkpt_ctx * ctx, void * private_data) { +static int ide_load_extended(struct v3_chkpt *chkpt, char *id, void * private_data) { struct ide_internal * ide = (struct ide_internal *)private_data; + struct v3_chkpt_ctx *ctx=0; int ch_num = 0; int drive_num = 0; char buf[128]; + ctx=v3_chkpt_open_ctx(chkpt,id); + + if (!ctx) { + PrintError(VM_NONE, VCORE_NONE, "Failed to open context for load\n"); + goto loadfailout; + } + + // nothing saved yet + + v3_chkpt_close_ctx(ctx);ctx=0; + for (ch_num = 0; ch_num < 2; ch_num++) { - struct v3_chkpt_ctx * ch_ctx = NULL; struct ide_channel * ch = &(ide->channels[ch_num]); - snprintf(buf, 128, "channel-%d", ch_num); - ch_ctx = v3_chkpt_open_ctx(ctx->chkpt, ctx, buf); + snprintf(buf, 128, "%s-%d", id, ch_num); + + ctx = v3_chkpt_open_ctx(chkpt, buf); + + if (!ctx) { + PrintError(VM_NONE, VCORE_NONE, "Unable to open context to load channel %d\n",ch_num); + goto loadfailout; + } - v3_chkpt_load_8(ch_ctx, "ERROR", &(ch->error_reg.val)); - v3_chkpt_load_8(ch_ctx, "FEATURES", &(ch->features.val)); - v3_chkpt_load_8(ch_ctx, "DRIVE_HEAD", &(ch->drive_head.val)); - v3_chkpt_load_8(ch_ctx, "STATUS", &(ch->status.val)); - v3_chkpt_load_8(ch_ctx, "CMD_REG", &(ch->cmd_reg)); - v3_chkpt_load_8(ch_ctx, "CTRL_REG", &(ch->ctrl_reg.val)); - v3_chkpt_load_8(ch_ctx, "DMA_CMD", &(ch->dma_cmd.val)); - v3_chkpt_load_8(ch_ctx, "DMA_STATUS", &(ch->dma_status.val)); - v3_chkpt_load_32(ch_ctx, "PRD_ADDR", &(ch->dma_prd_addr)); - v3_chkpt_load_32(ch_ctx, "DMA_TBL_IDX", &(ch->dma_tbl_index)); + V3_CHKPT_LOAD(ctx, "ERROR", ch->error_reg.val, loadfailout); + V3_CHKPT_LOAD(ctx, "FEATURES", ch->features.val, loadfailout); + V3_CHKPT_LOAD(ctx, "DRIVE_HEAD", ch->drive_head.val, loadfailout); + V3_CHKPT_LOAD(ctx, "STATUS", ch->status.val, loadfailout); + V3_CHKPT_LOAD(ctx, "CMD_REG", ch->cmd_reg, loadfailout); + V3_CHKPT_LOAD(ctx, "CTRL_REG", ch->ctrl_reg.val, loadfailout); + V3_CHKPT_LOAD(ctx, "DMA_CMD", ch->dma_cmd.val, loadfailout); + V3_CHKPT_LOAD(ctx, "DMA_STATUS", ch->dma_status.val, loadfailout); + V3_CHKPT_LOAD(ctx, "PRD_ADDR", ch->dma_prd_addr, loadfailout); + V3_CHKPT_LOAD(ctx, "DMA_TBL_IDX", ch->dma_tbl_index, loadfailout); + v3_chkpt_close_ctx(ctx); ctx=0; for (drive_num = 0; drive_num < 2; drive_num++) { - struct v3_chkpt_ctx * drive_ctx = NULL; struct ide_drive * drive = &(ch->drives[drive_num]); - snprintf(buf, 128, "drive-%d-%d", ch_num, drive_num); - drive_ctx = v3_chkpt_open_ctx(ctx->chkpt, ch_ctx, buf); + snprintf(buf, 128, "%s-%d-%d", id, ch_num, drive_num); + + ctx = v3_chkpt_open_ctx(chkpt, buf); - v3_chkpt_load_8(drive_ctx, "DRIVE_TYPE", &(drive->drive_type)); - v3_chkpt_load_8(drive_ctx, "SECTOR_COUNT", &(drive->sector_count)); - v3_chkpt_load_8(drive_ctx, "SECTOR_NUM", &(drive->sector_num)); - v3_chkpt_load_16(drive_ctx, "CYLINDER", &(drive->cylinder)); + if (!ctx) { + PrintError(VM_NONE, VCORE_NONE, "Unable to open context to load drive %d\n",drive_num); + goto loadfailout; + } - v3_chkpt_load_64(drive_ctx, "CURRENT_LBA", &(drive->current_lba)); - v3_chkpt_load_32(drive_ctx, "TRANSFER_LENGTH", &(drive->transfer_length)); - v3_chkpt_load_32(drive_ctx, "TRANSFER_INDEX", &(drive->transfer_index)); + V3_CHKPT_LOAD(ctx, "DRIVE_TYPE", drive->drive_type, loadfailout); + V3_CHKPT_LOAD(ctx, "SECTOR_COUNT", drive->sector_count, loadfailout); + V3_CHKPT_LOAD(ctx, "SECTOR_NUM", drive->sector_num, loadfailout); + V3_CHKPT_LOAD(ctx, "CYLINDER", drive->cylinder,loadfailout); - v3_chkpt_load(drive_ctx, "DATA_BUF", DATA_BUFFER_SIZE, drive->data_buf); + V3_CHKPT_LOAD(ctx, "CURRENT_LBA", drive->current_lba, loadfailout); + V3_CHKPT_LOAD(ctx, "TRANSFER_LENGTH", drive->transfer_length, loadfailout); + V3_CHKPT_LOAD(ctx, "TRANSFER_INDEX", drive->transfer_index, loadfailout); + V3_CHKPT_LOAD(ctx, "DATA_BUF", drive->data_buf, loadfailout); + /* For now we'll just pack the type specific data at the end... */ /* We should probably add a new context here in the future... */ if (drive->drive_type == BLOCK_CDROM) { - v3_chkpt_load(drive_ctx, "ATAPI_SENSE_DATA", 18, drive->cd_state.sense.buf); - v3_chkpt_load_8(drive_ctx, "ATAPI_CMD", &(drive->cd_state.atapi_cmd)); - v3_chkpt_load(drive_ctx, "ATAPI_ERR_RECOVERY", 12, drive->cd_state.err_recovery.buf); + V3_CHKPT_LOAD(ctx, "ATAPI_SENSE_DATA", drive->cd_state.sense.buf, loadfailout); + V3_CHKPT_LOAD(ctx, "ATAPI_CMD", drive->cd_state.atapi_cmd, loadfailout); + V3_CHKPT_LOAD(ctx, "ATAPI_ERR_RECOVERY", drive->cd_state.err_recovery.buf, loadfailout); } else if (drive->drive_type == BLOCK_DISK) { - v3_chkpt_load_32(drive_ctx, "ACCESSED", &(drive->hd_state.accessed)); - v3_chkpt_load_32(drive_ctx, "MULT_SECT_NUM", &(drive->hd_state.mult_sector_num)); - v3_chkpt_load_32(drive_ctx, "CUR_SECT_NUM", &(drive->hd_state.cur_sector_num)); + V3_CHKPT_LOAD(ctx, "ACCESSED", drive->hd_state.accessed, loadfailout); + V3_CHKPT_LOAD(ctx, "MULT_SECT_NUM", drive->hd_state.mult_sector_num, loadfailout); + V3_CHKPT_LOAD(ctx, "CUR_SECT_NUM", drive->hd_state.cur_sector_num, loadfailout); + } else if (drive->drive_type == BLOCK_NONE) { + // no drive connected, so no data + } else { + PrintError(VM_NONE, VCORE_NONE, "Invalid drive type %d\n",drive->drive_type); + goto loadfailout; } } } - +// goodout: return 0; + + loadfailout: + PrintError(VM_NONE, VCORE_NONE, "Failed to load IDE\n"); + if (ctx) {v3_chkpt_close_ctx(ctx); } + return -1; + } @@ -1637,10 +1739,9 @@ static int ide_load(struct v3_chkpt_ctx * ctx, void * private_data) { static struct v3_device_ops dev_ops = { .free = (int (*)(void *))ide_free, #ifdef V3_CONFIG_CHECKPOINT - .save = ide_save, - .load = ide_load + .save_extended = ide_save_extended, + .load_extended = ide_load_extended #endif - }; @@ -1664,7 +1765,7 @@ static int connect_fn(struct v3_vm_info * vm, if ((!type_str) || (!drive_str) || (!bus_str)) { - PrintError("Incomplete IDE Configuration\n"); + PrintError(vm, VCORE_NONE, "Incomplete IDE Configuration\n"); return -1; } @@ -1675,7 +1776,7 @@ static int connect_fn(struct v3_vm_info * vm, drive = &(channel->drives[drive_num]); if (drive->drive_type != BLOCK_NONE) { - PrintError("Device slot (bus=%d, drive=%d) already occupied\n", bus_num, drive_num); + PrintError(vm, VCORE_NONE, "Device slot (bus=%d, drive=%d) already occupied\n", bus_num, drive_num); return -1; } @@ -1700,7 +1801,7 @@ static int connect_fn(struct v3_vm_info * vm, drive->num_heads = 16; drive->num_cylinders = (ops->get_capacity(private_data) / HD_SECTOR_SIZE) / (drive->num_sectors * drive->num_heads); } else { - PrintError("invalid IDE drive type\n"); + PrintError(vm, VCORE_NONE, "invalid IDE drive type\n"); return -1; } @@ -1724,12 +1825,12 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { char * dev_id = v3_cfg_val(cfg, "ID"); int ret = 0; - PrintDebug("IDE: Initializing IDE\n"); + PrintDebug(vm, VCORE_NONE, "IDE: Initializing IDE\n"); ide = (struct ide_internal *)V3_Malloc(sizeof(struct ide_internal)); if (ide == NULL) { - PrintError("Error allocating IDE state\n"); + PrintError(vm, VCORE_NONE, "Error allocating IDE state\n"); return -1; } @@ -1742,7 +1843,7 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct vm_device * southbridge = v3_find_dev(vm, v3_cfg_val(cfg, "controller")); if (!southbridge) { - PrintError("Could not find southbridge\n"); + PrintError(vm, VCORE_NONE, "Could not find southbridge\n"); V3_Free(ide); return -1; } @@ -1750,23 +1851,23 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { ide->southbridge = (struct v3_southbridge *)(southbridge->private_data); } - PrintDebug("IDE: Creating IDE bus x 2\n"); + PrintDebug(vm, VCORE_NONE, "IDE: Creating IDE bus x 2\n"); struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, ide); if (dev == NULL) { - PrintError("Could not attach device %s\n", dev_id); + PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id); V3_Free(ide); return -1; } if (init_ide_state(ide) == -1) { - PrintError("Failed to initialize IDE state\n"); + PrintError(vm, VCORE_NONE, "Failed to initialize IDE state\n"); v3_remove_device(dev); return -1; } - PrintDebug("Connecting to IDE IO ports\n"); + PrintDebug(vm, VCORE_NONE, "Connecting to IDE IO ports\n"); ret |= v3_dev_hook_io(dev, PRI_DATA_PORT, &ide_read_data_port, &write_data_port); @@ -1818,7 +1919,7 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { if (ret != 0) { - PrintError("Error hooking IDE IO port\n"); + PrintError(vm, VCORE_NONE, "Error hooking IDE IO port\n"); v3_remove_device(dev); return -1; } @@ -1831,7 +1932,7 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct pci_device * pci_dev = NULL; int i; - PrintDebug("Connecting IDE to PCI bus\n"); + PrintDebug(vm, VCORE_NONE, "Connecting IDE to PCI bus\n"); for (i = 0; i < 6; i++) { bars[i].type = PCI_BAR_NONE; @@ -1851,7 +1952,7 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { pci_config_update, NULL, NULL, NULL, ide); if (pci_dev == NULL) { - PrintError("Failed to register IDE BUS %d with PCI\n", i); + PrintError(vm, VCORE_NONE, "Failed to register IDE BUS %d with PCI\n", i); v3_remove_device(dev); return -1; } @@ -1879,13 +1980,13 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { } if (v3_dev_add_blk_frontend(vm, dev_id, connect_fn, (void *)ide) == -1) { - PrintError("Could not register %s as frontend\n", dev_id); + PrintError(vm, VCORE_NONE, "Could not register %s as frontend\n", dev_id); v3_remove_device(dev); return -1; } - PrintDebug("IDE Initialized\n"); + PrintDebug(vm, VCORE_NONE, "IDE Initialized\n"); return 0; }