Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


reformatting of the source files
[palacios.git] / palacios / src / palacios / vmm_config.c
index 32e3862..f5ca663 100644 (file)
@@ -59,74 +59,74 @@ static struct vm_device *  configure_generic(struct guest_info * info, struct v3
 
 static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) {
 
-  return length;
-  //  memcpy((void*)guest_addr, src, length);
-  PrintDebug("Write of %d bytes to %p\n", length, (void *)guest_addr);
-  PrintDebug("Write Value = %p\n", (void *)*(addr_t *)src);
-
-  return length;
+    return length;
+    //  memcpy((void*)guest_addr, src, length);
+    PrintDebug("Write of %d bytes to %p\n", length, (void *)guest_addr);
+    PrintDebug("Write Value = %p\n", (void *)*(addr_t *)src);
+    
+    return length;
 }
 
 
 
 int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
-  extern v3_cpu_arch_t v3_cpu_type;
-
-  // Initialize the subsystem data strutures
-  v3_init_time(info);
-  v3_init_io_map(info);
-  v3_init_msr_map(info);
-  v3_init_interrupt_state(info);
-  v3_init_dev_mgr(info);
-  v3_init_host_events(info);
-
-  v3_init_decoder(info);
-  
-  v3_init_shadow_map(info);
-  
-  v3_init_hypercall_map(info);
-
-  
-  if (v3_cpu_type == V3_SVM_REV3_CPU) {
-    info->shdw_pg_mode = NESTED_PAGING;
-  } else {
-    v3_init_shadow_page_state(info);
-    info->shdw_pg_mode = SHADOW_PAGING;
-  }
+    extern v3_cpu_arch_t v3_cpu_type;
+
+    // Initialize the subsystem data strutures
+    v3_init_time(info);
+    v3_init_io_map(info);
+    v3_init_msr_map(info);
+    v3_init_interrupt_state(info);
+    v3_init_dev_mgr(info);
+    v3_init_host_events(info);
+    
+    v3_init_decoder(info);
+    
+    v3_init_shadow_map(info);
+    
+    v3_init_hypercall_map(info);
+    
   
-  // Initial CPU operating mode
-  info->cpu_mode = REAL;
-  info->mem_mode = PHYSICAL_MEM;
-
-  // Amount of ram the Guest will have, rounded to a 4K page boundary
-  info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff;
-
-  // Configure the memory map for the guest
-  if (setup_memory_map(info, config_ptr) == -1) {
-    PrintError("Setting up guest memory map failed...\n");
-    return -1;
-  }
-
-  // Configure the devices for the guest
-  setup_devices(info, config_ptr);
-
+    if (v3_cpu_type == V3_SVM_REV3_CPU) {
+       info->shdw_pg_mode = NESTED_PAGING;
+    } else {
+       v3_init_shadow_page_state(info);
+       info->shdw_pg_mode = SHADOW_PAGING;
+    }
+    
+    // Initial CPU operating mode
+    info->cpu_mode = REAL;
+    info->mem_mode = PHYSICAL_MEM;
+    
+    // Amount of ram the Guest will have, rounded to a 4K page boundary
+    info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff;
+    
+    // Configure the memory map for the guest
+    if (setup_memory_map(info, config_ptr) == -1) {
+       PrintError("Setting up guest memory map failed...\n");
+       return -1;
+    }
+    
+    // Configure the devices for the guest
+    setup_devices(info, config_ptr);
+    
 
-  if (config_ptr->enable_profiling) {
-    info->enable_profiler = 1;
-    v3_init_profiler(info);
-  } else {
-    info->enable_profiler = 0;
-  }
 
-  //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
+    if (config_ptr->enable_profiling) {
+       info->enable_profiler = 1;
+       v3_init_profiler(info);
+    } else {
+       info->enable_profiler = 0;
+    }
 
-  // Setup initial cpu register state
-  info->rip = 0xfff0;
-  info->vm_regs.rsp = 0x0;
+    //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
+    
+    // Setup initial cpu register state
+    info->rip = 0xfff0;
+    info->vm_regs.rsp = 0x0;
   
-
-  return 0;
+    
+    return 0;
 }
 
 
