X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fide.c;h=a31aec2a2558854d787633597ea068b99edb7577;hb=ae4e727a7abfdb7df9cb93769a0799494ec75254;hp=30ff1745791716e967a3b73cfda0b4d24fb3f07a;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios-OLD.git

diff --git a/palacios/src/devices/ide.c b/palacios/src/devices/ide.c
index 30ff174..a31aec2 100644
--- a/palacios/src/devices/ide.c
+++ b/palacios/src/devices/ide.c
@@ -365,7 +365,7 @@ static void print_prd_table(struct vm_device * dev, struct ide_channel * channel
 	uint32_t prd_entry_addr = channel->dma_prd_addr + (sizeof(struct ide_dma_prd) * index);
 	int ret;
 
-	ret = read_guest_pa_memory(dev->vm, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry);
+	ret = v3_read_gpa_memory(&(dev->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");
@@ -411,7 +411,7 @@ static int dma_read(struct guest_info * core, struct vm_device * dev, struct ide
 
 	PrintDebug("PRD table address = %x\n", channel->dma_prd_addr);
 
-	ret = read_guest_pa_memory(core, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry);
+	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");
@@ -459,7 +459,7 @@ static int dma_read(struct guest_info * core, struct vm_device * dev, struct ide
 
 	    drive->current_lba++;
 
-	    ret = write_guest_pa_memory(core, prd_entry.base_addr + prd_offset, bytes_to_write, drive->data_buf); 
+	    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);
@@ -545,7 +545,7 @@ static int dma_write(struct guest_info * core, struct vm_device * dev, struct id
 	
 	PrintDebug("PRD Table address = %x\n", channel->dma_prd_addr);
 
-	ret = read_guest_pa_memory(core, prd_entry_addr, sizeof(struct ide_dma_prd), (void *)&prd_entry);
+	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");
@@ -564,7 +564,7 @@ static int dma_write(struct guest_info * core, struct vm_device * dev, struct id
 	    bytes_to_write = (prd_bytes_left > HD_SECTOR_SIZE) ? HD_SECTOR_SIZE : prd_bytes_left;
 
 
-	    ret = read_guest_pa_memory(core, prd_entry.base_addr + prd_offset, bytes_to_write, drive->data_buf);
+	    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);
@@ -1400,7 +1400,11 @@ static void init_channel(struct ide_channel * channel) {
 
 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 vm_device * dev = (struct vm_device *)private_data;
+    struct ide_internal * ide = (struct ide_internal *)(dev->private_data);
+
+    PrintDebug("\t\tInterupt register (Dev=%s), irq=%d\n", ide->ide_pci->name, ide->ide_pci->config_header.intr_line);
+    */
 
     return 0;
 }
@@ -1517,7 +1521,7 @@ static int connect_fn(struct v3_vm_info * vm,
 
 static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct ide_internal * ide  = (struct ide_internal *)V3_Malloc(sizeof(struct ide_internal));  
-    char * name = v3_cfg_val(cfg, "name");
+    char * dev_id = v3_cfg_val(cfg, "ID");
 
     PrintDebug("IDE: Initializing IDE\n");
     memset(ide, 0, sizeof(struct ide_internal));
@@ -1538,10 +1542,10 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     PrintDebug("IDE: Creating IDE bus x 2\n");
 
-    struct vm_device * dev = v3_allocate_device(name, &dev_ops, ide);
+    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, ide);
 
     if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Could not attach device %s\n", name);
+	PrintError("Could not attach device %s\n", dev_id);
 	return -1;
     }
 
@@ -1656,8 +1660,8 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     }
 
-    if (v3_dev_add_blk_frontend(vm, name, connect_fn, (void *)ide) == -1) {
-	PrintError("Could not register %s as frontend\n", name);
+    if (v3_dev_add_blk_frontend(vm, dev_id, connect_fn, (void *)ide) == -1) {
+	PrintError("Could not register %s as frontend\n", dev_id);
 	return -1;
     }
     
@@ -1690,6 +1694,3 @@ int v3_ide_get_geometry(struct vm_device * ide_dev, int channel_num, int drive_n
 
     return 0;
 }
-
-
-