From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Sat, 25 Oct 2008 18:39:54 +0000 (-0500)
Subject: Merge branch 'devel'
X-Git-Tag: 1.0^0
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=66a1a4c7a9edcd7d8bc207aca093d694a6e6b5b2

Merge branch 'devel'

Conflicts:
	palacios/include/devices/generic.h
	palacios/src/devices/ramdisk.c
---

66a1a4c7a9edcd7d8bc207aca093d694a6e6b5b2
diff --cc palacios/include/devices/generic.h
index 3dd33bc,03c120c..664466e
--- a/palacios/include/devices/generic.h
+++ b/palacios/include/devices/generic.h
@@@ -19,10 -19,14 +19,14 @@@
   * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
   */
  
- #ifndef __GENERIC_H__
- #define __GENERIC_H__
+ 
++
+ #ifndef __DEVICES_GENERIC_H__
+ #define __DEVICES_GENERIC_H__
+ 
+ #ifdef __V3VEE__
  
  
 -
  #include <palacios/vm_dev.h>
  
  //
diff --cc palacios/src/devices/ramdisk.c
index 495ffe8,10de469..5879875
--- a/palacios/src/devices/ramdisk.c
+++ b/palacios/src/devices/ramdisk.c
@@@ -1723,7 -1796,9 +1796,9 @@@ int handle_atapi_packet_command(struct 
  		break;
  	      }
  
 -	      
++
  	      if (rd_init_send_atapi_command(dev, channel, atapi_command, toc_length, alloc_length, false) == -1) {
+ 		PrintError("Failed to init send atapi command in read toc (fmt=%d)\n", format);
  		return -1;
  	      }