Merge branch 'devel' 1.0

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

diff --cc palacios/include/devices/generic.h
index 3dd33bc,03c120c..664466e
--- 1/palacios/include/devices/generic.h
--- 2/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/include/devices/ide.h
Simple merge

diff --cc palacios/src/devices/ramdisk.c
index 495ffe8,10de469..5879875
--- 1/palacios/src/devices/ramdisk.c
--- 2/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;
              }
  

diff --cc palacios/src/palacios/vmm_config.c
Simple merge