Revision 2c9b15ca hw/i386/kvm/pci-assign.c

b/hw/i386/kvm/pci-assign.c
298 298
    PCIRegion *real_region = &r_dev->real_device.regions[region_num];
299 299

  
300 300
    if (e_size > 0) {
301
        memory_region_init(&region->container, "assigned-dev-container",
301
        memory_region_init(&region->container, NULL, "assigned-dev-container",
302 302
                           e_size);
303 303
        memory_region_add_subregion(&region->container, 0, &region->real_iomem);
304 304

  
......
329 329
    AssignedDevRegion *region = &r_dev->v_addrs[region_num];
330 330

  
331 331
    region->e_size = size;
332
    memory_region_init(&region->container, "assigned-dev-container", size);
333
    memory_region_init_io(&region->real_iomem, &assigned_dev_ioport_ops,
332
    memory_region_init(&region->container, NULL, "assigned-dev-container", size);
333
    memory_region_init_io(&region->real_iomem, NULL, &assigned_dev_ioport_ops,
334 334
                          r_dev->v_addrs + region_num,
335 335
                          "assigned-dev-iomem", size);
336 336
    memory_region_add_subregion(&region->container, 0, &region->real_iomem);
......
478 478
                             "4K.  You might experience some performance hit "
479 479
                             "due to that.",
480 480
                             i, cur_region->base_addr, cur_region->size);
481
                memory_region_init_io(&pci_dev->v_addrs[i].real_iomem,
481
                memory_region_init_io(&pci_dev->v_addrs[i].real_iomem, NULL,
482 482
                                      &slow_bar_ops, &pci_dev->v_addrs[i],
483 483
                                      "assigned-dev-slow-bar",
484 484
                                      cur_region->size);
......
487 487
                char name[32];
488 488
                snprintf(name, sizeof(name), "%s.bar%d",
489 489
                         object_get_typename(OBJECT(pci_dev)), i);
490
                memory_region_init_ram_ptr(&pci_dev->v_addrs[i].real_iomem,
490
                memory_region_init_ram_ptr(&pci_dev->v_addrs[i].real_iomem, NULL,
491 491
                                           name, cur_region->size,
492 492
                                           virtbase);
493 493
                vmstate_register_ram(&pci_dev->v_addrs[i].real_iomem,
......
1650 1650

  
1651 1651
    assigned_dev_msix_reset(dev);
1652 1652

  
1653
    memory_region_init_io(&dev->mmio, &assigned_dev_msix_mmio_ops, dev,
1653
    memory_region_init_io(&dev->mmio, NULL, &assigned_dev_msix_mmio_ops, dev,
1654 1654
                          "assigned-dev-msix", MSIX_PAGE_SIZE);
1655 1655
    return 0;
1656 1656
}
......
1916 1916

  
1917 1917
    snprintf(name, sizeof(name), "%s.rom",
1918 1918
            object_get_typename(OBJECT(dev)));
1919
    memory_region_init_ram(&dev->dev.rom, name, st.st_size);
1919
    memory_region_init_ram(&dev->dev.rom, NULL, name, st.st_size);
1920 1920
    vmstate_register_ram(&dev->dev.rom, &dev->dev.qdev);
1921 1921
    ptr = memory_region_get_ram_ptr(&dev->dev.rom);
1922 1922
    memset(ptr, 0xff, st.st_size);

Also available in: Unified diff