Commit b3959efd authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.1' into staging 



QOM and device refactorings

* QOM unparenting cleanup
* IRQ conversion to QOM

# gpg: Signature made Tue 01 Jul 2014 04:03:23 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-devices-for-2.1:
  irq: Slim conversion of qemu_irq to QOM
  irq: Allocate IRQs individually
  hw: Fix qemu_allocate_irqs() leaks
  sdhci: Fix misuse of qemu_free_irqs()
  qom: Remove parent pointer when unparenting

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d94a6587 615c4895

hw/arm/omap1.c

+7 −7
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static void omap_timer_clk_update(void *opaque, int line, int on) 
static void omap_timer_clk_setup(struct omap_mpu_timer_s *timer)

{

    omap_clk_adduser(timer->clk,

                    qemu_allocate_irqs(omap_timer_clk_update, timer, 1)[0]);

                    qemu_allocate_irq(omap_timer_clk_update, timer, 0));

    timer->rate = omap_clk_getrate(timer->clk);

}
@@ -2098,7 +2098,7 @@ static struct omap_mpuio_s *omap_mpuio_init(MemoryRegion *memory, 
                          "omap-mpuio", 0x800);

    memory_region_add_subregion(memory, base, &s->iomem);



    omap_clk_adduser(clk, qemu_allocate_irqs(omap_mpuio_onoff, s, 1)[0]);

    omap_clk_adduser(clk, qemu_allocate_irq(omap_mpuio_onoff, s, 0));



    return s;

}
@@ -2401,7 +2401,7 @@ static struct omap_pwl_s *omap_pwl_init(MemoryRegion *system_memory, 
                          "omap-pwl", 0x800);

    memory_region_add_subregion(system_memory, base, &s->iomem);



    omap_clk_adduser(clk, qemu_allocate_irqs(omap_pwl_clk_update, s, 1)[0]);

    omap_clk_adduser(clk, qemu_allocate_irq(omap_pwl_clk_update, s, 0));

    return s;

}
@@ -3485,8 +3485,8 @@ static void omap_mcbsp_i2s_start(void *opaque, int line, int level) 
void omap_mcbsp_i2s_attach(struct omap_mcbsp_s *s, I2SCodec *slave)

{

    s->codec = slave;

    slave->rx_swallow = qemu_allocate_irqs(omap_mcbsp_i2s_swallow, s, 1)[0];

    slave->tx_start = qemu_allocate_irqs(omap_mcbsp_i2s_start, s, 1)[0];

    slave->rx_swallow = qemu_allocate_irq(omap_mcbsp_i2s_swallow, s, 0);

    slave->tx_start = qemu_allocate_irq(omap_mcbsp_i2s_start, s, 0);

}



/* LED Pulse Generators */
@@ -3634,7 +3634,7 @@ static struct omap_lpg_s *omap_lpg_init(MemoryRegion *system_memory, 
    memory_region_init_io(&s->iomem, NULL, &omap_lpg_ops, s, "omap-lpg", 0x800);

    memory_region_add_subregion(system_memory, base, &s->iomem);



    omap_clk_adduser(clk, qemu_allocate_irqs(omap_lpg_clk_update, s, 1)[0]);

    omap_clk_adduser(clk, qemu_allocate_irq(omap_lpg_clk_update, s, 0));



    return s;

}
@@ -3848,7 +3848,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory, 
    s->sdram_size = sdram_size;

    s->sram_size = OMAP15XX_SRAM_SIZE;



    s->wakeup = qemu_allocate_irqs(omap_mpu_wakeup, s, 1)[0];

    s->wakeup = qemu_allocate_irq(omap_mpu_wakeup, s, 0);



    /* Clocks */

    omap_clk_init(s);

hw/arm/omap2.c

+1 −1
Original line number Diff line number Diff line
@@ -2260,7 +2260,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem, 
    s->sdram_size = sdram_size;

    s->sram_size = OMAP242X_SRAM_SIZE;



    s->wakeup = qemu_allocate_irqs(omap_mpu_wakeup, s, 1)[0];

    s->wakeup = qemu_allocate_irq(omap_mpu_wakeup, s, 0);



    /* Clocks */

    omap_clk_init(s);

hw/arm/pxa2xx.c

+2 −2
Original line number Diff line number Diff line
@@ -2052,7 +2052,7 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, 
        fprintf(stderr, "Unable to find CPU definition\n");

        exit(1);

    }

    s->reset = qemu_allocate_irqs(pxa2xx_reset, s, 1)[0];

    s->reset = qemu_allocate_irq(pxa2xx_reset, s, 0);



    /* SDRAM & Internal Memory Storage */

    memory_region_init_ram(&s->sdram, NULL, "pxa270.sdram", sdram_size);
@@ -2183,7 +2183,7 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) 
        fprintf(stderr, "Unable to find CPU definition\n");

        exit(1);

    }

    s->reset = qemu_allocate_irqs(pxa2xx_reset, s, 1)[0];

    s->reset = qemu_allocate_irq(pxa2xx_reset, s, 0);



    /* SDRAM & Internal Memory Storage */

    memory_region_init_ram(&s->sdram, NULL, "pxa255.sdram", sdram_size);

hw/arm/spitz.c

+2 −2
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ static void spitz_i2c_setup(PXA2xxState *cpu) 


    spitz_wm8750_addr(wm, 0, 0);

    qdev_connect_gpio_out(cpu->gpio, SPITZ_GPIO_WM,

                    qemu_allocate_irqs(spitz_wm8750_addr, wm, 1)[0]);

                          qemu_allocate_irq(spitz_wm8750_addr, wm, 0));

    /* .. and to the sound interface.  */

    cpu->i2s->opaque = wm;

    cpu->i2s->codec_out = wm8750_dac_dat;
@@ -858,7 +858,7 @@ static void spitz_gpio_setup(PXA2xxState *cpu, int slots) 
     * wouldn't guarantee that a guest ever exits the loop.

     */

    spitz_hsync = 0;

    lcd_hsync = qemu_allocate_irqs(spitz_lcd_hsync_handler, cpu, 1)[0];

    lcd_hsync = qemu_allocate_irq(spitz_lcd_hsync_handler, cpu, 0);

    pxa2xx_gpio_read_notifier(cpu->gpio, lcd_hsync);

    pxa2xx_lcd_vsync_notifier(cpu->lcd, lcd_hsync);

hw/arm/z2.c

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static void z2_init(MachineState *machine) 
    wm8750_data_req_set(wm, mpu->i2s->data_req, mpu->i2s);



    qdev_connect_gpio_out(mpu->gpio, Z2_GPIO_LCD_CS,

        qemu_allocate_irqs(z2_lcd_cs, z2_lcd, 1)[0]);

                          qemu_allocate_irq(z2_lcd_cs, z2_lcd, 0));



    z2_binfo.kernel_filename = kernel_filename;

    z2_binfo.kernel_cmdline = kernel_cmdline;