mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 09:13:55 -06:00
memory: add owner argument to initialization functions
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
5767e4e198
commit
2c9b15cab1
319 changed files with 787 additions and 759 deletions
|
@ -1378,8 +1378,8 @@ static int ac97_initfn (PCIDevice *dev)
|
|||
c[PCI_INTERRUPT_LINE] = 0x00; /* intr_ln interrupt line rw */
|
||||
c[PCI_INTERRUPT_PIN] = 0x01; /* intr_pn interrupt pin ro */
|
||||
|
||||
memory_region_init_io (&s->io_nam, &ac97_io_nam_ops, s, "ac97-nam", 1024);
|
||||
memory_region_init_io (&s->io_nabm, &ac97_io_nabm_ops, s, "ac97-nabm", 256);
|
||||
memory_region_init_io (&s->io_nam, NULL, &ac97_io_nam_ops, s, "ac97-nam", 1024);
|
||||
memory_region_init_io (&s->io_nabm, NULL, &ac97_io_nabm_ops, s, "ac97-nabm", 256);
|
||||
pci_register_bar (&s->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nam);
|
||||
pci_register_bar (&s->dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nabm);
|
||||
qemu_register_reset (ac97_on_reset, s);
|
||||
|
|
|
@ -144,7 +144,7 @@ static int cs4231_init1(SysBusDevice *dev)
|
|||
{
|
||||
CSState *s = FROM_SYSBUS(CSState, dev);
|
||||
|
||||
memory_region_init_io(&s->iomem, &cs_mem_ops, s, "cs4321", CS_SIZE);
|
||||
memory_region_init_io(&s->iomem, NULL, &cs_mem_ops, s, "cs4321", CS_SIZE);
|
||||
sysbus_init_mmio(dev, &s->iomem);
|
||||
sysbus_init_irq(dev, &s->irq);
|
||||
|
||||
|
|
|
@ -648,7 +648,7 @@ static void cs4231a_initfn (Object *obj)
|
|||
{
|
||||
CSState *s = CS4231A (obj);
|
||||
|
||||
memory_region_init_io (&s->ioports, &cs_ioport_ops, s, "cs4231a", 4);
|
||||
memory_region_init_io (&s->ioports, NULL, &cs_ioport_ops, s, "cs4231a", 4);
|
||||
}
|
||||
|
||||
static void cs4231a_realizefn (DeviceState *dev, Error **errp)
|
||||
|
|
|
@ -1035,7 +1035,7 @@ static int es1370_initfn (PCIDevice *dev)
|
|||
c[PCI_MIN_GNT] = 0x0c;
|
||||
c[PCI_MAX_LAT] = 0x80;
|
||||
|
||||
memory_region_init_io (&s->io, &es1370_io_ops, s, "es1370", 256);
|
||||
memory_region_init_io (&s->io, NULL, &es1370_io_ops, s, "es1370", 256);
|
||||
pci_register_bar (&s->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io);
|
||||
qemu_register_reset (es1370_on_reset, s);
|
||||
|
||||
|
|
|
@ -1135,7 +1135,7 @@ static int intel_hda_init(PCIDevice *pci)
|
|||
/* HDCTL off 0x40 bit 0 selects signaling mode (1-HDA, 0 - Ac97) 18.1.19 */
|
||||
conf[0x40] = 0x01;
|
||||
|
||||
memory_region_init_io(&d->mmio, &intel_hda_mmio_ops, d,
|
||||
memory_region_init_io(&d->mmio, NULL, &intel_hda_mmio_ops, d,
|
||||
"intel-hda", 0x4000);
|
||||
pci_register_bar(&d->pci, 0, 0, &d->mmio);
|
||||
if (d->msi) {
|
||||
|
|
|
@ -244,7 +244,7 @@ static int mv88w8618_audio_init(SysBusDevice *dev)
|
|||
|
||||
wm8750_data_req_set(s->wm, mv88w8618_audio_callback, s);
|
||||
|
||||
memory_region_init_io(&s->iomem, &mv88w8618_audio_ops, s,
|
||||
memory_region_init_io(&s->iomem, NULL, &mv88w8618_audio_ops, s,
|
||||
"audio", MP_AUDIO_SIZE);
|
||||
sysbus_init_mmio(dev, &s->iomem);
|
||||
|
||||
|
|
|
@ -300,7 +300,7 @@ static int milkymist_ac97_init(SysBusDevice *dev)
|
|||
s->voice_out = AUD_open_out(&s->card, s->voice_out,
|
||||
"mm_ac97.out", s, ac97_out_cb, &as);
|
||||
|
||||
memory_region_init_io(&s->regs_region, &ac97_mmio_ops, s,
|
||||
memory_region_init_io(&s->regs_region, NULL, &ac97_mmio_ops, s,
|
||||
"milkymist-ac97", R_MAX * 4);
|
||||
sysbus_init_mmio(dev, &s->regs_region);
|
||||
|
||||
|
|
|
@ -167,7 +167,7 @@ static void pcspk_initfn(Object *obj)
|
|||
{
|
||||
PCSpkState *s = PC_SPEAKER(obj);
|
||||
|
||||
memory_region_init_io(&s->ioport, &pcspk_io_ops, s, "elcr", 1);
|
||||
memory_region_init_io(&s->ioport, NULL, &pcspk_io_ops, s, "elcr", 1);
|
||||
}
|
||||
|
||||
static void pcspk_realizefn(DeviceState *dev, Error **errp)
|
||||
|
|
|
@ -543,7 +543,7 @@ static int pl041_init(SysBusDevice *dev)
|
|||
}
|
||||
|
||||
/* Connect the device to the sysbus */
|
||||
memory_region_init_io(&s->iomem, &pl041_ops, s, "pl041", 0x1000);
|
||||
memory_region_init_io(&s->iomem, NULL, &pl041_ops, s, "pl041", 0x1000);
|
||||
sysbus_init_mmio(dev, &s->iomem);
|
||||
sysbus_init_irq(dev, &s->irq);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue