reverted naming changes to fix configuration breakage

diff --git a/Kconfig b/Kconfig
index 447826e..b9af306 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -115,19 +115,19 @@ config VNET_PROFILE
        help
           Enable the Vnet performance profiling in Palacios
 
-config VNET_BRG
-        bool "Enable VNET Bridge"
+config LINUX_VIRTIO_VNET
+        bool "Enable Virtio VNET interface"
         default n
         depends on PCI && EXPERIMENTAL && VNET
         help
-          Enable the VNET Bridge device
+          Enable the Virtio VNET interface
 
-config DEBUG_VNET_BRG
-        bool "VNET Bridge Debugging"
+config DEBUG_LINUX_VIRTIO_VNET
+        bool "VNET Virtio Device Debugging"
         default n
-        depends on VNET_BRG && DEBUG_ON
+        depends on LINUX_VIRTIO_VNET && DEBUG_ON
         help
-          Enable debugging for the VNET Bridge Device
+          Enable debugging for the VNET Virtio Device
 
 endmenu
 

diff --git a/palacios/src/devices/Makefile b/palacios/src/devices/Makefile
index 5d9f398..6cef367 100644 (file)
--- a/palacios/src/devices/Makefile
+++ b/palacios/src/devices/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_LINUX_VIRTIO_BALLOON) += lnx_virtio_balloon.o
 obj-$(CONFIG_LINUX_VIRTIO_BLOCK) += lnx_virtio_blk.o
 obj-$(CONFIG_LINUX_VIRTIO_SYM) += lnx_virtio_sym.o
 obj-$(CONFIG_LINUX_VIRTIO_NET) += lnx_virtio_nic.o
+obj-$(CONFIG_LINUX_VIRTIO_VNET) += lnx_virtio_vnet.o
 obj-$(CONFIG_VNET_NIC) += vnet_nic.o
 obj-$(CONFIG_NVRAM) += nvram.o
 obj-$(CONFIG_OS_DEBUG) += os_debug.o
@@ -35,4 +36,3 @@ obj-$(CONFIG_PASSTHROUGH_PCI) += pci_passthrough.o
 
 obj-$(CONFIG_SYMMOD) += lnx_virtio_symmod.o
 
-obj-$(CONFIG_VNET_BRG) += lnx_virtio_vnet.o

diff --git a/palacios/src/devices/lnx_virtio_vnet.c b/palacios/src/devices/lnx_virtio_vnet.c
index 14322c1..0ce9cd6 100644 (file)
--- a/palacios/src/devices/lnx_virtio_vnet.c
+++ b/palacios/src/devices/lnx_virtio_vnet.c
@@ -26,7 +26,7 @@
 #include <devices/pci.h>
 
 
-#ifndef CONFIG_DEBUG_VNET_BRG
+#ifndef CONFIG_LINUX_VIRTIO_VNET_DEBUG
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -600,7 +600,7 @@ static struct v3_device_ops dev_ops = {
 };
 
 
-static int vnet_brg_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
+static int dev_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct vm_device * pci_bus = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
     struct virtio_vnet_state * vbrg_state = NULL;
     struct pci_device * pci_dev = NULL;
@@ -711,4 +711,4 @@ static int vnet_brg_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 }
 
 
-device_register("LNX_VNET_BRG", vnet_brg_init)
+device_register("LNX_VIRTIO_VNET", dev_init)