From: Lei Xia <lxia@northwestern.edu>
Date: Tue, 1 Dec 2009 05:47:46 +0000 (-0600)
Subject: Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=3373500a962dba67f09d120d7db3c2ea1d4beee2;hp=-c

Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into devel
---

3373500a962dba67f09d120d7db3c2ea1d4beee2
diff --combined Kconfig
index d997eea,c6446e5..4f43d7d
--- a/Kconfig
+++ b/Kconfig
@@@ -102,11 -102,11 +102,11 @@@ config EXPERIMENTA
  	  to more easily track changes and provide access to multiple developers
  
  config VNET
 -	depends on EXPERIMENTAL
 -	bool "Enable Vnet in Palacios"
 -	default n
 -	help
 -	  Enable the Vnet in Palacios
 +        depends on EXPERIMENTAL
 +        bool "Enable Vnet in Palacios"
 +        default n
 +        help
 +          Enable the Vnet in Palacios
  
  config BUILT_IN_STDLIB
  	bool "Enable Built in versions of stdlib functions"
@@@ -130,6 -130,13 +130,13 @@@ config BUILT_IN_MEMCP
  	help 
  	  This enables Palacios' internal implementation of memcpy
  
+ config BUILT_IN_MEMMOVE
+ 	bool "memmove()"
+ 	default n
+ 	depends on BUILT_IN_STDLIB
+ 	help 
+ 	  This enables Palacios' internal implementation of memmove
+ 
  config BUILT_IN_MEMCMP
  	bool "memcmp()"
  	default n
@@@ -159,6 -166,14 +166,14 @@@ config BUILT_IN_STRCM
  	help 
  	  This enables Palacios' internal implementation of strcmp
  
+ 
+ config BUILT_IN_STRCASECMP
+ 	bool "strcasecmp()"
+ 	default n
+ 	depends on BUILT_IN_STDLIB
+ 	help
+ 	  This enables Palacios' internal implementation of strcasecmp
+ 
  config BUILT_IN_STRNCMP
  	bool "strncmp()"
  	default n
@@@ -166,6 -181,14 +181,14 @@@
  	help 
  	  This enables Palacios' internal implementation of strncmp
  
+ config BUILT_IN_STRNCASECMP
+ 	bool "strncasecmp()"
+ 	default n
+ 	depends on BUILT_IN_STDLIB
+ 	help
+ 	  This enables Palacios' internal implementation of strncasecmp
+ 
+ 
  config BUILT_IN_STRCAT
  	bool "strcat()"
  	default n
@@@ -201,6 -224,13 +224,13 @@@ config BUILT_IN_STRDU
  	help 
  	  This enables Palacios' internal implementation of strdup
  
+ config BUILT_IN_STRSTR
+ 	bool "strstr()"
+ 	default n
+ 	depends on BUILT_IN_STDLIB
+ 	help
+ 	  This enables Palacios internal implementation of strstr
+ 
  
  config BUILT_IN_ATOI
  	bool "atoi()"
diff --combined palacios/src/devices/Kconfig
index 6d1a568,4a51101..1664821
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@@ -134,18 -134,6 +134,18 @@@ config DEBUG_VIRTIO_SY
  	help 
  	  Enable debugging for the Linux Virtio Symbiotic Device
  
 +config LINUX_VIRTIO_NET
 +        bool "Enable Virtio Network Device"
 +        default n
 +        help
 +          Enable the Virtio Net
 +
 +config DEBUG_VIRTIO_NET
 +        bool "Linux Virtio Net Debugging"
 +        default n
 +        depends on LINUX_VIRTIO_NET && DEBUG_ON
 +        help
 +          Enable debugging for the Linux Virtio Network Device
  
  
  config NE2K
@@@ -162,19 -150,7 +162,7 @@@ config DEBUG_NE2
  	  Enable debugging for the NE2K
  
  
- config NET_CD
- 	bool "Networked CD backend"
- 	default y
- 	depends on SOCKET && (IDE || LINUX_VIRTIO_BLOCK)
- 	help 
- 	  Includes the Network CD backend
  
- config NET_HD
- 	bool "Networked HD backend"
- 	default y
- 	depends on SOCKET && (IDE || LINUX_VIRTIO_BLOCK)
- 	help 
- 	  Includes the Network HD backend
  
  
  config NVRAM
@@@ -252,24 -228,27 +240,27 @@@ config DEBUG_PI
  	  Enable debugging for the PIT	
  
  
- 
- 
- config RAM_CD
- 	bool "RAM based CD backend"
+ config NETDISK
+ 	bool "NETDISK storage backend"
  	default y
- 	depends on IDE || LINUX_VIRTIO_BLOCK
+ 	depends on SOCKET && (IDE || LINUX_VIRTIO_BLOCK)
  	help 
- 	  Includes the RAM based CD backend
+ 	  Includes the Network based disk backend
  
- config RAM_HD
- 	bool "RAM based HD backend"
+ config RAMDISK
+ 	bool "RAMDISK storage backend"
  	default y
  	depends on IDE || LINUX_VIRTIO_BLOCK
  	help 
- 	  Includes the RAM based HD backend
- 
+ 	  Includes the RAM based disk backend
  
  
+ config TMPDISK
+ 	bool "TMPDISK storage backend"
+ 	default y
+ 	depends on IDE || LINUX_VIRTIO_BLOCK
+ 	help 
+ 	  Includes the temporary RAM disk 
  
  config SYM_SWAP
  	bool "Symbiotic Swap disk"
diff --combined palacios/src/devices/Makefile
index d83960a,894a1f2..81ecbf2
--- a/palacios/src/devices/Makefile
+++ b/palacios/src/devices/Makefile
@@@ -10,19 -10,17 +10,18 @@@ obj-$(CONFIG_KEYBOARD) += keyboard.
  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_NVRAM) += nvram.o
  obj-$(CONFIG_OS_DEBUG) += os_debug.o
  obj-$(CONFIG_PCI) += pci.o
  obj-$(CONFIG_PIIX3) += piix3.o
- obj-$(CONFIG_RAM_CD) += ram_cd.o
- obj-$(CONFIG_RAM_HD) += ram_hd.o
- obj-$(CONFIG_SYM_SWAP) += sym_swap.o 
+ obj-$(CONFIG_SYM_SWAP) += sym_swap.o
  
  obj-$(CONFIG_NE2K) += ne2k.o
  
- obj-$(CONFIG_NET_CD) += net_cd.o 
- obj-$(CONFIG_NET_HD) += net_hd.o 
+ obj-$(CONFIG_TMPDISK) += tmpdisk.o
+ obj-$(CONFIG_RAMDISK) += ramdisk.o 
+ obj-$(CONFIG_NETDISK) += netdisk.o 
  
  obj-$(CONFIG_CGA) += cga.o
  obj-$(CONFIG_TELNET_CONSOLE) += telnet_cons.o