Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

diff --git a/linux_module/palacios-graphics-console.c b/linux_module/palacios-graphics-console.c
index 3cd70c9..21c9457 100644 (file)
--- a/linux_module/palacios-graphics-console.c
+++ b/linux_module/palacios-graphics-console.c
@@ -150,10 +150,11 @@ static void g_release_data_rw(v3_graphics_console_t cons)
 
 static int g_changed(v3_graphics_console_t cons)
 {
+
+#if 0
     struct palacios_graphics_console *gc = 
        (struct palacios_graphics_console *) cons;
 
-#if 0
     int rc =  !(gc->num_updates % 1000);
     
     gc->num_updates++;

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index d49bb9e..81e1739 100644 (file)
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -156,7 +156,7 @@ config DEBUG_VIRTIO_SYM
 config LINUX_VIRTIO_NET
         bool "Enable Virtio Network Device"
         default n
-       depends on PCI
+       depends on PCI && VNET
         help
           Enable the Virtio Net
 

diff --git a/palacios/src/vnet/vnet_core.c b/palacios/src/vnet/vnet_core.c
index 8cf2364..3a1ad38 100644 (file)
--- a/palacios/src/vnet/vnet_core.c
+++ b/palacios/src/vnet/vnet_core.c
@@ -99,7 +99,9 @@ struct vnet_queue {
 static struct {
     struct list_head routes;
     struct list_head devs;
-    
+
+    uint8_t status; 
+   
     uint32_t num_routes;
     uint32_t route_idx;
     uint32_t num_devs;