Revision 2c9b15ca hw/misc/omap_gpmc.c

b/hw/misc/omap_gpmc.c
413 413
     * constant), the mask should cause wrapping of the address space, so
414 414
     * that the same memory becomes accessible at every <i>size</i> bytes
415 415
     * starting from <i>base</i>.  */
416
    memory_region_init(&f->container, "omap-gpmc-file", size);
416
    memory_region_init(&f->container, NULL, "omap-gpmc-file", size);
417 417
    memory_region_add_subregion(&f->container, 0,
418 418
                                omap_gpmc_cs_memregion(s, cs));
419 419
    memory_region_add_subregion(get_system_memory(), base,
......
826 826
    struct omap_gpmc_s *s = (struct omap_gpmc_s *)
827 827
            g_malloc0(sizeof(struct omap_gpmc_s));
828 828

  
829
    memory_region_init_io(&s->iomem, &omap_gpmc_ops, s, "omap-gpmc", 0x1000);
829
    memory_region_init_io(&s->iomem, NULL, &omap_gpmc_ops, s, "omap-gpmc", 0x1000);
830 830
    memory_region_add_subregion(get_system_memory(), base, &s->iomem);
831 831

  
832 832
    s->irq = irq;
......
843 843
     * guest-requested size.
844 844
     */
845 845
    for (cs = 0; cs < 8; cs++) {
846
        memory_region_init_io(&s->cs_file[cs].nandiomem,
846
        memory_region_init_io(&s->cs_file[cs].nandiomem, NULL,
847 847
                              &omap_nand_ops,
848 848
                              &s->cs_file[cs],
849 849
                              "omap-nand",
850 850
                              256 * 1024 * 1024);
851 851
    }
852 852

  
853
    memory_region_init_io(&s->prefetch.iomem, &omap_prefetch_ops, s,
853
    memory_region_init_io(&s->prefetch.iomem, NULL, &omap_prefetch_ops, s,
854 854
                          "omap-gpmc-prefetch", 256 * 1024 * 1024);
855 855
    return s;
856 856
}

Also available in: Unified diff