Revision 2c9b15ca hw/pci-host/q35.c

b/hw/pci-host/q35.c
40 40
    PCIHostState *pci = FROM_SYSBUS(PCIHostState, dev);
41 41
    Q35PCIHost *s = Q35_HOST_DEVICE(&dev->qdev);
42 42

  
43
    memory_region_init_io(&pci->conf_mem, &pci_host_conf_le_ops, pci,
43
    memory_region_init_io(&pci->conf_mem, NULL, &pci_host_conf_le_ops, pci,
44 44
                          "pci-conf-idx", 4);
45 45
    sysbus_add_io(dev, MCH_HOST_BRIDGE_CONFIG_ADDR, &pci->conf_mem);
46 46
    sysbus_init_ioports(&pci->busdev, MCH_HOST_BRIDGE_CONFIG_ADDR, 4);
47 47

  
48
    memory_region_init_io(&pci->data_mem, &pci_host_data_le_ops, pci,
48
    memory_region_init_io(&pci->data_mem, NULL, &pci_host_data_le_ops, pci,
49 49
                          "pci-conf-data", 4);
50 50
    sysbus_add_io(dev, MCH_HOST_BRIDGE_CONFIG_DATA, &pci->data_mem);
51 51
    sysbus_init_ioports(&pci->busdev, MCH_HOST_BRIDGE_CONFIG_DATA, 4);
......
245 245
    MCHPCIState *mch = MCH_PCI_DEVICE(d);
246 246

  
247 247
    /* setup pci memory regions */
248
    memory_region_init_alias(&mch->pci_hole, "pci-hole",
248
    memory_region_init_alias(&mch->pci_hole, NULL, "pci-hole",
249 249
                             mch->pci_address_space,
250 250
                             mch->below_4g_mem_size,
251 251
                             0x100000000ULL - mch->below_4g_mem_size);
......
253 253
                                &mch->pci_hole);
254 254
    pci_hole64_size = (sizeof(hwaddr) == 4 ? 0 :
255 255
                       ((uint64_t)1 << 62));
256
    memory_region_init_alias(&mch->pci_hole_64bit, "pci-hole64",
256
    memory_region_init_alias(&mch->pci_hole_64bit, NULL, "pci-hole64",
257 257
                             mch->pci_address_space,
258 258
                             0x100000000ULL + mch->above_4g_mem_size,
259 259
                             pci_hole64_size);
......
264 264
    }
265 265
    /* smram */
266 266
    cpu_smm_register(&mch_set_smm, mch);
267
    memory_region_init_alias(&mch->smram_region, "smram-region",
267
    memory_region_init_alias(&mch->smram_region, NULL, "smram-region",
268 268
                             mch->pci_address_space, 0xa0000, 0x20000);
269 269
    memory_region_add_subregion_overlap(mch->system_memory, 0xa0000,
270 270
                                        &mch->smram_region, 1);

Also available in: Unified diff