@@ -135,110 +135,110 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr)
  * We need to make sure the memory map extends to cover it
  */
 static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr) {
-  addr_t mem_pages = info->mem_size >> 12;
-
-  PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024)));
-
-  // Fill up to the 640K hole
-  if (mem_pages >= 160) {
-    if (v3_add_shadow_mem(info, 0x0, 0xa0000, (addr_t)V3_AllocPages(160)) == -1) {
-      PrintError("Could not map full conventional memory\n");
-      return -1;
+    addr_t mem_pages = info->mem_size >> 12;
+    
+    PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024)));
+    
+    // Fill up to the 640K hole
+    if (mem_pages >= 160) {
+       if (v3_add_shadow_mem(info, 0x0, 0xa0000, (addr_t)V3_AllocPages(160)) == -1) {
+           PrintError("Could not map full conventional memory\n");
+           return -1;
+       }
+    } else {
+       // Less than 640k of memory
+       if (v3_add_shadow_mem(info, 0x0, (mem_pages * PAGE_SIZE), (addr_t)V3_AllocPages(mem_pages)) == -1) {
+           PrintError("Could not map subset of conventional memory\n");
+           return -1;
+       };
     }
-  } else {
-    // Less than 640k of memory
-    if (v3_add_shadow_mem(info, 0x0, (mem_pages * PAGE_SIZE), (addr_t)V3_AllocPages(mem_pages)) == -1) {
-      PrintError("Could not map subset of conventional memory\n");
-      return -1;
-    };
-  }
 
 
 #define VGABIOS_START 0x000c0000
 #define ROMBIOS_START 0x000f0000
-
-  // VGA frame buffer
-  if (1) {
-    if (v3_add_shadow_mem(info, 0xa0000, 0xc0000, 0xa0000) == -1) {
-      PrintError("Could not map VGA framebuffer\n");
-      return -1;
-    }
-  } else {
-    v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000,  passthrough_mem_write, NULL);
-  }  
-
-
-  /* layout vgabios */
-  {
-    uint_t num_pages = (config_ptr->vgabios_size + PAGE_SIZE - 1) / PAGE_SIZE;
-    void * guest_mem =  V3_AllocPages(num_pages);
-    addr_t vgabios_end = VGABIOS_START + (num_pages * PAGE_SIZE);
-
-    PrintDebug("Layout Region %d bytes\n", config_ptr->vgabios_size);
-    memcpy(V3_VAddr(guest_mem), config_ptr->vgabios, config_ptr->vgabios_size);
-
-    if (v3_add_shadow_mem(info, VGABIOS_START, vgabios_end, (addr_t)guest_mem) == -1) {
-      PrintError("Could not map VGABIOS\n");
-      return -1;
-    }
-
-    PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", 
-              (void *)VGABIOS_START, 
-              (void *)vgabios_end, 
-              (void *)guest_mem);
-
-
-    // Fill in the space between the VGABIOS and the ROMBIOS
-    // We'll just back this to shadow memory for now....
-    if (v3_add_shadow_mem(info, vgabios_end, ROMBIOS_START, 
-                         (addr_t)V3_AllocPages((ROMBIOS_START - vgabios_end) / PAGE_SIZE)) == -1) {
-      PrintError("Could not map VGABIOS->ROMBIOS gap\n");
-      return -1;
-    }
-  }
-
-  /* layout rombios */
-  {
-    uint_t num_pages = (config_ptr->rombios_size + PAGE_SIZE - 1) / PAGE_SIZE;
-    void * guest_mem =  V3_AllocPages(num_pages);
-    addr_t rombios_end = ROMBIOS_START + (num_pages * PAGE_SIZE);
-
-    PrintDebug("Layout Region %d bytes\n", config_ptr->rombios_size);
-    memcpy(V3_VAddr(guest_mem), config_ptr->rombios, config_ptr->rombios_size);
-
-    if (v3_add_shadow_mem(info, ROMBIOS_START, rombios_end, (addr_t)guest_mem) == -1) {
-      PrintError("Could not map ROMBIOS\n");
-      return -1;
+    
+    // VGA frame buffer
+    if (1) {
+       if (v3_add_shadow_mem(info, 0xa0000, 0xc0000, 0xa0000) == -1) {
+           PrintError("Could not map VGA framebuffer\n");
+           return -1;
+       }
+    } else {
+       v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000,  passthrough_mem_write, NULL);
+    }  
+    
+    
+    /* layout vgabios */
+    {
+       uint_t num_pages = (config_ptr->vgabios_size + PAGE_SIZE - 1) / PAGE_SIZE;
+       void * guest_mem =  V3_AllocPages(num_pages);
+       addr_t vgabios_end = VGABIOS_START + (num_pages * PAGE_SIZE);
+       
+       PrintDebug("Layout Region %d bytes\n", config_ptr->vgabios_size);
+       memcpy(V3_VAddr(guest_mem), config_ptr->vgabios, config_ptr->vgabios_size);
+       
+       if (v3_add_shadow_mem(info, VGABIOS_START, vgabios_end, (addr_t)guest_mem) == -1) {
+           PrintError("Could not map VGABIOS\n");
+           return -1;
+       }
+       
+       PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", 
+                  (void *)VGABIOS_START, 
+                  (void *)vgabios_end, 
+                  (void *)guest_mem);
+       
+
+       // Fill in the space between the VGABIOS and the ROMBIOS
+       // We'll just back this to shadow memory for now....
+       if (v3_add_shadow_mem(info, vgabios_end, ROMBIOS_START, 
+                             (addr_t)V3_AllocPages((ROMBIOS_START - vgabios_end) / PAGE_SIZE)) == -1) {
+           PrintError("Could not map VGABIOS->ROMBIOS gap\n");
+           return -1;
+       }
     }
     
