Rename pci_register_io_region() to pci_register_bar()

This function is used to manage a PCI BAR, so make the more generic
pci_register_io_region() available to other uses.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/hw/ac97.c b/hw/ac97.c
index 288f42813c5f058556d0fe99ed566093f5a64157..a70bb9074fc74ecfabb68eadb704cdd25db3d302 100644 (file)
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -1366,8 +1366,8 @@ int ac97_init (PCIBus *bus)
     c[0x3c] = 0x00;      /* intr_ln interrupt line rw */
     c[0x3d] = 0x01;      /* intr_pn interrupt pin ro */
 
-    pci_register_io_region (&d->dev, 0, 256 * 4, PCI_ADDRESS_SPACE_IO, ac97_map);
-    pci_register_io_region (&d->dev, 1, 64 * 4, PCI_ADDRESS_SPACE_IO, ac97_map);
+    pci_register_bar (&d->dev, 0, 256 * 4, PCI_ADDRESS_SPACE_IO, ac97_map);
+    pci_register_bar (&d->dev, 1, 64 * 4, PCI_ADDRESS_SPACE_IO, ac97_map);
     register_savevm ("ac97", 0, 2, ac97_save, ac97_load, s);
     qemu_register_reset (ac97_on_reset, 0, s);
     AUD_register_card ("ac97", &s->card);

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 5591149c6ea308f7023cd9fb9724219f850f6c1d..0a127827536513cf3891bd718659e8b8956146a3 100644 (file)
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -3336,10 +3336,10 @@ void pci_cirrus_vga_init(PCIBus *bus)
     /* memory #0 LFB */
     /* memory #1 memory-mapped I/O */
     /* XXX: s->vga.vram_size must be a power of two */
