Merge branch 'devel'

[palacios.git] / palacios / include / devices / generic.h

diff --git a/palacios/include/devices/generic.h b/palacios/include/devices/generic.h
index 3dd33bc..664466e 100644 (file)
--- a/palacios/include/devices/generic.h
+++ b/palacios/include/devices/generic.h
@@ -19,8 +19,12 @@
  * 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>
@@ -53,6 +57,9 @@ int v3_generic_add_mem_range(struct vm_device * dev, void * start, void * end, u
 int v3_generic_add_irq_range(struct vm_device * dev, uint_t start, uint_t end, uint_t type);
 
 // The lists given are null terminated
-struct vm_device * create_generic();  
+struct vm_device * v3_create_generic();  
+
+
+#endif // ! __V3VEE__
 
 #endif