-    PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", 
-              (void *)ROMBIOS_START, 
-              (void *)rombios_end, 
-              (void *)guest_mem);
-
-    if (rombios_end != 0x100000) {
-      PrintError("ROMBIOS must reach the 1MB barrier....\n");
-      return -1;
+    /* layout rombios */
+    {
+       uint_t num_pages = (config_ptr->rombios_size + PAGE_SIZE - 1) / PAGE_SIZE;
+       void * guest_mem =  V3_AllocPages(num_pages);
+       addr_t rombios_end = ROMBIOS_START + (num_pages * PAGE_SIZE);
+       
+       PrintDebug("Layout Region %d bytes\n", config_ptr->rombios_size);
+       memcpy(V3_VAddr(guest_mem), config_ptr->rombios, config_ptr->rombios_size);
+       
+       if (v3_add_shadow_mem(info, ROMBIOS_START, rombios_end, (addr_t)guest_mem) == -1) {
+           PrintError("Could not map ROMBIOS\n");
+           return -1;
+       }
+       
+       PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", 
+                  (void *)ROMBIOS_START, 
+                  (void *)rombios_end, 
+                  (void *)guest_mem);
+       
+       if (rombios_end != 0x100000) {
+           PrintError("ROMBIOS must reach the 1MB barrier....\n");
+           return -1;
+       }
     }
-  }
 
 
 
-  // Fill in the extended memory map....
-  {
-    int num_ext_pages = mem_pages - (0x100000 / PAGE_SIZE);
-
-    if (num_ext_pages > 0) {
-      if (v3_add_shadow_mem(info, 0x100000, info->mem_size, (addr_t)V3_AllocPages(num_ext_pages)) == -1) {
-       PrintError("Could not allocate extended shadow memory\n");
-       return -1;
-      }
+    // Fill in the extended memory map....
+    {
+       int num_ext_pages = mem_pages - (0x100000 / PAGE_SIZE);
+       
+       if (num_ext_pages > 0) {
+           if (v3_add_shadow_mem(info, 0x100000, info->mem_size, (addr_t)V3_AllocPages(num_ext_pages)) == -1) {
+               PrintError("Could not allocate extended shadow memory\n");
+               return -1;
+           }
+       }
     }
-  }
-  
-  print_shadow_map(info);
+    
+    print_shadow_map(info);
 
-  return 0;
+    return 0;
 }
 
 
@@ -264,14 +264,14 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
 
 
     if (use_ramdisk) {
-      PrintDebug("Creating Ramdisk\n");
-      ramdisk = v3_create_ramdisk();
-      cdrom = v3_create_cdrom(ramdisk, config_ptr->ramdisk, config_ptr->ramdisk_size); 
+       PrintDebug("Creating Ramdisk\n");
+       ramdisk = v3_create_ramdisk();
+       cdrom = v3_create_cdrom(ramdisk, config_ptr->ramdisk, config_ptr->ramdisk_size); 
     }
     
     
     if (use_generic) {
-      generic = configure_generic(info, config_ptr);
+       generic = configure_generic(info, config_ptr);
     }
 
 
@@ -288,13 +288,13 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
     v3_attach_device(info, ioapic);
 
     if (use_ramdisk) {
-      v3_attach_device(info, ramdisk);
-      v3_attach_device(info, cdrom);
+       v3_attach_device(info, ramdisk);
+       v3_attach_device(info, cdrom);
     }
 
     if (use_generic) {
-      // Important that this be attached last!
-      v3_attach_device(info, generic);
+       // Important that this be attached last!
+       v3_attach_device(info, generic);
     }
     
     PrintDebugDevMgr(info);
