Revision 1437c94b hw/intc/armv7m_nvic.c

b/hw/intc/armv7m_nvic.c
487 487 
     * We use overlaying to put the GIC like registers
488 488 
     * over the top of the system control register region.
489 489 
     */
490 
    memory_region_init(&s->container, NULL, "nvic", 0x1000);
490 
    memory_region_init(&s->container, OBJECT(s), "nvic", 0x1000);
491 491 
    /* The system register region goes at the bottom of the priority
492 492 
     * stack as it covers the whole page.
493 493 
     */
494 
    memory_region_init_io(&s->sysregmem, NULL, &nvic_sysreg_ops, s,
494 
    memory_region_init_io(&s->sysregmem, OBJECT(s), &nvic_sysreg_ops, s,
495 495 
                          "nvic_sysregs", 0x1000);
496 496 
    memory_region_add_subregion(&s->container, 0, &s->sysregmem);
497 497 
    /* Alias the GIC region so we can get only the section of it
498 498 
     * we need, and layer it on top of the system register region.
499 499 
     */
500 
    memory_region_init_alias(&s->gic_iomem_alias, NULL, "nvic-gic", &s->gic.iomem,
500 
    memory_region_init_alias(&s->gic_iomem_alias, OBJECT(s),
501 
                             "nvic-gic", &s->gic.iomem,
501 502 
                             0x100, 0xc00);
502 503 
    memory_region_add_subregion_overlap(&s->container, 0x100,
503 504 
                                        &s->gic_iomem_alias, 1);

Also available in: Unified diff