PCI: delete unused mem_base and pci_to_cpu_addr
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
		
							parent
							
								
									de18f87eb1
								
							
						
					
					
						commit
						f64e02b6cc
					
				
							
								
								
									
										14
									
								
								hw/pci.c
								
								
								
								
							
							
						
						
									
										14
									
								
								hw/pci.c
								
								
								
								
							| 
						 | 
					@ -312,11 +312,6 @@ void pci_bus_hotplug(PCIBus *bus, pci_hotplug_fn hotplug, DeviceState *qdev)
 | 
				
			||||||
    bus->hotplug_qdev = qdev;
 | 
					    bus->hotplug_qdev = qdev;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void pci_bus_set_mem_base(PCIBus *bus, target_phys_addr_t base)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    bus->mem_base = base;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
PCIBus *pci_register_bus(DeviceState *parent, const char *name,
 | 
					PCIBus *pci_register_bus(DeviceState *parent, const char *name,
 | 
				
			||||||
                         pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
 | 
					                         pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
 | 
				
			||||||
                         void *irq_opaque,
 | 
					                         void *irq_opaque,
 | 
				
			||||||
| 
						 | 
					@ -833,12 +828,6 @@ PCIDevice *pci_register_device(PCIBus *bus, const char *name,
 | 
				
			||||||
    return pci_dev;
 | 
					    return pci_dev;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static target_phys_addr_t pci_to_cpu_addr(PCIBus *bus,
 | 
					 | 
				
			||||||
                                          target_phys_addr_t addr)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    return addr + bus->mem_base;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
static void pci_unregister_io_regions(PCIDevice *pci_dev)
 | 
					static void pci_unregister_io_regions(PCIDevice *pci_dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    PCIIORegion *r;
 | 
					    PCIIORegion *r;
 | 
				
			||||||
| 
						 | 
					@ -1066,8 +1055,7 @@ static void pci_update_mappings(PCIDevice *d)
 | 
				
			||||||
                                                    1);
 | 
					                                                    1);
 | 
				
			||||||
            } else {
 | 
					            } else {
 | 
				
			||||||
                memory_region_add_subregion_overlap(r->address_space,
 | 
					                memory_region_add_subregion_overlap(r->address_space,
 | 
				
			||||||
                                                    pci_to_cpu_addr(d->bus,
 | 
					                                                    r->addr,
 | 
				
			||||||
                                                                    r->addr),
 | 
					 | 
				
			||||||
                                                    r->memory,
 | 
					                                                    r->memory,
 | 
				
			||||||
                                                    1);
 | 
					                                                    1);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								hw/pci.h
								
								
								
								
							
							
						
						
									
										2
									
								
								hw/pci.h
								
								
								
								
							| 
						 | 
					@ -255,8 +255,6 @@ PCIBus *pci_register_bus(DeviceState *parent, const char *name,
 | 
				
			||||||
void pci_device_reset(PCIDevice *dev);
 | 
					void pci_device_reset(PCIDevice *dev);
 | 
				
			||||||
void pci_bus_reset(PCIBus *bus);
 | 
					void pci_bus_reset(PCIBus *bus);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void pci_bus_set_mem_base(PCIBus *bus, target_phys_addr_t base);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
 | 
					PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
 | 
				
			||||||
                        const char *default_devaddr);
 | 
					                        const char *default_devaddr);
 | 
				
			||||||
PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model,
 | 
					PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue