fixed up includes for devices

diff --git a/palacios/include/devices/8237_dma.h b/palacios/include/devices/8237_dma.h
index cbd9d7e..dab0507 100644 (file)
--- a/palacios/include/devices/8237_dma.h
+++ b/palacios/include/devices/8237_dma.h
@@ -18,8 +18,10 @@
  */
 
 
-#ifndef __8237_DMA_H
-#define __8237_DMA_H
+#ifndef __DEVICES_8237_DMA_H__
+#define __DEVICES_8237_DMA_H__
+
+#ifdef __V3VEE__
 
 
 #include <palacios/vm_dev.h>
@@ -27,6 +29,6 @@
 struct vm_device * create_dma();
 
 
-
+#endif // ! __V3VEE__
 
 #endif

diff --git a/palacios/include/devices/8254.h b/palacios/include/devices/8254.h
index bceb746..cbac12d 100644 (file)
--- a/palacios/include/devices/8254.h
+++ b/palacios/include/devices/8254.h
@@ -17,17 +17,19 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __8254_H
-#define __8254_H
+#ifndef __DEVICES_8254_H__
+#define __DEVICES_8254_H__
 
-#include <palacios/vm_dev.h>
+#ifdef __V3VEE__
 
 
 
-struct vm_device * create_pit();
+#include <palacios/vm_dev.h>
 
+struct vm_device * create_pit();
 
 
 
+#endif // ! __V3VEE__
 
 #endif

diff --git a/palacios/include/devices/8259a.h b/palacios/include/devices/8259a.h
index 9079d41..8447f44 100644 (file)
--- a/palacios/include/devices/8259a.h
+++ b/palacios/include/devices/8259a.h
@@ -17,13 +17,19 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __8259A_H
-#define __8259A_H
+#ifndef __DEVICES_8259A_H__
+#define __DEVICES_8259A_H__
+
+#ifdef __V3VEE__
+
 
-#include <palacios/vm_dev.h>
 
+#include <palacios/vm_dev.h>
 
 struct vm_device * create_pic();
 
 
+
+#endif // ! __V3VEE__
+
 #endif

diff --git a/palacios/include/devices/cdrom.h b/palacios/include/devices/cdrom.h
index 5f5979a..c4f5b46 100644 (file)
--- a/palacios/include/devices/cdrom.h
+++ b/palacios/include/devices/cdrom.h
@@ -18,8 +18,8 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __DEVICES_CDROM_H_
-#define __DEVICES_CDROM_H_
+#ifndef __DEVICES_CDROM_H__
+#define __DEVICES_CDROM_H__
 
 
 #ifdef __V3VEE__

diff --git a/palacios/include/devices/generic.h b/palacios/include/devices/generic.h
index 591d86c..cb0ca64 100644 (file)
--- a/palacios/include/devices/generic.h
+++ b/palacios/include/devices/generic.h
@@ -20,8 +20,11 @@
  */
 
 
-#ifndef __GENERIC_H__
-#define __GENERIC_H__
+#ifndef __DEVICES_GENERIC_H__
+#define __DEVICES_GENERIC_H__
+
+#ifdef __V3VEE__
+
 
 
 #include <palacios/vm_dev.h>