@@ -311,130 +311,129 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
     
     
     if (!use_ramdisk) {
-      PrintDebug("Hooking IDE IRQs\n");
-      
-      //primary ide
-      v3_hook_passthrough_irq(info, 14);
-      
-      // secondary ide
-      v3_hook_passthrough_irq(info, 15);    
+       PrintDebug("Hooking IDE IRQs\n");
+       
+       //primary ide
+       v3_hook_passthrough_irq(info, 14);
+       
+       // secondary ide
+       v3_hook_passthrough_irq(info, 15);    
     }  
     
 
-  return 0;
+    return 0;
 }
 
 
 
 static struct vm_device *  configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr) {
-      PrintDebug("Creating Generic Device\n");
-      struct vm_device * 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)
-      v3_generic_add_port_range(generic, 0xc0, 0xc7, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channels 4,5,6,7 (address, counter)
-      v3_generic_add_port_range(generic, 0x87, 0x87, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 0 page register
-      v3_generic_add_port_range(generic, 0x83, 0x83, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 1 page register
-      v3_generic_add_port_range(generic, 0x81, 0x81, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 2 page register
-      v3_generic_add_port_range(generic, 0x82, 0x82, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 3 page register
-      v3_generic_add_port_range(generic, 0x8f, 0x8f, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 4 page register
-      v3_generic_add_port_range(generic, 0x8b, 0x8b, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 5 page register
-      v3_generic_add_port_range(generic, 0x89, 0x89, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 6 page register
-      v3_generic_add_port_range(generic, 0x8a, 0x8a, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 7 page register
-      v3_generic_add_port_range(generic, 0x08, 0x0f, GENERIC_PRINT_AND_IGNORE);   // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask)
-      v3_generic_add_port_range(generic, 0xd0, 0xde, GENERIC_PRINT_AND_IGNORE);   // DMA 2 misc registers
-      
-      
-      
-      
-      // Make the Serial ports invisible 
-      
-      v3_generic_add_port_range(generic, 0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE);      // COM 1
-      v3_generic_add_port_range(generic, 0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE);      // COM 2
-      
+    PrintDebug("Creating Generic Device\n");
+    struct vm_device * 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)
+    v3_generic_add_port_range(generic, 0xc0, 0xc7, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channels 4,5,6,7 (address, counter)
+    v3_generic_add_port_range(generic, 0x87, 0x87, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 0 page register
+    v3_generic_add_port_range(generic, 0x83, 0x83, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 1 page register
+    v3_generic_add_port_range(generic, 0x81, 0x81, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 2 page register
+    v3_generic_add_port_range(generic, 0x82, 0x82, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 3 page register
+    v3_generic_add_port_range(generic, 0x8f, 0x8f, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 4 page register
+    v3_generic_add_port_range(generic, 0x8b, 0x8b, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 5 page register
+    v3_generic_add_port_range(generic, 0x89, 0x89, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 6 page register
+    v3_generic_add_port_range(generic, 0x8a, 0x8a, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 7 page register
+    v3_generic_add_port_range(generic, 0x08, 0x0f, GENERIC_PRINT_AND_IGNORE);   // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask)
+    v3_generic_add_port_range(generic, 0xd0, 0xde, GENERIC_PRINT_AND_IGNORE);   // DMA 2 misc registers
+    
+    
+    
+    
+    // Make the Serial ports invisible 
+    
+    v3_generic_add_port_range(generic, 0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE);      // COM 1
+    v3_generic_add_port_range(generic, 0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE);      // COM 2
+    
 
       
 
-      v3_generic_add_port_range(generic, 0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE);      // COM 3
-      v3_generic_add_port_range(generic, 0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE);      // COM 4
+    v3_generic_add_port_range(generic, 0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE);      // COM 3
+    v3_generic_add_port_range(generic, 0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE);      // COM 4
 
       
       
 
-      // Make the PCI bus invisible (at least it's configuration)
-      
-      v3_generic_add_port_range(generic, 0xcf8, 0xcf8, GENERIC_PRINT_AND_IGNORE); // PCI Config Address
-      v3_generic_add_port_range(generic, 0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE); // PCI Config Data
-
-      
-      
+    // Make the PCI bus invisible (at least it's configuration)
+    
+    v3_generic_add_port_range(generic, 0xcf8, 0xcf8, GENERIC_PRINT_AND_IGNORE); // PCI Config Address
+    v3_generic_add_port_range(generic, 0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE); // PCI Config Data
+    
+    
+    
 #if 0
-      if (!use_ramdisk) {
+    if (!use_ramdisk) {
        // Monitor the IDE controllers (very slow)
        v3_generic_add_port_range(generic, 0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 1
        v3_generic_add_port_range(generic, 0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 1
-      }
+    }
       
 
-      v3_generic_add_port_range(generic, 0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0
-      v3_generic_add_port_range(generic, 0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0
+    v3_generic_add_port_range(generic, 0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0
+    v3_generic_add_port_range(generic, 0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0
 #endif
       
       
 #if 0
-      
-      // Make the floppy controllers invisible
-      
-      v3_generic_add_port_range(generic, 0x3f0, 0x3f2, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (base,statusa/statusb,DOR)
-      v3_generic_add_port_range(generic, 0x3f4, 0x3f5, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (mainstat/datarate,data)
-      v3_generic_add_port_range(generic, 0x3f7, 0x3f7, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (DIR)
-      v3_generic_add_port_range(generic, 0x370, 0x372, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (base,statusa/statusb,DOR)
-      v3_generic_add_port_range(generic, 0x374, 0x375, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (mainstat/datarate,data)
-      v3_generic_add_port_range(generic, 0x377, 0x377, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (DIR)
-      
+    
+    // Make the floppy controllers invisible
+    
+    v3_generic_add_port_range(generic, 0x3f0, 0x3f2, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (base,statusa/statusb,DOR)
+    v3_generic_add_port_range(generic, 0x3f4, 0x3f5, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (mainstat/datarate,data)
+    v3_generic_add_port_range(generic, 0x3f7, 0x3f7, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (DIR)
+    v3_generic_add_port_range(generic, 0x370, 0x372, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (base,statusa/statusb,DOR)
+    v3_generic_add_port_range(generic, 0x374, 0x375, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (mainstat/datarate,data)
+    v3_generic_add_port_range(generic, 0x377, 0x377, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (DIR)
+    
 #endif
 
 #if 1
 
-      // Make the parallel port invisible
+    // Make the parallel port invisible
       
-      v3_generic_add_port_range(generic, 0x378, 0x37f, GENERIC_PRINT_AND_IGNORE);
+    v3_generic_add_port_range(generic, 0x378, 0x37f, GENERIC_PRINT_AND_IGNORE);
 
 #endif
 
 #if 1
 
-      // Monitor graphics card operations
-
-      v3_generic_add_port_range(generic, 0x3b0, 0x3bb, GENERIC_PRINT_AND_PASSTHROUGH);
-      v3_generic_add_port_range(generic, 0x3c0, 0x3df, GENERIC_PRINT_AND_PASSTHROUGH);
+    // Monitor graphics card operations
+    
+    v3_generic_add_port_range(generic, 0x3b0, 0x3bb, GENERIC_PRINT_AND_PASSTHROUGH);
+    v3_generic_add_port_range(generic, 0x3c0, 0x3df, GENERIC_PRINT_AND_PASSTHROUGH);
       
 #endif
 
 
 #if 1
-      // Make the ISA PNP features invisible
-
-      v3_generic_add_port_range(generic, 0x274, 0x277, GENERIC_PRINT_AND_IGNORE);
-      v3_generic_add_port_range(generic, 0x279, 0x279, GENERIC_PRINT_AND_IGNORE);
-      v3_generic_add_port_range(generic, 0xa79, 0xa79, GENERIC_PRINT_AND_IGNORE);
+    // Make the ISA PNP features invisible
+    
+    v3_generic_add_port_range(generic, 0x274, 0x277, GENERIC_PRINT_AND_IGNORE);
+    v3_generic_add_port_range(generic, 0x279, 0x279, GENERIC_PRINT_AND_IGNORE);
+    v3_generic_add_port_range(generic, 0xa79, 0xa79, GENERIC_PRINT_AND_IGNORE);
 #endif
 
 
 #if 1
-      // Monitor any network card (realtek ne2000) operations 
-      v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH);
+    // Monitor any network card (realtek ne2000) operations 
+    v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH);
 #endif
 
 
 #if 1
-      // Make any Bus master ide controller invisible
-      
-      v3_generic_add_port_range(generic, 0xc000, 0xc00f, GENERIC_PRINT_AND_IGNORE);
+    // Make any Bus master ide controller invisible
+    
+    v3_generic_add_port_range(generic, 0xc000, 0xc00f, GENERIC_PRINT_AND_IGNORE);
 #endif
-      //  v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE);
-      
-
-      return generic;
+    //  v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE);
+    
 
+    return generic;
 }