diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-06-06 21:25:08 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-07-04 17:42:48 +0200 |
| commit | 40c5dce99bac2d1d5f240c8c8ec53dc23ea46a89 (patch) | |
| tree | f169d56f65f0d92bc0a2a26fa27b52f3bcf1b7f5 /hw/pci/pci.c | |
| parent | eedfac6f38b2ba8be827088cd3facd19d21af1e1 (diff) | |
| download | qemu-40c5dce99bac2d1d5f240c8c8ec53dc23ea46a89.tar.gz | |
hw/p*: pass owner to memory_region_init* functions
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/pci/pci.c')
| -rw-r--r-- | hw/pci/pci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index a29a385c9e..ceb6a5d9cc 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -811,7 +811,8 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, dma_as = &address_space_memory; } - memory_region_init_alias(&pci_dev->bus_master_enable_region, NULL, "bus master", + memory_region_init_alias(&pci_dev->bus_master_enable_region, + OBJECT(pci_dev), "bus master", dma_as->root, 0, memory_region_size(dma_as->root)); memory_region_set_enabled(&pci_dev->bus_master_enable_region, false); address_space_init(&pci_dev->bus_master_as, &pci_dev->bus_master_enable_region, @@ -1945,7 +1946,7 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom) snprintf(name, sizeof(name), "%s.rom", object_get_typename(OBJECT(pdev))); } pdev->has_rom = true; - memory_region_init_ram(&pdev->rom, NULL, name, size); + memory_region_init_ram(&pdev->rom, OBJECT(pdev), name, size); vmstate_register_ram(&pdev->rom, &pdev->qdev); ptr = memory_region_get_ram_ptr(&pdev->rom); load_image(path, ptr); |