@@ -56,4 +59,7 @@ int v3_generic_add_irq_range(struct vm_device * dev, uint_t start, uint_t end, u
 // The lists given are null terminated
 struct vm_device * create_generic();  
 
+
+#endif // ! __V3VEE__
+
 #endif

diff --git a/palacios/include/devices/ide.h b/palacios/include/devices/ide.h
index c001550..03d8a48 100644 (file)
--- a/palacios/include/devices/ide.h
+++ b/palacios/include/devices/ide.h
@@ -34,11 +34,12 @@
  * 
  */
 
-#ifndef __IDE_H__
-#define __IDE_H__
-
+#ifndef __DEVICES_IDE_H__
+#define __DEVICES_IDE_H__
 
 #ifdef __V3VEE__
+
+
 #include <palacios/vmm_types.h>
 
 

diff --git a/palacios/include/devices/keyboard.h b/palacios/include/devices/keyboard.h
index 2349d00..2a36861 100644 (file)
--- a/palacios/include/devices/keyboard.h
+++ b/palacios/include/devices/keyboard.h
@@ -17,11 +17,19 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __KEYBOARD_H
-#define __KEYBOARD_H
+#ifndef __DEVICES_KEYBOARD_H__
+#define __DEVICES_KEYBOARD_H__
+
+#ifdef __V3VEE__
+
+
 
 #include <palacios/vm_dev.h>
 
 struct vm_device *create_keyboard();
 
+
+
+#endif // ! __V3VEE__
+
 #endif

diff --git a/palacios/include/devices/nvram.h b/palacios/include/devices/nvram.h
index cd6328c..051ebb8 100644 (file)
--- a/palacios/include/devices/nvram.h
+++ b/palacios/include/devices/nvram.h
@@ -17,14 +17,18 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __NVRAM_H
-#define __NVRAM_H
+#ifndef __DEVICES_NVRAM_H__
+#define __DEVICES_NVRAM_H__
+
+#ifdef __V3VEE__
+
 
 #include <palacios/vm_dev.h>
 
 struct vm_device *create_nvram();
 
-// The host os needs to call this
-void deliver_timer_interrupt_to_vmm(uint_t period_us);
+
+
+#endif // ! __V3VEE__
 
 #endif

diff --git a/palacios/include/devices/ramdisk.h b/palacios/include/devices/ramdisk.h
index be30d5a..b8c0d61 100644 (file)
--- a/palacios/include/devices/ramdisk.h
+++ b/palacios/include/devices/ramdisk.h
@@ -17,8 +17,12 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __DEVICES_RAMDISK_H_
-#define __DEVICES_RAMDISK_H_
+#ifndef __DEVICES_RAMDISK_H__
+#define __DEVICES_RAMDISK_H__
+
+#ifdef __V3VEE__
+
+
 
 #include <palacios/vmm_types.h>
 #include <palacios/vm_dev.h>
@@ -28,6 +32,9 @@ struct cdrom_ops;
 
 int v3_ramdisk_register_cdrom(struct vm_device * ide_dev, uint_t busID, uint_t driveID, struct cdrom_ops * cd, void * private_data);
 
-struct vm_device * create_ramdisk(void);
+struct vm_device * create_ramdisk();
+
+
+#endif // ! __V3VEE__
 
 #endif

diff --git a/palacios/include/devices/serial.h b/palacios/include/devices/serial.h
index 36bd07c..6de595a 100644 (file)
--- a/palacios/include/devices/serial.h
+++ b/palacios/include/devices/serial.h
@@ -18,15 +18,19 @@
  */
 
 
-#ifndef __SERIAL_H__
-#define __SERIAL_H__
+#ifndef __DEVICES_SERIAL_H__
+#define __DEVICES_SERIAL_H__
+
+#ifdef __V3VEE__
 
 
 
 #include <palacios/vm_dev.h>
 
+struct vm_device * create_serial();
+
 
 
-struct vm_device * create_serial();
+#endif // ! __V3VEE__
 
 #endif

diff --git a/palacios/include/devices/simple_pic.h b/palacios/include/devices/simple_pic.h
index 58fac51..45e4c83 100644 (file)
--- a/palacios/include/devices/simple_pic.h
+++ b/palacios/include/devices/simple_pic.h
@@ -17,10 +17,17 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __SIMPLE_PIC_H
-#define __SIMPLE_PIC_H
+#ifndef __DEVICES_SIMPLE_PIC_H__
+#define __DEVICES_SIMPLE_PIC_H__
+
+#ifdef __V3VEE__
+
+
 #include <palacios/vm_dev.h>
 
 struct vm_device * create_simple_pic();
 
+
+#endif // ! __V3VEE__
+
 #endif

diff --git a/palacios/include/devices/timer.h b/palacios/include/devices/timer.h
index 9a794e2..56b7b3b 100644 (file)
--- a/palacios/include/devices/timer.h
+++ b/palacios/include/devices/timer.h
@@ -17,16 +17,18 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __TIMER_H
-#define __TIMER_H
+#ifndef __DEVICES_TIMER_H__
+#define __DEVICES_TIMER_H__
 
-#include <palacios/vm_dev.h>
+#ifdef __V3VEE__
 
 
+#include <palacios/vm_dev.h>
 
 struct vm_device * create_timer();
 
 
 
+#endif // ! __V3VEE__
 
 #endif