X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fide.c;h=3ef7d4da25964a3881a2765d531ec5d1f79b6c98;hb=beeb317f575b05c54100097cf9d48fe293c7fdbc;hp=425441a7b0817b25dd13dc2da7cfac8b830b8047;hpb=0139d9a5b6beca02fa6c5a44947e1326e2edee24;p=palacios.git diff --git a/palacios/src/devices/ide.c b/palacios/src/devices/ide.c index 425441a..3ef7d4d 100644 --- a/palacios/src/devices/ide.c +++ b/palacios/src/devices/ide.c @@ -26,7 +26,7 @@ #include "ide-types.h" #include "atapi-types.h" -#ifndef CONFIG_DEBUG_IDE +#ifndef V3_CONFIG_DEBUG_IDE #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -356,7 +356,7 @@ static int dma_write(struct guest_info * core, struct ide_internal * ide, struct #include "ata.h" -#ifdef CONFIG_DEBUG_IDE +#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; @@ -400,7 +400,7 @@ static int dma_read(struct guest_info * core, struct ide_internal * ide, struct // Read in the data buffer.... // Read a sector/block at a time until the prd entry is full. -#ifdef CONFIG_DEBUG_IDE +#ifdef V3_CONFIG_DEBUG_IDE print_prd_table(ide, channel); #endif @@ -1173,6 +1173,8 @@ static int read_cd_data(uint8_t * dst, uint_t length, struct ide_internal * ide, } } else { // This was the final read of the request + + drive->req_len = 0; channel->status.data_req = 0; channel->status.ready = 1;