-    pci_register_io_region((PCIDevice *)d, 0, 0x2000000,
+    pci_register_bar((PCIDevice *)d, 0, 0x2000000,
                           PCI_ADDRESS_SPACE_MEM_PREFETCH, cirrus_pci_lfb_map);
     if (device_id == CIRRUS_ID_CLGD5446) {
-        pci_register_io_region((PCIDevice *)d, 1, CIRRUS_PNPMMIO_SIZE,
+        pci_register_bar((PCIDevice *)d, 1, CIRRUS_PNPMMIO_SIZE,
                                PCI_ADDRESS_SPACE_MEM, cirrus_pci_mmio_map);
     }
     /* XXX: ROM BIOS */

diff --git a/hw/e1000.c b/hw/e1000.c
index 0dd3a12a1b756e1e20bc6434b488dc5a1e4071c3..cffcbde8475296931e02dfdd0fc5e688664590c6 100644 (file)
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -1104,10 +1104,10 @@ static void pci_e1000_init(PCIDevice *pci_dev)
     d->mmio_index = cpu_register_io_memory(e1000_mmio_read,
             e1000_mmio_write, d);
 
-    pci_register_io_region((PCIDevice *)d, 0, PNPMMIO_SIZE,
+    pci_register_bar((PCIDevice *)d, 0, PNPMMIO_SIZE,
                            PCI_ADDRESS_SPACE_MEM, e1000_mmio_map);
 
-    pci_register_io_region((PCIDevice *)d, 1, IOPORT_SIZE,
+    pci_register_bar((PCIDevice *)d, 1, IOPORT_SIZE,
                            PCI_ADDRESS_SPACE_IO, ioport_map);
 
     memmove(d->eeprom_data, e1000_eeprom_template,

diff --git a/hw/eepro100.c b/hw/eepro100.c
index 5045e5cbf825faeacdcc41b3cb100d01b51e67e7..6f47eaf8401b08fbf96a6a1fa1191dff79feb714 100644 (file)
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -1752,12 +1752,12 @@ static void nic_init(PCIDevice *pci_dev, uint32_t device)
     d->eepro100.mmio_index =
         cpu_register_io_memory(pci_mmio_read, pci_mmio_write, s);
 
-    pci_register_io_region(&d->dev, 0, PCI_MEM_SIZE,
+    pci_register_bar(&d->dev, 0, PCI_MEM_SIZE,
                            PCI_ADDRESS_SPACE_MEM |
                            PCI_ADDRESS_SPACE_MEM_PREFETCH, pci_mmio_map);
-    pci_register_io_region(&d->dev, 1, PCI_IO_SIZE, PCI_ADDRESS_SPACE_IO,
+    pci_register_bar(&d->dev, 1, PCI_IO_SIZE, PCI_ADDRESS_SPACE_IO,
                            pci_map);
-    pci_register_io_region(&d->dev, 2, PCI_FLASH_SIZE, PCI_ADDRESS_SPACE_MEM,
+    pci_register_bar(&d->dev, 2, PCI_FLASH_SIZE, PCI_ADDRESS_SPACE_MEM,
                            pci_mmio_map);
 
     qdev_get_macaddr(&d->dev.qdev, s->macaddr);

diff --git a/hw/es1370.c b/hw/es1370.c
index 12f2ace0a9b41de3d8d741a071e2003e5739d63e..9a88baf6e762f72350cc2b9ac22536f4f6ac228b 100644 (file)
--- a/hw/es1370.c
+++ b/hw/es1370.c
@@ -1053,7 +1053,7 @@ int es1370_init (PCIBus *bus)
     s = &d->es1370;
     s->pci_dev = &d->dev;
 
-    pci_register_io_region (&d->dev, 0, 256, PCI_ADDRESS_SPACE_IO, es1370_map);
+    pci_register_bar (&d->dev, 0, 256, PCI_ADDRESS_SPACE_IO, es1370_map);
     register_savevm ("es1370", 0, 2, es1370_save, es1370_load, s);
     qemu_register_reset (es1370_on_reset, 0, s);
 

diff --git a/hw/ide.c b/hw/ide.c
index dd76aa124e55967cb1dd17a90ee8b134f17391ba..cc37e7880b874cd0febac29ad791d6da84f1e283 100644 (file)
--- a/hw/ide.c
+++ b/hw/ide.c
@@ -3309,15 +3309,15 @@ void pci_cmd646_ide_init(PCIBus *bus, BlockDriverState **hd_table,
         pci_conf[0x51] |= 0x08; /* enable IDE1 */
     }
 
-    pci_register_io_region((PCIDevice *)d, 0, 0x8,
+    pci_register_bar((PCIDevice *)d, 0, 0x8,
                            PCI_ADDRESS_SPACE_IO, ide_map);
-    pci_register_io_region((PCIDevice *)d, 1, 0x4,
+    pci_register_bar((PCIDevice *)d, 1, 0x4,
                            PCI_ADDRESS_SPACE_IO, ide_map);
-    pci_register_io_region((PCIDevice *)d, 2, 0x8,
+    pci_register_bar((PCIDevice *)d, 2, 0x8,
                            PCI_ADDRESS_SPACE_IO, ide_map);
-    pci_register_io_region((PCIDevice *)d, 3, 0x4,
+    pci_register_bar((PCIDevice *)d, 3, 0x4,
                            PCI_ADDRESS_SPACE_IO, ide_map);
-    pci_register_io_region((PCIDevice *)d, 4, 0x10,
+    pci_register_bar((PCIDevice *)d, 4, 0x10,
                            PCI_ADDRESS_SPACE_IO, bmdma_map);
 
     pci_conf[0x3d] = 0x01; // interrupt on pin 1
@@ -3376,7 +3376,7 @@ void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn,
     qemu_register_reset(piix3_reset, 0, d);
     piix3_reset(d);
 
-    pci_register_io_region((PCIDevice *)d, 4, 0x10,
+    pci_register_bar((PCIDevice *)d, 4, 0x10,
                            PCI_ADDRESS_SPACE_IO, bmdma_map);
 
     ide_init2(&d->ide_if[0], hd_table[0], hd_table[1], pic[14]);
@@ -3416,7 +3416,7 @@ void pci_piix4_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn,
     qemu_register_reset(piix3_reset, 0, d);
     piix3_reset(d);
 
-    pci_register_io_region((PCIDevice *)d, 4, 0x10,
+    pci_register_bar((PCIDevice *)d, 4, 0x10,
                            PCI_ADDRESS_SPACE_IO, bmdma_map);
 
     ide_init2(&d->ide_if[0], hd_table[0], hd_table[1], pic[14]);

diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 5bae70a3518984178de2bdb496b1b62c85d2f45d..651b32b549fbe199ae1b05a32a7b3a20fefa5c5f 100644 (file)
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -2003,11 +2003,11 @@ static void lsi_scsi_init(PCIDevice *dev)
     s->ram_io_addr = cpu_register_io_memory(lsi_ram_readfn,
                                             lsi_ram_writefn, s);
 
-    pci_register_io_region((struct PCIDevice *)s, 0, 256,
+    pci_register_bar((struct PCIDevice *)s, 0, 256,
                            PCI_ADDRESS_SPACE_IO, lsi_io_mapfunc);
-    pci_register_io_region((struct PCIDevice *)s, 1, 0x400,
+    pci_register_bar((struct PCIDevice *)s, 1, 0x400,
                            PCI_ADDRESS_SPACE_MEM, lsi_mmio_mapfunc);
-    pci_register_io_region((struct PCIDevice *)s, 2, 0x2000,
+    pci_register_bar((struct PCIDevice *)s, 2, 0x2000,
                            PCI_ADDRESS_SPACE_MEM, lsi_ram_mapfunc);
     s->queue = qemu_malloc(sizeof(lsi_queue));
     s->queue_len = 1;

diff --git a/hw/macio.c b/hw/macio.c
index 28dbaa720f978a0083ef9c3b51060b107203edec..8cfadfc5e0cbf0225703b70123e41d93ce0e66fa 100644 (file)
--- a/hw/macio.c
+++ b/hw/macio.c
@@ -114,6 +114,6 @@ void macio_init (PCIBus *bus, int device_id, int is_oldworld, int pic_mem_index,
 
     d->config[0x3d] = 0x01; // interrupt on pin 1
 
-    pci_register_io_region(d, 0, 0x80000,
+    pci_register_bar(d, 0, 0x80000,
                            PCI_ADDRESS_SPACE_MEM, macio_map);
 }

diff --git a/hw/ne2000.c b/hw/ne2000.c
index f5ae9d739400530a327ced82167cc81d537e72fb..66ae9ab03b4221bd29d86ed1e539af31b14bb412 100644 (file)
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -816,7 +816,7 @@ static void pci_ne2000_init(PCIDevice *pci_dev)
     pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type
     pci_conf[0x3d] = 1; // interrupt pin 0
 
-    pci_register_io_region(&d->dev, 0, 0x100,
+    pci_register_bar(&d->dev, 0, 0x100,
                            PCI_ADDRESS_SPACE_IO, ne2000_map);
     s = &d->ne2000;
     s->irq = d->dev.irq[0];

diff --git a/hw/openpic.c b/hw/openpic.c
index 269b96517ae57dc7aab42b87b312f49897a277d4..9742d54aca40321271a807baec28c309e837de5e 100644 (file)
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -1212,7 +1212,7 @@ qemu_irq *openpic_init (PCIBus *bus, int *pmem_index, int nb_cpus,
         pci_conf[0x3d] = 0x00; // no interrupt pin
 
         /* Register I/O spaces */
-        pci_register_io_region((PCIDevice *)opp, 0, 0x40000,
+        pci_register_bar((PCIDevice *)opp, 0, 0x40000,
                                PCI_ADDRESS_SPACE_MEM, &openpic_map);
     } else {
         opp = qemu_mallocz(sizeof(openpic_t));

diff --git a/hw/pci.c b/hw/pci.c
index a3af3b5efbdfc7a223ae1ac7e7edfd224908c339..0a738dbd6b05d9082ea445e20af4e0e1a29e6d3f 100644 (file)
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -322,7 +322,7 @@ int pci_unregister_device(PCIDevice *pci_dev)
     return 0;
 }
 
-void pci_register_io_region(PCIDevice *pci_dev, int region_num,
+void pci_register_bar(PCIDevice *pci_dev, int region_num,
                             uint32_t size, int type,
                             PCIMapIORegionFunc *map_func)
 {

diff --git a/hw/pci.h b/hw/pci.h
index af6c8fd15306e513e8c6c594b62e88f8ec6f9915..fcca526753f54200fc14f2d5b3ef0246056b35e8 100644 (file)
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -166,7 +166,7 @@ PCIDevice *pci_register_device(PCIBus *bus, const char *name,
                                PCIConfigWriteFunc *config_write);
 int pci_unregister_device(PCIDevice *pci_dev);
 
-void pci_register_io_region(PCIDevice *pci_dev, int region_num,
+void pci_register_bar(PCIDevice *pci_dev, int region_num,
                             uint32_t size, int type,
                             PCIMapIORegionFunc *map_func);
 

diff --git a/hw/pcnet.c b/hw/pcnet.c
index 51a00deae1f1dd67d4832efb11b59a62759c17ed..a184146e0d7bc3453acb0fce1e4998ce5c23d89a 100644 (file)
--- a/hw/pcnet.c
+++ b/hw/pcnet.c
@@ -2050,10 +2050,10 @@ static void pci_pcnet_init(PCIDevice *pci_dev)
     s->mmio_index =
       cpu_register_io_memory(pcnet_mmio_read, pcnet_mmio_write, &d->state);
 
-    pci_register_io_region((PCIDevice *)d, 0, PCNET_IOPORT_SIZE,
+    pci_register_bar((PCIDevice *)d, 0, PCNET_IOPORT_SIZE,
                            PCI_ADDRESS_SPACE_IO, pcnet_ioport_map);
 
-    pci_register_io_region((PCIDevice *)d, 1, PCNET_PNPMMIO_SIZE,
+    pci_register_bar((PCIDevice *)d, 1, PCNET_PNPMMIO_SIZE,
                            PCI_ADDRESS_SPACE_MEM, pcnet_mmio_map);
 
     s->irq = pci_dev->irq[0];

diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index e2516bac7fc8e3414d2c7657e1ce1096a79b04d1..13646062d77af1e88ee21a8402e101ed24075be9 100644 (file)
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -3471,10 +3471,10 @@ static void pci_rtl8139_init(PCIDevice *dev)
     s->rtl8139_mmio_io_addr =
     cpu_register_io_memory(rtl8139_mmio_read, rtl8139_mmio_write, s);
 
-    pci_register_io_region(&d->dev, 0, 0x100,
+    pci_register_bar(&d->dev, 0, 0x100,
                            PCI_ADDRESS_SPACE_IO,  rtl8139_ioport_map);
 
-    pci_register_io_region(&d->dev, 1, 0x100,
+    pci_register_bar(&d->dev, 1, 0x100,
                            PCI_ADDRESS_SPACE_MEM, rtl8139_mmio_map);
 
     s->pci_dev = (PCIDevice *)d;

diff --git a/hw/sun4u.c b/hw/sun4u.c
index 7d020182fe9db297c2676ef14b34fc14540669b9..e6bdcb2bcefa9d437af3daf34d2bd4730fcc0e3b 100644 (file)
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -320,9 +320,9 @@ pci_ebus_init(PCIBus *bus, int devfn)
     s->config[0x0D] = 0x0a; // latency_timer
     s->config[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type
 
-    pci_register_io_region(s, 0, 0x1000000, PCI_ADDRESS_SPACE_MEM,
+    pci_register_bar(s, 0, 0x1000000, PCI_ADDRESS_SPACE_MEM,
                            ebus_mmio_mapfunc);
-    pci_register_io_region(s, 1, 0x800000,  PCI_ADDRESS_SPACE_MEM,
+    pci_register_bar(s, 1, 0x800000,  PCI_ADDRESS_SPACE_MEM,
                            ebus_mmio_mapfunc);
 }
 

diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
index b921875fa071536a9397c57c0a6d523548e8b7e0..c575480b4546426f2ece40750d676a5b06adc246 100644 (file)
--- a/hw/usb-ohci.c
+++ b/hw/usb-ohci.c
@@ -1732,7 +1732,7 @@ void usb_ohci_init_pci(struct PCIBus *bus, int num_ports, int devfn)
     usb_ohci_init(&ohci->state, num_ports, devfn, ohci->pci_dev.irq[0],
                   OHCI_TYPE_PCI, ohci->pci_dev.name, 0);
 
-    pci_register_io_region((struct PCIDevice *)ohci, 0, 256,
+    pci_register_bar((struct PCIDevice *)ohci, 0, 256,
                            PCI_ADDRESS_SPACE_MEM, ohci_mapfunc);
 }
 

diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index 689d40ac6915fcb28d18e422cca2075feec7d9e6..00e740b47d94e7bf76bd4fca845c73c277366a66 100644 (file)
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -1097,7 +1097,7 @@ void usb_uhci_piix3_init(PCIBus *bus, int devfn)
 
     /* Use region 4 for consistency with real hardware.  BSD guests seem
        to rely on this.  */
-    pci_register_io_region(&s->dev, 4, 0x20,
+    pci_register_bar(&s->dev, 4, 0x20,
                            PCI_ADDRESS_SPACE_IO, uhci_map);
 
     register_savevm("uhci", 0, 1, uhci_save, uhci_load, s);
@@ -1131,7 +1131,7 @@ void usb_uhci_piix4_init(PCIBus *bus, int devfn)
 
     /* Use region 4 for consistency with real hardware.  BSD guests seem
        to rely on this.  */
-    pci_register_io_region(&s->dev, 4, 0x20,
+    pci_register_bar(&s->dev, 4, 0x20,
                            PCI_ADDRESS_SPACE_IO, uhci_map);
 
     register_savevm("uhci", 0, 1, uhci_save, uhci_load, s);

diff --git a/hw/vga.c b/hw/vga.c
index c07c4da0f34f22178e3d2822a530f41108d0ef6e..97bf1b67a01b4d72b0533a029aef1c8273a63664 100644 (file)
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2510,7 +2510,7 @@ int pci_vga_init(PCIBus *bus,
     pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type
 
     /* XXX: VGA_RAM_SIZE must be a power of two */
-    pci_register_io_region(&d->dev, 0, VGA_RAM_SIZE,
+    pci_register_bar(&d->dev, 0, VGA_RAM_SIZE,
                            PCI_ADDRESS_SPACE_MEM_PREFETCH, vga_map);
     if (vga_bios_size != 0) {
         unsigned int bios_total_size;
@@ -2520,7 +2520,7 @@ int pci_vga_init(PCIBus *bus,
         bios_total_size = 1;
         while (bios_total_size < vga_bios_size)
             bios_total_size <<= 1;
-        pci_register_io_region(&d->dev, PCI_ROM_SLOT, bios_total_size,
+        pci_register_bar(&d->dev, PCI_ROM_SLOT, bios_total_size,
                                PCI_ADDRESS_SPACE_MEM_PREFETCH, vga_map);
     }
     return 0;

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index c072423dcf2d78a4327876be7438d449edfcd385..24fe837be69da4583220dfc5ee0b7b4ca0a737b9 100644 (file)
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -276,7 +276,7 @@ static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev,
     if (size & (size-1))
         size = 1 << qemu_fls(size);
 
-    pci_register_io_region(&proxy->pci_dev, 0, size, PCI_ADDRESS_SPACE_IO,
+    pci_register_bar(&proxy->pci_dev, 0, size, PCI_ADDRESS_SPACE_IO,
                            virtio_map);
 
     virtio_bind_device(vdev, &virtio_pci_bindings, proxy);

diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 5c2e524768a8c7d79755319608331f828a6f45ab..9c354dd108115df62a62af5f2f06bae90acb2377 100644 (file)
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -1231,9 +1231,9 @@ void pci_vmsvga_init(PCIBus *bus)
     s->card.config[0x2f]               = SVGA_PCI_DEVICE_ID >> 8;
     s->card.config[0x3c]               = 0xff;         /* End */
 
-    pci_register_io_region(&s->card, 0, 0x10,
+    pci_register_bar(&s->card, 0, 0x10,
                     PCI_ADDRESS_SPACE_IO, pci_vmsvga_map_ioport);
-    pci_register_io_region(&s->card, 1, VGA_RAM_SIZE,
+    pci_register_bar(&s->card, 1, VGA_RAM_SIZE,
                     PCI_ADDRESS_SPACE_MEM_PREFETCH, pci_vmsvga_map_mem);
 
     vmsvga_init(&s->chip, VGA_RAM_SIZE);

diff --git a/hw/wdt_i6300esb.c b/hw/wdt_i6300esb.c
index 986a89fdeeaabe262078e3b4b7b15f4486310d58..42642c77f2d837c75c8b4299efee759705011d42 100644 (file)
--- a/hw/wdt_i6300esb.c
+++ b/hw/wdt_i6300esb.c
@@ -451,7 +451,7 @@ static void i6300esb_pc_init(PCIBus *pci_bus)
     pci_config_set_class(pci_conf, PCI_CLASS_SYSTEM_OTHER);
     pci_conf[0x0e] = 0x00;
 
-    pci_register_io_region(&d->dev, 0, 0x10,
+    pci_register_bar(&d->dev, 0, 0x10,
                             PCI_ADDRESS_SPACE_MEM, i6300esb_map);
 
     register_savevm("i6300esb_wdt", -1, sizeof(I6300State),