Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


checkpoint changes to get "reset to BIOS" working.
[palacios.git] / palacios / src / devices / ide.c
index 1c48164..f5baf95 100644 (file)
  */
 
 #include <palacios/vmm.h>
+#include <palacios/vmm_dev_mgr.h>
 #include <palacios/vm_guest_mem.h>
 #include <devices/ide.h>
 #include <devices/pci.h>
+#include <devices/southbridge.h>
 #include "ide-types.h"
 #include "atapi-types.h"
 
+#ifndef V3_CONFIG_DEBUG_IDE
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
 #define PRI_DEFAULT_IRQ 14
 #define SEC_DEFAULT_IRQ 15
 
 
 #define DATA_BUFFER_SIZE 2048
 
+#define ATAPI_BLOCK_SIZE 2048
+#define HD_SECTOR_SIZE 512
+
+
 static const char * ide_pri_port_strs[] = {"PRI_DATA", "PRI_FEATURES", "PRI_SECT_CNT", "PRI_SECT_NUM", 
                                          "PRI_CYL_LOW", "PRI_CYL_HIGH", "PRI_DRV_SEL", "PRI_CMD",
                                           "PRI_CTRL", "PRI_ADDR_REG"};
@@ -69,6 +80,7 @@ static const char * ide_dma_port_strs[] = {"DMA_CMD", NULL, "DMA_STATUS", NULL,
                                           "DMA_PRD0", "DMA_PRD1", "DMA_PRD2", "DMA_PRD3"};
 
 
+typedef enum {BLOCK_NONE, BLOCK_DISK, BLOCK_CDROM} v3_block_type_t;
 
 static inline const char * io_port_to_str(uint16_t port) {
     if ((port >= PRI_DATA_PORT) && (port <= PRI_CMD_PORT)) {
@@ -89,18 +101,6 @@ static inline const char * dma_port_to_str(uint16_t port) {
 }
 
 
-static const char * ide_dev_type_strs[] = {"NONE", "HARDDISK", "CDROM" };
-
-
-static inline const char * device_type_to_str(v3_ide_dev_type_t type) {
-    if (type > 2) {
-       return NULL;
-    }
-
-    return ide_dev_type_strs[type];
-}
-
-
 
 struct ide_cd_state {
     struct atapi_sense_data sense;
@@ -110,28 +110,24 @@ struct ide_cd_state {
 };
 
 struct ide_hd_state {
-    int accessed;
+    uint32_t accessed;
 
     /* this is the multiple sector transfer size as configured for read/write multiple sectors*/
-    uint_t mult_sector_num;
+    uint32_t mult_sector_num;
 
     /* This is the current op sector size:
      * for multiple sector ops this equals mult_sector_num
      * for standard ops this equals 1
      */
-    uint_t cur_sector_num;
+    uint32_t cur_sector_num;
 };
 
 struct ide_drive {
     // Command Registers
 
-    v3_ide_dev_type_t drive_type;
-
-    union {
-       struct v3_ide_cd_ops * cd_ops;
-       struct v3_ide_hd_ops * hd_ops;
-    };
+    v3_block_type_t drive_type;
 
+    struct v3_dev_blk_ops * ops;
 
     union {
        struct ide_cd_state cd_state;
@@ -141,11 +137,11 @@ struct ide_drive {
     char model[41];
 
     // Where we are in the data transfer
-    uint_t transfer_index;
+    uint32_t transfer_index;
 
     // the length of a transfer
     // calculated for easy access
-    uint_t transfer_length;
+    uint32_t transfer_length;
 
     uint64_t current_lba;
 
@@ -153,6 +149,10 @@ struct ide_drive {
     uint8_t data_buf[DATA_BUFFER_SIZE];
 
 
+    uint32_t num_cylinders;
+    uint32_t num_heads;
+    uint32_t num_sectors;
+
     void * private_data;
     
     union {
@@ -203,23 +203,26 @@ struct ide_channel {
 
     int irq; // this is temporary until we add PCI support
 
-    struct pci_device * pci_dev;
-
     // Control Registers
     struct ide_ctrl_reg ctrl_reg; // [write] 0x3f6,0x376
 
     struct ide_dma_cmd_reg dma_cmd;
     struct ide_dma_status_reg dma_status;
     uint32_t dma_prd_addr;
-    uint_t dma_tbl_index;
+    uint32_t dma_tbl_index;
 };
 
 
 
 struct ide_internal {
     struct ide_channel channels[2];
-    struct vm_device * pci;
-    struct pci_device * busmaster_pci;
+
+    struct v3_southbridge * southbridge;
+    struct vm_device * pci_bus;
+
+    struct pci_device * ide_pci;
+
+    struct v3_vm_info * vm;
 };
 
 
@@ -278,11 +281,11 @@ static inline int is_lba_enabled(struct ide_channel * channel) {
 
 
 /* Drive Commands */
-static void ide_raise_irq(struct vm_device * dev, struct ide_channel * channel) {
+static void ide_raise_irq(struct ide_internal * ide, struct ide_channel * channel) {
     if (channel->ctrl_reg.irq_disable == 0) {
-       PrintDebug("Raising IDE Interrupt %d\n", channel->irq);
-       channel->dma_status.int_gen = 1;
-       v3_raise_irq(dev->vm, channel->irq);
+       //        PrintError("Raising IDE Interrupt %d\n", channel->irq);
+        channel->dma_status.int_gen = 1;
+        v3_raise_irq(ide->vm, channel->irq);
     }
 }
 
@@ -293,7 +296,7 @@ static void drive_reset(struct ide_drive * drive) {
 
     PrintDebug("Resetting drive %s\n", drive->model);
     
-    if (drive->drive_type == IDE_CDROM) {
+    if (drive->drive_type == BLOCK_CDROM) {
        drive->cylinder = 0xeb14;
     } else {
        drive->cylinder = 0x0000;
@@ -334,16 +337,16 @@ static void channel_reset_complete(struct ide_channel * channel) {
 }
 
 
-static void ide_abort_command(struct vm_device * dev, struct ide_channel * channel) {
+static void ide_abort_command(struct ide_internal * ide, struct ide_channel * channel) {
     channel->status.val = 0x41; // Error + ready
     channel->error_reg.val = 0x04; // No idea...
 
-    ide_raise_irq(dev, channel);
+    ide_raise_irq(ide, channel);
 }
 
 
-
-
+static int dma_read(struct guest_info * core, struct ide_internal * ide, struct ide_channel * channel);
+static int dma_write(struct guest_info * core, struct ide_internal * ide, struct ide_channel * channel);
 
 
 /* ATAPI functions */
@@ -353,33 +356,184 @@ static void ide_abort_command(struct vm_device * dev, struct ide_channel * chann
 #include "ata.h"
 
 
+#ifdef V3_CONFIG_DEBUG_IDE
+static void print_prd_table(struct ide_internal * ide, struct ide_channel * channel) {
+    struct ide_dma_prd prd_entry;
+    int index = 0;
+
+    PrintDebug("Dumping PRD table\n");
+
+    while (1) {
+       uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * index);
+       int ret;
+
+       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");
+           return;
+       }
+
+       PrintDebug("\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);
+
+       if (prd_entry.end_of_table) {
+           break;
+       }
+
+       index++;
+    }
+
+    return;
+}
+#endif
 
 /* IO Operations */
-static int dma_read(struct vm_device * dev, struct ide_channel * channel) {
+static int dma_read(struct guest_info * core, struct ide_internal * ide, struct ide_channel * channel) {
     struct ide_drive * drive = get_selected_drive(channel);
-    struct ide_dma_prd prd_entry;
-    uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * channel->dma_tbl_index);
-    int ret;
+    // This is at top level scope to do the EOT test at the end
+    struct ide_dma_prd prd_entry = {};
+    uint_t bytes_left = drive->transfer_length;
 
-    PrintDebug("PRD table address = %x\n", channel->dma_prd_addr);
+    // Read in the data buffer....
+    // Read a sector/block at a time until the prd entry is full.
 
-    ret = read_guest_pa_memory(dev->vm, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry);
+#ifdef V3_CONFIG_DEBUG_IDE
+    print_prd_table(ide, channel);
+#endif
 
-    if (ret != sizeof(struct ide_dma_prd)) {
-       PrintError("Could not read PRD\n");
-       return -1;
-    }
+    PrintDebug("DMA read for %d bytes\n", bytes_left);
 
-    PrintDebug("PRD Addr: %x, PDR Len: %d, EOT: %d\n", prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table);
+    // Loop through the disk data
+    while (bytes_left > 0) {
+       uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * channel->dma_tbl_index);
+       uint_t prd_bytes_left = 0;
+       uint_t prd_offset = 0;
+       int ret;
 
-    ret = write_guest_pa_memory(dev->vm, prd_entry.base_addr, prd_entry.size, drive->data_buf); 
+       PrintDebug("PRD table address = %x\n", channel->dma_prd_addr);
 
-    if (ret != prd_entry.size) {
-       PrintError("Failed to copy data into guest memory... (ret=%d)\n", ret);
-       return -1;
-    }
+       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");
+           return -1;
+       }
+
+       PrintDebug("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....
+
+       if (prd_entry.size == 0) {
+           // a size of 0 means 64k
+           prd_bytes_left = 0x10000;
+       } else {
+           prd_bytes_left = prd_entry.size;
+       }
+
+
+       while (prd_bytes_left > 0) {
+           uint_t bytes_to_write = 0;
+
+           if (drive->drive_type == BLOCK_DISK) {
+               bytes_to_write = (prd_bytes_left > HD_SECTOR_SIZE) ? HD_SECTOR_SIZE : prd_bytes_left;
+
+
+               if (ata_read(ide, channel, drive->data_buf, 1) == -1) {
+                   PrintError("Failed to read next disk sector\n");
+                   return -1;
+               }
+           } else if (drive->drive_type == BLOCK_CDROM) {
+               if (atapi_cmd_is_data_op(drive->cd_state.atapi_cmd)) {
+                   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");
+                       return -1;
+                   }
+               } else {
+                   /*
+                   PrintError("DMA of command packet\n");
+                   PrintError("How does this work (ATAPI CMD=%x)???\n", drive->cd_state.atapi_cmd);
+                   return -1;
+                   */
+                   int cmd_ret = 0;
+
+                   bytes_to_write = (prd_bytes_left > bytes_left) ? bytes_left : prd_bytes_left;
+                   prd_bytes_left = bytes_to_write;
+
+                   cmd_ret = v3_write_gpa_memory(core, prd_entry.base_addr + prd_offset, 
+                                                 bytes_to_write, drive->data_buf); 
+
+                   // check cmd_ret
+
+
+                   bytes_to_write = 0;
+                   prd_bytes_left = 0;
+                   drive->transfer_index += bytes_to_write;
+
+                   channel->status.busy = 0;
+                   channel->status.ready = 1;
+                   channel->status.data_req = 0;
+                   channel->status.error = 0;
+                   channel->status.seek_complete = 1;
+
+                   channel->dma_status.active = 0;
+                   channel->dma_status.err = 0;
+
+                   ide_raise_irq(ide, channel);
+                   
+                   return 0;
+               }
+           }
+
+           PrintDebug("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++;
+
+           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);
+               return -1;
+           }
+
+           PrintDebug("\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;
+           prd_offset += ret;
+           bytes_left -= ret;
+       }
+
+       channel->dma_tbl_index++;
+
+       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");
+               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", 
+                              drive->transfer_index, drive->transfer_length);
+                   return -1;
+               }
+           }
+       }
 
 
+       if ((prd_entry.end_of_table == 1) && (bytes_left > 0)) {
+           PrintError("DMA table not large enough for data transfer...\n");
+           return -1;
+       }
+    }
 
     /*
       drive->irq_flags.io_dir = 1;
@@ -388,67 +542,118 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) {
     */
 
 
+    // Update to the next PRD entry
+
     // set DMA status
 
     if (prd_entry.end_of_table) {
-       channel->dma_status.active = 0;
-       channel->dma_status.err = 0;
-       channel->dma_status.int_gen = 1;
-
        channel->status.busy = 0;
        channel->status.ready = 1;
        channel->status.data_req = 0;
        channel->status.error = 0;
        channel->status.seek_complete = 1;
+
+       channel->dma_status.active = 0;
+       channel->dma_status.err = 0;
     }
 
-    ide_raise_irq(dev, channel);
+    ide_raise_irq(ide, channel);
 
     return 0;
 }
 
 
-static int dma_write(struct vm_device * dev, struct ide_channel * channel) {
-    // unsupported
-    PrintError("DMA writes currently not supported\n");
-    return -1;
-}
+static int dma_write(struct guest_info * core, struct ide_internal * ide, struct ide_channel * channel) {
+    struct ide_drive * drive = get_selected_drive(channel);
+    // This is at top level scope to do the EOT test at the end
+    struct ide_dma_prd prd_entry = {};
+    uint_t bytes_left = drive->transfer_length;
 
 
-/* 
- * This is an ugly ugly ugly way to differentiate between the first and second DMA channels 
- */
+    PrintDebug("DMA write from %d bytes\n", bytes_left);
 
-static int write_dma_port(ushort_t port_offset, void * src, uint_t length, struct vm_device * dev, struct ide_channel * channel);
-static int read_dma_port(ushort_t port_offset, void * dst, uint_t length, struct vm_device * dev, struct ide_channel * channel);
+    // Loop through disk data
+    while (bytes_left > 0) {
+       uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * channel->dma_tbl_index);
+       uint_t prd_bytes_left = 0;
+       uint_t prd_offset = 0;
+       int ret;
+       
+       PrintDebug("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);
 
-static int write_pri_dma_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
-    PrintDebug("IDE: Writing PRI DMA Port %x (%s) (val=%x)\n", port, dma_port_to_str(port & 0x7), *(uint32_t *)src);
-    return write_dma_port(port & 0x7, src, length, dev, &(ide->channels[0]));
-}
+       if (ret != sizeof(struct ide_dma_prd)) {
+           PrintError("Could not read PRD\n");
+           return -1;
+       }
 
-static int write_sec_dma_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
-    PrintDebug("IDE: Writing SEC DMA Port %x (%s) (val=%x)\n", port, dma_port_to_str(port & 0x7), *(uint32_t *)src);
-    return write_dma_port(port & 0x7, src, length, dev, &(ide->channels[1]));
-}
+       PrintDebug("PRD Addr: %x, PRD Len: %d, EOT: %d\n", 
+                  prd_entry.base_addr, prd_entry.size, prd_entry.end_of_table);
 
+       prd_bytes_left = prd_entry.size;
 
-static int read_pri_dma_port(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
-    PrintDebug("IDE: Reading PRI DMA Port %x (%s)\n", port, dma_port_to_str(port & 0x7));
-    return read_dma_port(port & 0x7, dst, length, dev, &(ide->channels[0]));
-}
+       while (prd_bytes_left > 0) {
+           uint_t bytes_to_write = 0;
+
+
+           bytes_to_write = (prd_bytes_left > HD_SECTOR_SIZE) ? HD_SECTOR_SIZE : prd_bytes_left;
+
+
+           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);
+               return -1;
+           }
+
+           PrintDebug("\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");
+               return -1;
+           }
+           
+           drive->current_lba++;
+
+           drive->transfer_index += ret;
+           prd_bytes_left -= ret;
+           prd_offset += ret;
+           bytes_left -= ret;
+       }
+
+       channel->dma_tbl_index++;
 
-static int read_sec_dma_port(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
-    PrintDebug("IDE: Reading SEC DMA Port %x (%s)\n", port, dma_port_to_str(port & 0x7));
-    return read_dma_port(port & 0x7, dst, length, dev, &(ide->channels[1]));
+       if (drive->transfer_index % HD_SECTOR_SIZE) {
+           PrintError("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");
+           return -1;
+       }
+    }
+
+    if (prd_entry.end_of_table) {
+       channel->status.busy = 0;
+       channel->status.ready = 1;
+       channel->status.data_req = 0;
+       channel->status.error = 0;
+       channel->status.seek_complete = 1;
+
+       channel->dma_status.active = 0;
+       channel->dma_status.err = 0;
+    }
+
+    ide_raise_irq(ide, channel);
+
+    return 0;
 }
 
 
+
 #define DMA_CMD_PORT      0x00
 #define DMA_STATUS_PORT   0x02
 #define DMA_PRD_PORT0     0x04
@@ -456,9 +661,16 @@ static int read_sec_dma_port(ushort_t port, void * dst, uint_t length, struct vm
 #define DMA_PRD_PORT2     0x06
 #define DMA_PRD_PORT3     0x07
 
+#define DMA_CHANNEL_FLAG  0x08
 
-static int write_dma_port(ushort_t port_offset, void * src, uint_t length, 
-                         struct vm_device * dev, struct ide_channel * channel) {
+static int write_dma_port(struct guest_info * core, ushort_t port, void * src, uint_t length, void * private_data) {
+    struct ide_internal * ide = (struct ide_internal *)private_data;
+    uint16_t port_offset = port & (DMA_CHANNEL_FLAG - 1);
+    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", 
+              port, dma_port_to_str(port_offset), *(uint32_t *)src, length, channel_flag);
 
     switch (port_offset) {
        case DMA_CMD_PORT:
@@ -471,13 +683,13 @@ static int write_dma_port(ushort_t port_offset, void * src, uint_t length,
 
                if (channel->dma_cmd.read == 1) {
                    // DMA Read
-                   if (dma_read(dev, channel) == -1) {
+                   if (dma_read(core, ide, channel) == -1) {
                        PrintError("Failed DMA Read\n");
                        return -1;
                    }
                } else {
                    // DMA write
-                   if (dma_write(dev, channel) == -1) {
+                   if (dma_write(core, ide, channel) == -1) {
                        PrintError("Failed DMA Write\n");
                        return -1;
                    }
@@ -488,15 +700,21 @@ static int write_dma_port(ushort_t port_offset, void * src, uint_t length,
 
            break;
            
-       case DMA_STATUS_PORT:
+       case DMA_STATUS_PORT: {
+           uint8_t val = *(uint8_t *)src;
+
            if (length != 1) {
                PrintError("Invalid read length for DMA status port\n");
                return -1;
            }
 
-           channel->dma_status.val = *(uint8_t *)src;
+           // weirdness
+           channel->dma_status.val = ((val & 0x60) | 
+                                      (channel->dma_status.val & 0x01) |
+                                      (channel->dma_status.val & ~val & 0x06));
+
            break;
-           
+       }           
        case DMA_PRD_PORT0:
        case DMA_PRD_PORT1:
        case DMA_PRD_PORT2:
@@ -527,8 +745,13 @@ static int write_dma_port(ushort_t port_offset, void * src, uint_t length,
 }
 
 
-static int read_dma_port(ushort_t port_offset, void * dst, uint_t length, 
-                        struct vm_device * dev, struct ide_channel * channel) {
+static int read_dma_port(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * private_data) {
+    struct ide_internal * ide = (struct ide_internal *)private_data;
+    uint16_t port_offset = port & (DMA_CHANNEL_FLAG - 1);
+    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);
 
     switch (port_offset) {
        case DMA_CMD_PORT:
@@ -568,15 +791,15 @@ static int read_dma_port(ushort_t port_offset, void * dst, uint_t length,
            return -1;
     }
 
-    PrintDebug("\tval=%x\n", *(uint32_t *)dst);
+    PrintDebug("\tval=%x (len=%d)\n", *(uint32_t *)dst, length);
 
     return length;
 }
 
 
 
-static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    struct ide_internal * ide = priv_data;
     struct ide_channel * channel = get_selected_channel(ide, port);
     struct ide_drive * drive = get_selected_drive(channel);
 
@@ -592,11 +815,11 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de
     switch (channel->cmd_reg) {
 
        case 0xa1: // ATAPI Identify Device Packet
-           if (drive->drive_type != IDE_CDROM) {
+           if (drive->drive_type != BLOCK_CDROM) {
                drive_reset(drive);
 
                // JRL: Should we abort here?
-               ide_abort_command(dev, channel);
+               ide_abort_command(ide, channel);
            } else {
                
                atapi_identify_device(drive);
@@ -604,28 +827,28 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de
                channel->error_reg.val = 0;
                channel->status.val = 0x58; // ready, data_req, seek_complete
            
-               ide_raise_irq(dev, channel);
+               ide_raise_irq(ide, channel);
            }
            break;
        case 0xec: // Identify Device
-           if (drive->drive_type != IDE_DISK) {
+           if (drive->drive_type != BLOCK_DISK) {
                drive_reset(drive);
 
                // JRL: Should we abort here?
-               ide_abort_command(dev, channel);
+               ide_abort_command(ide, channel);
            } else {
                ata_identify_device(drive);
 
                channel->error_reg.val = 0;
                channel->status.val = 0x58;
 
-               ide_raise_irq(dev, channel);
+               ide_raise_irq(ide, channel);
            }
            break;
 
        case 0xa0: // ATAPI Command Packet
-           if (drive->drive_type != IDE_CDROM) {
-               ide_abort_command(dev, channel);
+           if (drive->drive_type != BLOCK_CDROM) {
+               ide_abort_command(ide, channel);
            }
            
            drive->sector_count = 1;
@@ -645,7 +868,7 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de
        case 0x21: // Read Sectors without Retry
            drive->hd_state.cur_sector_num = 1;
 
-           if (ata_read_sectors(dev, channel) == -1) {
+           if (ata_read_sectors(ide, channel) == -1) {
                PrintError("Error reading sectors\n");
                return -1;
            }
@@ -654,17 +877,73 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de
        case 0x24: // Read Sectors Extended
            drive->hd_state.cur_sector_num = 1;
 
-           if (ata_read_sectors_ext(dev, channel) == -1) {
+           if (ata_read_sectors_ext(ide, channel) == -1) {
                PrintError("Error reading extended sectors\n");
                return -1;
            }
            break;
 
        case 0xc8: // Read DMA with retry
-       case 0xc9: // Read DMA
+       case 0xc9: { // Read DMA
+           uint32_t sect_cnt = (drive->sector_count == 0) ? 256 : drive->sector_count;
+
+           if (ata_get_lba(ide, channel, &(drive->current_lba)) == -1) {
+               ide_abort_command(ide, channel);
+               return 0;
+           }
+           
            drive->hd_state.cur_sector_num = 1;
+           
+           drive->transfer_length = sect_cnt * HD_SECTOR_SIZE;
+           drive->transfer_index = 0;
 
+           if (channel->dma_status.active == 1) {
+               // DMA Read
+               if (dma_read(core, ide, channel) == -1) {
+                   PrintError("Failed DMA Read\n");
+                   return -1;
+               }
+           }
            break;
+       }
+
+       case 0xca: { // Write DMA
+           uint32_t sect_cnt = (drive->sector_count == 0) ? 256 : drive->sector_count;
+
+           if (ata_get_lba(ide, channel, &(drive->current_lba)) == -1) {
+               ide_abort_command(ide, channel);
+               return 0;
+           }
+
+           drive->hd_state.cur_sector_num = 1;
+
+           drive->transfer_length = sect_cnt * HD_SECTOR_SIZE;
+           drive->transfer_index = 0;
+
+           if (channel->dma_status.active == 1) {
+               // DMA Write
+               if (dma_write(core, ide, channel) == -1) {
+                   PrintError("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
+           channel->status.val = 0;
+           channel->status.ready = 1;
+           ide_raise_irq(ide, channel);
+           break;
+
        case 0xef: // 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)
@@ -679,7 +958,7 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de
            channel->status.ready = 1;
            channel->status.seek_complete = 1;
            
-           ide_raise_irq(dev, channel);
+           ide_raise_irq(ide, channel);
            break;
 
        case 0x91:  // Initialize Drive Parameters
@@ -687,14 +966,14 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de
            channel->status.error = 0;
            channel->status.ready = 1;
            channel->status.seek_complete = 1;
-           ide_raise_irq(dev, channel);
+           ide_raise_irq(ide, channel);
            break;
        case 0xc6: { // 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
 
            if (tmp_sect_num > MAX_MULT_SECTORS) {
-               ide_abort_command(dev, channel);
+               ide_abort_command(ide, channel);
                break;
            }
 
@@ -707,10 +986,30 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de
            channel->status.ready = 1;
            channel->status.error = 0;
 
-           ide_raise_irq(dev, channel);
+           ide_raise_irq(ide, channel);
 
            break;
        }
+
+       case 0x08: // Reset Device
+           drive_reset(drive);
+           channel->error_reg.val = 0x01;
+           channel->status.busy = 0;
+           channel->status.ready = 1;
+           channel->status.seek_complete = 1;
+           channel->status.write_fault = 0;
+           channel->status.error = 0;
+           break;
+
+       case 0xe5: // Check power mode
+           drive->sector_count = 0xff; /* 0x00=standby, 0x80=idle, 0xff=active or idle */
+           channel->status.busy = 0;
+           channel->status.ready = 1;
+           channel->status.write_fault = 0;
+           channel->status.data_req = 0;
+           channel->status.error = 0;
+           break;
+
        case 0xc4:  // read multiple sectors
            drive->hd_state.cur_sector_num = drive->hd_state.mult_sector_num;
        default:
@@ -722,8 +1021,8 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de
 }
 
 
-static int write_data_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+static int write_data_port(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    struct ide_internal * ide = priv_data;
     struct ide_channel * channel = get_selected_channel(ide, port);
     struct ide_drive * drive = get_selected_drive(channel);
 
@@ -741,7 +1040,7 @@ static int write_data_port(ushort_t port, void * src, uint_t length, struct vm_d
                return -1;
                
            case 0xa0: // ATAPI packet command
-               if (atapi_handle_packet(dev, channel) == -1) {
+               if (atapi_handle_packet(core, ide, channel) == -1) {
                    PrintError("Error handling ATAPI packet\n");
                    return -1;
                }
@@ -756,9 +1055,9 @@ static int write_data_port(ushort_t port, void * src, uint_t length, struct vm_d
 }
 
 
-static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, struct ide_channel * channel) {
+static int read_hd_data(uint8_t * dst, uint_t length, struct ide_internal * ide, struct ide_channel * channel) {
     struct ide_drive * drive = get_selected_drive(channel);
-    int data_offset = drive->transfer_index % IDE_SECTOR_SIZE;
+    int data_offset = drive->transfer_index % HD_SECTOR_SIZE;
 
 
 
@@ -773,7 +1072,7 @@ static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st
     if ((data_offset == 0) && (drive->transfer_index > 0)) {
        drive->current_lba++;
 
-       if (ata_read(dev, channel, drive->data_buf, 1) == -1) {
+       if (ata_read(ide, channel, drive->data_buf, 1) == -1) {
            PrintError("Could not read next disk sector\n");
            return -1;
        }
@@ -795,7 +1094,7 @@ static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st
      * cur_sector_num is configured depending on the operation we are currently running
      * We also trigger an interrupt if this is the last byte to transfer, regardless of sector count
      */
-    if (((drive->transfer_index % (IDE_SECTOR_SIZE * drive->hd_state.cur_sector_num)) == 0) || 
+    if (((drive->transfer_index % (HD_SECTOR_SIZE * drive->hd_state.cur_sector_num)) == 0) || 
        (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...
@@ -817,7 +1116,7 @@ static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st
        drive->irq_flags.io_dir = 1;
        channel->status.busy = 0;
 
-       ide_raise_irq(dev, channel);
+       ide_raise_irq(ide, channel);
     }
 
 
@@ -826,15 +1125,18 @@ static int read_hd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st
 
 
 
-static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, struct ide_channel * channel) {
+static int read_cd_data(uint8_t * dst, uint_t length, struct ide_internal * ide, struct ide_channel * channel) {
     struct ide_drive * drive = get_selected_drive(channel);
     int data_offset = drive->transfer_index % ATAPI_BLOCK_SIZE;
-    int req_offset = drive->transfer_index % drive->req_len;
+    //  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);
     }
 
+    
+
     if (drive->transfer_index >= drive->transfer_length) {
        PrintError("Buffer Overrun... (xfer_len=%d) (cur_idx=%d) (post_idx=%d)\n", 
                   drive->transfer_length, drive->transfer_index, 
@@ -842,10 +1144,9 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st
        return -1;
     }
 
-
-
+    
     if ((data_offset == 0) && (drive->transfer_index > 0)) {
-       if (atapi_update_data_buf(dev, channel) == -1) {
+       if (atapi_update_data_buf(ide, channel) == -1) {
            PrintError("Could not update CDROM data buffer\n");
            return -1;
        }
@@ -857,7 +1158,7 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st
 
 
     // Should the req_offset be recalculated here?????
-    if ((req_offset == 0) && (drive->transfer_index > 0)) {
+    if (/*(req_offset == 0) &&*/ (drive->transfer_index > 0)) {
        if (drive->transfer_index < drive->transfer_length) {
            // An increment is complete, but there is still more data to be transferred...
            
@@ -866,12 +1167,14 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st
            drive->irq_flags.c_d = 0;
 
            // Update the request length in the cylinder regs
-           if (atapi_update_req_len(dev, channel, drive->transfer_length - drive->transfer_index) == -1) {
+           if (atapi_update_req_len(ide, channel, drive->transfer_length - drive->transfer_index) == -1) {
                PrintError("Could not update request length after completed increment\n");
                return -1;
            }
        } else {
            // This was the final read of the request
+
+           drive->req_len = 0;
            channel->status.data_req = 0;
            channel->status.ready = 1;
            
@@ -882,14 +1185,14 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st
        drive->irq_flags.io_dir = 1;
        channel->status.busy = 0;
 
-       ide_raise_irq(dev, channel);
+       ide_raise_irq(ide, channel);
     }
 
     return length;
 }
 
 
-static int read_drive_id(uint8_t * dst, uint_t length, struct vm_device * dev, struct ide_channel * channel) {
+static int read_drive_id( uint8_t * dst, uint_t length, struct ide_internal * ide, struct ide_channel * channel) {
     struct ide_drive * drive = get_selected_drive(channel);
 
     channel->status.busy = 0;
@@ -911,25 +1214,25 @@ static int read_drive_id(uint8_t * dst, uint_t length, struct vm_device * dev, s
 }
 
 
-static int ide_read_data_port(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+static int ide_read_data_port(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+    struct ide_internal * ide = priv_data;
     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("IDE: Reading Data Port %x (len=%d)\n", port, length);
 
     if ((channel->cmd_reg == 0xec) ||
        (channel->cmd_reg == 0xa1)) {
-       return read_drive_id((uint8_t *)dst, length, dev, channel);
+       return read_drive_id((uint8_t *)dst, length, ide, channel);
     }
 
-    if (drive->drive_type == IDE_CDROM) {
-       if (read_cd_data((uint8_t *)dst, length, dev, channel) == -1) {
-           PrintError("IDE: Could not read CD Data\n");
+    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);
            return -1;
        }
-    } else if (drive->drive_type == IDE_DISK) {
-       if (read_hd_data((uint8_t *)dst, length, dev, channel) == -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");
            return -1;
        }
@@ -940,8 +1243,8 @@ static int ide_read_data_port(ushort_t port, void * dst, uint_t length, struct v
     return length;
 }
 
-static int write_port_std(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+static int write_port_std(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    struct ide_internal * ide = priv_data;
     struct ide_channel * channel = get_selected_channel(ide, port);
     struct ide_drive * drive = get_selected_drive(channel);
            
@@ -1007,10 +1310,19 @@ static int write_port_std(ushort_t port, void * src, uint_t length, struct vm_de
            drive = get_selected_drive(channel);
 
            // Selecting a non-present device is a no-no
-           if (drive->drive_type == IDE_NONE) {
+           if (drive->drive_type == BLOCK_NONE) {
                PrintDebug("Attempting to select a non-present drive\n");
                channel->error_reg.abort = 1;
                channel->status.error = 1;
+           } else {
+               channel->status.busy = 0;
+               channel->status.ready = 1;
+               channel->status.data_req = 0;
+               channel->status.error = 0;
+               channel->status.seek_complete = 1;
+               
+               channel->dma_status.active = 0;
+               channel->dma_status.err = 0;
            }
 
            break;
@@ -1023,8 +1335,8 @@ static int write_port_std(ushort_t port, void * src, uint_t length, struct vm_de
 }
 
 
-static int read_port_std(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+static int read_port_std(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+    struct ide_internal * ide = priv_data;
     struct ide_channel * channel = get_selected_channel(ide, port);
     struct ide_drive * drive = get_selected_drive(channel);
     
@@ -1044,7 +1356,7 @@ static int read_port_std(ushort_t port, void * dst, uint_t length, struct vm_dev
 
 
     // if no drive is present just return 0 + reserved bits
-    if (drive->drive_type == IDE_NONE) {
+    if (drive->drive_type == BLOCK_NONE) {
        if ((port == PRI_DRV_SEL_PORT) ||
            (port == SEC_DRV_SEL_PORT)) {
            *(uint8_t *)dst = 0xa0;
@@ -1115,7 +1427,7 @@ static void init_drive(struct ide_drive * drive) {
     drive->sector_num = 0x01;
     drive->cylinder = 0x0000;
 
-    drive->drive_type = IDE_NONE;
+    drive->drive_type = BLOCK_NONE;
 
     memset(drive->model, 0, sizeof(drive->model));
 
@@ -1123,9 +1435,13 @@ static void init_drive(struct ide_drive * drive) {
     drive->transfer_length = 0;
     memset(drive->data_buf, 0, sizeof(drive->data_buf));
 
+    drive->num_cylinders = 0;
+    drive->num_heads = 0;
+    drive->num_sectors = 0;
+    
 
     drive->private_data = NULL;
-    drive->cd_ops = NULL;
+    drive->ops = NULL;
 }
 
 static void init_channel(struct ide_channel * channel) {
@@ -1150,255 +1466,457 @@ static void init_channel(struct ide_channel * channel) {
 }
 
 
-static int pci_config_update(struct pci_device * pci_dev, uint_t reg_num, int length) {
+static int pci_config_update(uint_t reg_num, void * src, uint_t length, void * private_data) {
     PrintDebug("PCI Config Update\n");
-    PrintDebug("\t\tInterupt register (Dev=%s), irq=%d\n", pci_dev->name, pci_dev->config_header.intr_line);
+    /*
+    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);
+    */
 
     return 0;
 }
 
-static int init_ide_state(struct vm_device * dev) {
-    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
-    struct v3_pci_bar bars[6];
-    struct pci_device * pci_dev = NULL;
-    int i, j;
+static int init_ide_state(struct ide_internal * ide) {
+    int i;
 
-    for (i = 0; i < 2; 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]));
 
        // JRL: this is a terrible hack...
        ide->channels[i].irq = PRI_DEFAULT_IRQ + i;
+    }
 
-       for (j = 0; j < 6; j++) {
-           bars[j].type = PCI_BAR_NONE;
-       }
+
+    return 0;
+}
 
 
-       bars[4].type = PCI_BAR_IO;
-       bars[4].default_base_port = PRI_DEFAULT_DMA_PORT + (i * 0x8);
-       bars[4].num_ports = 8;
-       
-       if (i == 0) {
-           bars[4].io_read = read_pri_dma_port;
-           bars[4].io_write = write_pri_dma_port;
-       } else {
-           bars[4].io_read = read_sec_dma_port;
-           bars[4].io_write = write_sec_dma_port;
-       }
 
-       pci_dev = v3_pci_register_device(ide->pci, PCI_STD_DEVICE, 0, "V3_IDE", -1, bars,
-                                        pci_config_update, NULL, NULL, dev);
 
-       if (pci_dev == NULL) {
-           PrintError("Failed to register IDE BUS %d with PCI\n", i); 
-           return -1;
-       }
+static int ide_free(struct ide_internal * ide) {
 
-       ide->channels[i].pci_dev = pci_dev;
+    // deregister from PCI?
 
-       pci_dev->config_header.vendor_id = 0x1095;
-       pci_dev->config_header.device_id = 0x0646;
-       pci_dev->config_header.revision = 0x8f07;
-       pci_dev->config_header.subclass = 0x01;
-       pci_dev->config_header.class = 0x01;
+    V3_Free(ide);
 
-       pci_dev->config_header.intr_line = PRI_DEFAULT_IRQ + i;
-       pci_dev->config_header.intr_pin = 1;
-    }
+    return 0;
+}
+
+#ifdef V3_CONFIG_CHECKPOINT
 
+#include <palacios/vmm_sprintf.h>
+static int ide_save(struct v3_chkpt_ctx * ctx, void * private_data) {
+    struct ide_internal * ide = (struct ide_internal *)private_data;
+    int ch_num = 0;
+    int drive_num = 0;
+    char buf[128];
+    
 
+    for (ch_num = 0; ch_num < 2; ch_num++) {
+       struct v3_chkpt_ctx * ch_ctx = NULL;
+       struct ide_channel * ch = &(ide->channels[ch_num]);
 
-    /* Register PIIX3 Busmaster PCI device */
-    for (j = 0; j < 6; j++) {
-       bars[j].type = PCI_BAR_NONE;
+       snprintf(buf, 128, "channel-%d", ch_num);
+       ch_ctx = v3_chkpt_open_ctx(ctx->chkpt, ctx, buf);
+
+       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));
+
+
+       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);
+           
+           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));
+
+           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(drive_ctx, "DATA_BUF", DATA_BUFFER_SIZE, drive->data_buf);
+
+
+           /* 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);
+           } 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));
+           }
+       }
     }
 
-    pci_dev = v3_pci_register_device(ide->pci, PCI_STD_DEVICE, 0, "PIIX3 IDE", -1, bars,
-                                    NULL, NULL, NULL, dev);
-    
+    return 0;
+}
+
+
+
+static int ide_load(struct v3_chkpt_ctx * ctx, void * private_data) {
+    struct ide_internal * ide = (struct ide_internal *)private_data;
+    int ch_num = 0;
+    int drive_num = 0;
+    char buf[128];
     
-    ide->busmaster_pci = pci_dev;
 
-    pci_dev->config_header.vendor_id = 0x8086;
-    pci_dev->config_header.device_id = 0x7010;
-    pci_dev->config_header.revision = 0x80;
-    pci_dev->config_header.subclass = 0x01;
-    pci_dev->config_header.class = 0x01;
+    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);
+
+       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));
 
 
+       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);
+           
+           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));
+
+           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(drive_ctx, "DATA_BUF", DATA_BUFFER_SIZE, drive->data_buf);
+
+
+           /* 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);
+           } 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));
+           }
+       }
+    }
+
     return 0;
 }
 
 
 
-static int init_ide(struct vm_device * dev) {
-    //struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+#endif
 
-    PrintDebug("IDE: Initializing IDE\n");
 
-    if (init_ide_state(dev) == -1) {
-       PrintError("Failed to initialize IDE state\n");
+static struct v3_device_ops dev_ops = {
+    .free = (int (*)(void *))ide_free,
+#ifdef V3_CONFIG_CHECKPOINT
+    .save = ide_save,
+    .load = ide_load
+#endif
+
+};
+
+
+
+
+static int connect_fn(struct v3_vm_info * vm, 
+                     void * frontend_data, 
+                     struct v3_dev_blk_ops * ops, 
+                     v3_cfg_tree_t * cfg, 
+                     void * private_data) {
+    struct ide_internal * ide  = (struct ide_internal *)(frontend_data);  
+    struct ide_channel * channel = NULL;
+    struct ide_drive * drive = NULL;
+
+    char * bus_str = v3_cfg_val(cfg, "bus_num");
+    char * drive_str = v3_cfg_val(cfg, "drive_num");
+    char * type_str = v3_cfg_val(cfg, "type");
+    char * model_str = v3_cfg_val(cfg, "model");
+    uint_t bus_num = 0;
+    uint_t drive_num = 0;
+
+
+    if ((!type_str) || (!drive_str) || (!bus_str)) {
+       PrintError("Incomplete IDE Configuration\n");
        return -1;
     }
 
+    bus_num = atoi(bus_str);
+    drive_num = atoi(drive_str);
 
-    v3_dev_hook_io(dev, PRI_DATA_PORT, 
-                  &ide_read_data_port, &write_data_port);
-    v3_dev_hook_io(dev, PRI_FEATURES_PORT, 
-                  &read_port_std, &write_port_std);
-    v3_dev_hook_io(dev, PRI_SECT_CNT_PORT, 
-                  &read_port_std, &write_port_std);
-    v3_dev_hook_io(dev, PRI_SECT_NUM_PORT, 
-                  &read_port_std, &write_port_std);
-    v3_dev_hook_io(dev, PRI_CYL_LOW_PORT, 
-                  &read_port_std, &write_port_std);
-    v3_dev_hook_io(dev, PRI_CYL_HIGH_PORT, 
-                  &read_port_std, &write_port_std);
-    v3_dev_hook_io(dev, PRI_DRV_SEL_PORT, 
-                  &read_port_std, &write_port_std);
-    v3_dev_hook_io(dev, PRI_CMD_PORT, 
-                  &read_port_std, &write_cmd_port);
-
-    v3_dev_hook_io(dev, SEC_DATA_PORT, 
-                  &ide_read_data_port, &write_data_port);
-    v3_dev_hook_io(dev, SEC_FEATURES_PORT, 
-                  &read_port_std, &write_port_std);
-    v3_dev_hook_io(dev, SEC_SECT_CNT_PORT, 
-                  &read_port_std, &write_port_std);
-    v3_dev_hook_io(dev, SEC_SECT_NUM_PORT, 
-                  &read_port_std, &write_port_std);
-    v3_dev_hook_io(dev, SEC_CYL_LOW_PORT, 
-                  &read_port_std, &write_port_std);
-    v3_dev_hook_io(dev, SEC_CYL_HIGH_PORT, 
-                  &read_port_std, &write_port_std);
-    v3_dev_hook_io(dev, SEC_DRV_SEL_PORT, 
-                  &read_port_std, &write_port_std);
-    v3_dev_hook_io(dev, SEC_CMD_PORT, 
-                  &read_port_std, &write_cmd_port);
-  
+    channel = &(ide->channels[bus_num]);
+    drive = &(channel->drives[drive_num]);
 
-    v3_dev_hook_io(dev, PRI_CTRL_PORT, 
-                  &read_port_std, &write_port_std);
+    if (drive->drive_type != BLOCK_NONE) {
+       PrintError("Device slot (bus=%d, drive=%d) already occupied\n", bus_num, drive_num);
+       return -1;
+    }
 
-    v3_dev_hook_io(dev, SEC_CTRL_PORT, 
-                  &read_port_std, &write_port_std);
-  
+    if (model_str != NULL) {
+       strncpy(drive->model, model_str, sizeof(drive->model) - 1);
+    }
 
-    v3_dev_hook_io(dev, SEC_ADDR_REG_PORT, 
-                  &read_port_std, &write_port_std);
+    if (strcasecmp(type_str, "cdrom") == 0) {
+       drive->drive_type = BLOCK_CDROM;
 
-    v3_dev_hook_io(dev, PRI_ADDR_REG_PORT, 
-                  &read_port_std, &write_port_std);
+       while (strlen((char *)(drive->model)) < 40) {
+           strcat((char*)(drive->model), " ");
+       }
 
-    return 0;
-}
+    } else if (strcasecmp(type_str, "hd") == 0) {
+       drive->drive_type = BLOCK_DISK;
 
+       drive->hd_state.accessed = 0;
+       drive->hd_state.mult_sector_num = 1;
+
+       drive->num_sectors = 63;
+       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");
+       return -1;
+    }
+    drive->ops = ops;
+
+    if (ide->ide_pci) {
+       // Hardcode this for now, but its not a good idea....
+       ide->ide_pci->config_space[0x41 + (bus_num * 2)] = 0x80;
+    }
+    drive->private_data = private_data;
 
-static int deinit_ide(struct vm_device * dev) {
-    // unhook io ports....
-    // deregister from PCI?
     return 0;
 }
 
 
-static struct vm_device_ops dev_ops = {
-    .init = init_ide,
-    .deinit = deinit_ide,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
-};
 
 
-struct vm_device *  v3_create_ide(struct vm_device * pci) {
-    struct ide_internal * ide  = (struct ide_internal *)V3_Malloc(sizeof(struct ide_internal));  
-    struct vm_device * device = v3_create_device("IDE", &dev_ops, ide);
+static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
+    struct ide_internal * ide  = NULL;
+    char * dev_id = v3_cfg_val(cfg, "ID");
+    int ret = 0;
 
-    ide->pci = pci;
+    PrintDebug("IDE: Initializing IDE\n");
 
-    PrintDebug("IDE: Creating IDE bus x 2\n");
+    ide = (struct ide_internal *)V3_Malloc(sizeof(struct ide_internal));
 
-    return device;
-}
+    if (ide == NULL) {
+       PrintError("Error allocating IDE state\n");
+       return -1;
+    }
 
+    memset(ide, 0, sizeof(struct ide_internal));
 
+    ide->vm = vm;
+    ide->pci_bus = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
 
+    if (ide->pci_bus != NULL) {
+       struct vm_device * southbridge = v3_find_dev(vm, v3_cfg_val(cfg, "controller"));
 
+       if (!southbridge) {
+           PrintError("Could not find southbridge\n");
+           V3_Free(ide);
+           return -1;
+       }
 
-int v3_ide_register_cdrom(struct vm_device * ide_dev, 
-                         uint_t bus_num, 
-                         uint_t drive_num,
-                         char * dev_name, 
-                         struct v3_ide_cd_ops * ops, 
-                         void * private_data) {
+       ide->southbridge = (struct v3_southbridge *)(southbridge->private_data);
+    }
 
-    struct ide_internal * ide  = (struct ide_internal *)(ide_dev->private_data);  
-    struct ide_channel * channel = NULL;
-    struct ide_drive * drive = NULL;
+    PrintDebug("IDE: Creating IDE bus x 2\n");
 
-    V3_ASSERT((bus_num >= 0) && (bus_num < 2));
-    V3_ASSERT((drive_num >= 0) && (drive_num < 2));
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, ide);
 
-    channel = &(ide->channels[bus_num]);
-    drive = &(channel->drives[drive_num]);
-    
-    if (drive->drive_type != IDE_NONE) {
-       PrintError("Device slot (bus=%d, drive=%d) already occupied\n", bus_num, drive_num);
+    if (dev == NULL) {
+       PrintError("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");
+       v3_remove_device(dev);
        return -1;
     }
 
-    strncpy(drive->model, dev_name, sizeof(drive->model) - 1);
+    PrintDebug("Connecting to IDE IO ports\n");
+
+    ret |= v3_dev_hook_io(dev, PRI_DATA_PORT, 
+                         &ide_read_data_port, &write_data_port);
+    ret |= v3_dev_hook_io(dev, PRI_FEATURES_PORT, 
+                         &read_port_std, &write_port_std);
+    ret |= v3_dev_hook_io(dev, PRI_SECT_CNT_PORT, 
+                         &read_port_std, &write_port_std);
+    ret |= v3_dev_hook_io(dev, PRI_SECT_NUM_PORT, 
+                         &read_port_std, &write_port_std);
+    ret |= v3_dev_hook_io(dev, PRI_CYL_LOW_PORT, 
+                         &read_port_std, &write_port_std);
+    ret |= v3_dev_hook_io(dev, PRI_CYL_HIGH_PORT, 
+                         &read_port_std, &write_port_std);
+    ret |= v3_dev_hook_io(dev, PRI_DRV_SEL_PORT, 
+                         &read_port_std, &write_port_std);
+    ret |= v3_dev_hook_io(dev, PRI_CMD_PORT, 
+                         &read_port_std, &write_cmd_port);
+
+    ret |= v3_dev_hook_io(dev, SEC_DATA_PORT, 
+                         &ide_read_data_port, &write_data_port);
+    ret |= v3_dev_hook_io(dev, SEC_FEATURES_PORT, 
+                         &read_port_std, &write_port_std);
+    ret |= v3_dev_hook_io(dev, SEC_SECT_CNT_PORT, 
+                         &read_port_std, &write_port_std);
+    ret |= v3_dev_hook_io(dev, SEC_SECT_NUM_PORT, 
+                         &read_port_std, &write_port_std);
+    ret |= v3_dev_hook_io(dev, SEC_CYL_LOW_PORT, 
+                         &read_port_std, &write_port_std);
+    ret |= v3_dev_hook_io(dev, SEC_CYL_HIGH_PORT, 
+                         &read_port_std, &write_port_std);
+    ret |= v3_dev_hook_io(dev, SEC_DRV_SEL_PORT, 
+                         &read_port_std, &write_port_std);
+    ret |= v3_dev_hook_io(dev, SEC_CMD_PORT, 
+                         &read_port_std, &write_cmd_port);
+  
 
-    while (strlen((char *)(drive->model)) < 40) {
-       strcat((char*)(drive->model), " ");
+    ret |= v3_dev_hook_io(dev, PRI_CTRL_PORT, 
+                         &read_port_std, &write_port_std);
+
+    ret |= v3_dev_hook_io(dev, SEC_CTRL_PORT, 
+                         &read_port_std, &write_port_std);
+  
+
+    ret |= v3_dev_hook_io(dev, SEC_ADDR_REG_PORT, 
+                         &read_port_std, &write_port_std);
+
+    ret |= v3_dev_hook_io(dev, PRI_ADDR_REG_PORT, 
+                         &read_port_std, &write_port_std);
+
+
+    if (ret != 0) {
+       PrintError("Error hooking IDE IO port\n");
+       v3_remove_device(dev);
+       return -1;
     }
 
 
-    drive->drive_type = IDE_CDROM;
+    if (ide->pci_bus) {
+       struct v3_pci_bar bars[6];
+       struct v3_southbridge * southbridge = (struct v3_southbridge *)(ide->southbridge);
+       struct pci_device * sb_pci = (struct pci_device *)(southbridge->southbridge_pci);
+       struct pci_device * pci_dev = NULL;
+       int i;
 
-    drive->cd_ops = ops;
+       PrintDebug("Connecting IDE to PCI bus\n");
 
-    drive->private_data = private_data;
+       for (i = 0; i < 6; i++) {
+           bars[i].type = PCI_BAR_NONE;
+       }
 
-    return 0;
-}
+       bars[4].type = PCI_BAR_IO;
+       //      bars[4].default_base_port = PRI_DEFAULT_DMA_PORT;
+       bars[4].default_base_port = -1;
+       bars[4].num_ports = 16;
 
+       bars[4].io_read = read_dma_port;
+       bars[4].io_write = write_dma_port;
+       bars[4].private_data = ide;
 
-int v3_ide_register_harddisk(struct vm_device * ide_dev, 
-                            uint_t bus_num, 
-                            uint_t drive_num, 
-                            char * dev_name, 
-                            struct v3_ide_hd_ops * ops, 
-                            void * private_data) {
+       pci_dev = v3_pci_register_device(ide->pci_bus, PCI_STD_DEVICE, 0, sb_pci->dev_num, 1, 
+                                        "PIIX3_IDE", bars,
+                                        pci_config_update, NULL, NULL, ide);
 
-    struct ide_internal * ide  = (struct ide_internal *)(ide_dev->private_data);  
-    struct ide_channel * channel = NULL;
-    struct ide_drive * drive = NULL;
+       if (pci_dev == NULL) {
+           PrintError("Failed to register IDE BUS %d with PCI\n", i); 
+           v3_remove_device(dev);
+           return -1;
+       }
 
-    V3_ASSERT((bus_num >= 0) && (bus_num < 2));
-    V3_ASSERT((drive_num >= 0) && (drive_num < 2));
+       /* This is for CMD646 devices 
+          pci_dev->config_header.vendor_id = 0x1095;
+          pci_dev->config_header.device_id = 0x0646;
+          pci_dev->config_header.revision = 0x8f07;
+       */
 
-    channel = &(ide->channels[bus_num]);
-    drive = &(channel->drives[drive_num]);
-    
-    if (drive->drive_type != IDE_NONE) {
-       PrintError("Device slot (bus=%d, drive=%d) already occupied\n", bus_num, drive_num);
-       return -1;
-    }
+       pci_dev->config_header.vendor_id = 0x8086;
+       pci_dev->config_header.device_id = 0x7010;
+       pci_dev->config_header.revision = 0x00;
 
-    strncpy(drive->model, dev_name, sizeof(drive->model) - 1);
+       pci_dev->config_header.prog_if = 0x80; // Master IDE device
+       pci_dev->config_header.subclass = PCI_STORAGE_SUBCLASS_IDE;
+       pci_dev->config_header.class = PCI_CLASS_STORAGE;
 
-    drive->drive_type = IDE_DISK;
+       pci_dev->config_header.command = 0;
+       pci_dev->config_header.status = 0x0280;
 
-    drive->hd_state.accessed = 0;
-    drive->hd_state.mult_sector_num = 1;
+       ide->ide_pci = pci_dev;
 
-    drive->hd_ops = ops;
 
-    drive->private_data = private_data;
+    }
+
+    if (v3_dev_add_blk_frontend(vm, dev_id, connect_fn, (void *)ide) == -1) {
+       PrintError("Could not register %s as frontend\n", dev_id);
+       v3_remove_device(dev);
+       return -1;
+    }
+    
+
+    PrintDebug("IDE Initialized\n");
 
     return 0;
 }
 
 
+device_register("IDE", ide_init)
+
 
+
+
+int v3_ide_get_geometry(void * ide_data, int channel_num, int drive_num, 
+                       uint32_t * cylinders, uint32_t * heads, uint32_t * sectors) {
+
+    struct ide_internal * ide  = ide_data;  
+    struct ide_channel * channel = &(ide->channels[channel_num]);
+    struct ide_drive * drive = &(channel->drives[drive_num]);
+    
+    if (drive->drive_type == BLOCK_NONE) {
+       return -1;
+    }
+
+    *cylinders = drive->num_cylinders;
+    *heads = drive->num_heads;
+    *sectors = drive->num_sectors;
+
+    return 0;
+}