X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=6264a2e4b4b33166119a7d2f8d75e2e3e49119e9;hp=d368eb4a9865204026a4cc3bd52a218be5dec132;hb=3cd1d3771e3f8e30b09f6c4995851979aaafc5ff;hpb=1c46db5ec8d086d76f7120a638199564947694d3

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index d368eb4..6264a2e 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -77,7 +77,7 @@ static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, v
 
 
 
-int config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
+int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
 
   struct guest_mem_layout * layout = (struct guest_mem_layout *)config_ptr->vm_kernel;
   extern v3_cpu_arch_t v3_cpu_type;
@@ -105,7 +105,7 @@ int config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
   init_vmm_io_map(info);
   init_interrupt_state(info);
   
-  dev_mgr_init(info);
+  v3_init_dev_mgr(info);
 
   init_emulator(info);
   
@@ -186,14 +186,14 @@ int config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
   {
     struct vm_device * ramdisk = NULL;
     struct vm_device * cdrom = NULL;
-    struct vm_device * nvram = create_nvram();
-    //struct vm_device * timer = create_timer();
-    struct vm_device * pic = create_pic();
-    struct vm_device * keyboard = create_keyboard();
-    struct vm_device * pit = create_pit(); 
-    struct vm_device * bochs_debug = create_bochs_debug();
-
-    //struct vm_device * serial = create_serial();
+    struct vm_device * nvram = v3_create_nvram();
+    //struct vm_device * timer = v3_create_timer();
+    struct vm_device * pic = v3_create_pic();
+    struct vm_device * keyboard = v3_create_keyboard();
+    struct vm_device * pit = v3_create_pit(); 
+    struct vm_device * bochs_debug = v3_create_bochs_debug();
+
+    //struct vm_device * serial = v3_create_serial();
     struct vm_device * generic = NULL;
 
 
@@ -201,14 +201,14 @@ int config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
 
     if (use_ramdisk) {
       PrintDebug("Creating Ramdisk\n");
-      ramdisk = create_ramdisk();
+      ramdisk = v3_create_ramdisk();
       cdrom = v3_create_cdrom(ramdisk, config_ptr->ramdisk, config_ptr->ramdisk_size); 
     }
     
     
     if (use_generic) {
       PrintDebug("Creating Generic Device\n");
-      generic = create_generic();
+      generic = v3_create_generic();
       
       // Make the DMA controller invisible
       v3_generic_add_port_range(generic, 0x00, 0x07, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channels 0,1,2,3 (address, counter)