build fix and configuration cleanup

diff --git a/Kconfig b/Kconfig
index 24d3b7d..b7f64e1 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -213,26 +213,13 @@ config VNET
         help
           Enable the Vnet in Palacios
 
-config DEBUG_VNET
-        depends on EXPERIMENTAL && VNET
-        bool "Enable Vnet Debug in Palacios"
-        default n
-        help
-          Enable the Vnet debug in Palacios
 
-config LINUX_VIRTIO_VNET
-        bool "Enable Virtio VNET interface"
-        default n
-        depends on PCI && EXPERIMENTAL && VNET
-        help
-          Enable the Virtio VNET interface
-
-config DEBUG_LINUX_VIRTIO_VNET
-        bool "Virtio VNET Interface Debugging"
-        default n
-        depends on LINUX_VIRTIO_VNET && DEBUG_ON
-        help
-          Enable debugging for the VNET Virtio interface
+config INSPECTOR
+       bool "Enable VM inspection"
+       depends on EXPERIMENTAL
+       default n
+       help 
+         Enable inspection framework for vm internal state
 
 endmenu
 
@@ -275,6 +262,7 @@ config SHADOW_PAGING_CACHE1
 endmenu
 
 
+
 menu "Time Management"
 config VIRTUALIZE_TIME
        bool "Enable Time virtualization"
@@ -303,6 +291,8 @@ config TIME_VIRTUALIZE_TSC
         
 endmenu
 
+
+
 menu "Symbiotic Functions"
 
 config SYMBIOTIC
@@ -454,8 +444,12 @@ config DEBUG_DEV_MGR
        help 
          This turns on debugging for the device manager
 
-
-
+config DEBUG_VNET
+        depends on EXPERIMENTAL && VNET
+        bool "Enable Vnet Debug in Palacios"
+        default n
+        help
+          Enable the Vnet debug in Palacios
 
 endmenu
 

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index 3472669..b945d2b 100644 (file)
--- a/palacios/src/devices/8254.c
+++ b/palacios/src/devices/8254.c
@@ -660,6 +660,7 @@ static int pit_free(void * private_data) {
     return 0;
 }
 
+#ifdef CONFIG_KEYED_STREAMS
 static int pit_checkpoint(struct vm_device *dev, v3_keyed_stream_t stream)
 {
     struct pit *p = (struct pit *) (dev->private_data);
@@ -711,12 +712,14 @@ static int pit_restore(struct vm_device *dev, v3_keyed_stream_t stream)
 
 
 }
-
+#endif
 
 static struct v3_device_ops dev_ops = {
     .free = (int (*)(void *))pit_free,
+#ifdef CONFIG_KEYED_STREAMS
     .checkpoint = pit_checkpoint,
     .restore = pit_restore,
+#endif
 };
 
 #include <palacios/vm_guest.h>

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 18f64b9..eb15aca 100644 (file)
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -150,6 +150,22 @@ config DEBUG_VIRTIO_NET
         help
           Enable debugging for the Linux Virtio Network Device
 
+
+config LINUX_VIRTIO_VNET
+        bool "Enable Virtio VNET interface"
+        default n
+        depends on PCI && EXPERIMENTAL && VNET
+        help
+          Enable the Virtio VNET interface
+
+config DEBUG_LINUX_VIRTIO_VNET
+        bool "Virtio VNET Interface Debugging"
+        default n
+        depends on LINUX_VIRTIO_VNET && DEBUG_ON
+        help
+          Enable debugging for the VNET Virtio interface
+
+
 config VNET_NIC
         bool "Enable VNET VIrtio NIC Device"
         default n