X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fide.c;h=4ad0fa9da5255d51bcf9e83a042c85511faa5e1c;hb=b6844af8df260e609bee254bbe58128d0e8fc010;hp=246b1d484537edeee2fe3156553f1b1a59b5ed19;hpb=0121a4503305424096e2b5c5bd3b6c3af2d813e5;p=palacios.git diff --git a/palacios/src/devices/ide.c b/palacios/src/devices/ide.c index 246b1d4..4ad0fa9 100644 --- a/palacios/src/devices/ide.c +++ b/palacios/src/devices/ide.c @@ -343,8 +343,8 @@ static void ide_abort_command(struct vm_device * dev, struct ide_channel * chann } -static int dma_read(struct vm_device * dev, struct ide_channel * channel); -static int dma_write(struct vm_device * dev, struct ide_channel * channel); +static int dma_read(struct guest_info * core, struct vm_device * dev, struct ide_channel * channel); +static int dma_write(struct guest_info * core, struct vm_device * dev, struct ide_channel * channel); /* ATAPI functions */ @@ -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"); @@ -387,10 +387,10 @@ static void print_prd_table(struct vm_device * dev, struct ide_channel * channel #endif /* IO Operations */ -static int dma_read(struct vm_device * dev, struct ide_channel * channel) { +static int dma_read(struct guest_info * core, struct vm_device * dev, 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; + struct ide_dma_prd prd_entry = {}; uint_t bytes_left = drive->transfer_length; // Read in the data buffer.... @@ -411,7 +411,7 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) { PrintDebug("PRD table address = %x\n", channel->dma_prd_addr); - ret = read_guest_pa_memory(dev->vm, 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 vm_device * dev, struct ide_channel * channel) { drive->current_lba++; - ret = write_guest_pa_memory(dev->vm, 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); @@ -527,10 +527,10 @@ static int dma_read(struct vm_device * dev, struct ide_channel * channel) { } -static int dma_write(struct vm_device * dev, struct ide_channel * channel) { +static int dma_write(struct guest_info * core, struct vm_device * dev, 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; + struct ide_dma_prd prd_entry = {}; uint_t bytes_left = drive->transfer_length; @@ -545,7 +545,7 @@ static int dma_write(struct vm_device * dev, struct ide_channel * channel) { PrintDebug("PRD Table address = %x\n", channel->dma_prd_addr); - ret = read_guest_pa_memory(dev->vm, 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 vm_device * dev, struct ide_channel * channel) { bytes_to_write = (prd_bytes_left > HD_SECTOR_SIZE) ? HD_SECTOR_SIZE : prd_bytes_left; - ret = read_guest_pa_memory(dev->vm, 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); @@ -627,7 +627,7 @@ static int dma_write(struct vm_device * dev, struct ide_channel * channel) { #define DMA_CHANNEL_FLAG 0x08 -static int write_dma_port(ushort_t port, void * src, uint_t length, void * private_data) { +static int write_dma_port(struct guest_info * core, ushort_t port, void * src, uint_t length, void * private_data) { struct vm_device * dev = (struct vm_device *)private_data; struct ide_internal * ide = (struct ide_internal *)(dev->private_data); uint16_t port_offset = port & (DMA_CHANNEL_FLAG - 1); @@ -648,13 +648,13 @@ static int write_dma_port(ushort_t port, void * src, uint_t length, void * priva if (channel->dma_cmd.read == 1) { // DMA Read - if (dma_read(dev, channel) == -1) { + if (dma_read(core, dev, channel) == -1) { PrintError("Failed DMA Read\n"); return -1; } } else { // DMA write - if (dma_write(dev, channel) == -1) { + if (dma_write(core, dev, channel) == -1) { PrintError("Failed DMA Write\n"); return -1; } @@ -710,7 +710,7 @@ static int write_dma_port(ushort_t port, void * src, uint_t length, void * priva } -static int read_dma_port(ushort_t port, void * dst, uint_t length, void * private_data) { +static int read_dma_port(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * private_data) { struct vm_device * dev = (struct vm_device *)private_data; struct ide_internal * ide = (struct ide_internal *)(dev->private_data); uint16_t port_offset = port & (DMA_CHANNEL_FLAG - 1); @@ -764,7 +764,7 @@ static int read_dma_port(ushort_t port, void * dst, uint_t length, void * privat -static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_device * dev) { +static int write_cmd_port(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) { struct ide_internal * ide = (struct ide_internal *)(dev->private_data); struct ide_channel * channel = get_selected_channel(ide, port); struct ide_drive * drive = get_selected_drive(channel); @@ -865,7 +865,7 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de if (channel->dma_status.active == 1) { // DMA Read - if (dma_read(dev, channel) == -1) { + if (dma_read(core, dev, channel) == -1) { PrintError("Failed DMA Read\n"); return -1; } @@ -888,7 +888,7 @@ static int write_cmd_port(ushort_t port, void * src, uint_t length, struct vm_de if (channel->dma_status.active == 1) { // DMA Write - if (dma_write(dev, channel) == -1) { + if (dma_write(core, dev, channel) == -1) { PrintError("Failed DMA Write\n"); return -1; } @@ -967,7 +967,7 @@ 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) { +static int write_data_port(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) { struct ide_internal * ide = (struct ide_internal *)(dev->private_data); struct ide_channel * channel = get_selected_channel(ide, port); struct ide_drive * drive = get_selected_drive(channel); @@ -986,7 +986,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, dev, channel) == -1) { PrintError("Error handling ATAPI packet\n"); return -1; } @@ -1133,7 +1133,7 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct vm_device * dev, st } -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 vm_device * dev, struct ide_channel * channel) { struct ide_drive * drive = get_selected_drive(channel); channel->status.busy = 0; @@ -1155,7 +1155,7 @@ 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) { +static int ide_read_data_port(struct guest_info * core, ushort_t port, void * dst, uint_t length, struct vm_device * dev) { struct ide_internal * ide = (struct ide_internal *)(dev->private_data); struct ide_channel * channel = get_selected_channel(ide, port); struct ide_drive * drive = get_selected_drive(channel); @@ -1184,7 +1184,7 @@ 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) { +static int write_port_std(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) { struct ide_internal * ide = (struct ide_internal *)(dev->private_data); struct ide_channel * channel = get_selected_channel(ide, port); struct ide_drive * drive = get_selected_drive(channel); @@ -1267,7 +1267,7 @@ 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) { +static int read_port_std(struct guest_info * core, ushort_t port, void * dst, uint_t length, struct vm_device * dev) { struct ide_internal * ide = (struct ide_internal *)(dev->private_data); struct ide_channel * channel = get_selected_channel(ide, port); struct ide_drive * drive = get_selected_drive(channel); @@ -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; } @@ -1444,7 +1448,7 @@ static struct v3_device_ops dev_ops = { -static int connect_fn(struct guest_info * info, +static int connect_fn(struct v3_vm_info * vm, void * frontend_data, struct v3_dev_blk_ops * ops, v3_cfg_tree_t * cfg, @@ -1500,7 +1504,6 @@ static int connect_fn(struct guest_info * info, return -1; } - drive->ops = ops; if (ide->ide_pci) { @@ -1516,9 +1519,9 @@ static int connect_fn(struct guest_info * info, -static int ide_init(struct guest_info * vm, v3_cfg_tree_t * cfg) { +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)); @@ -1539,10 +1542,10 @@ static int ide_init(struct guest_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; } @@ -1657,8 +1660,8 @@ static int ide_init(struct guest_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; } @@ -1691,6 +1694,3 @@ int v3_ide_get_geometry(struct vm_device * ide_dev, int channel_num, int drive_n return 0; } - - -