mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: Use g_new() & friends where that makes obvious sense

Browse Source 
g_new(T, n) is neater than g_malloc(sizeof(T) * n).  It's also safer,
for two reasons.  One, it catches multiplication overflowing size_t.
Two, it returns T * rather than void *, which lets the compiler catch
more type errors.

This commit only touches allocations with size arguments of the form
sizeof(T).

Coccinelle semantic patch:

    @@
    type T;
    @@
    -g_malloc(sizeof(T))
    +g_new(T, 1)
    @@
    type T;
    @@
    -g_try_malloc(sizeof(T))
    +g_try_new(T, 1)
    @@
    type T;
    @@
    -g_malloc0(sizeof(T))
    +g_new0(T, 1)
    @@
    type T;
    @@
    -g_try_malloc0(sizeof(T))
    +g_try_new0(T, 1)
    @@
    type T;
    expression n;
    @@
    -g_malloc(sizeof(T) * (n))
    +g_new(T, n)
    @@
    type T;
    expression n;
    @@
    -g_try_malloc(sizeof(T) * (n))
    +g_try_new(T, n)
    @@
    type T;
    expression n;
    @@
    -g_malloc0(sizeof(T) * (n))
    +g_new0(T, n)
    @@
    type T;
    expression n;
    @@
    -g_try_malloc0(sizeof(T) * (n))
    +g_try_new0(T, n)
    @@
    type T;
    expression p, n;
    @@
    -g_realloc(p, sizeof(T) * (n))
    +g_renew(T, p, n)
    @@
    type T;
    expression p, n;
    @@
    -g_try_realloc(p, sizeof(T) * (n))
    +g_try_renew(T, p, n)
    @@
    type T;
    expression n;
    @@
    -(T *)g_new(T, n)
    +g_new(T, n)
    @@
    type T;
    expression n;
    @@
    -(T *)g_new0(T, n)
    +g_new0(T, n)
    @@
    type T;
    expression p, n;
    @@
    -(T *)g_renew(T, p, n)
    +g_renew(T, p, n)

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1440524394-15640-1-git-send-email-armbru@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Markus Armbruster 2015-09-07 10:39:27 +01:00 committed by Peter Maydell
parent b597aa037d
commit b45c03f585
17 changed files with 38 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/arm/omap1.c
View File

@ -258,8 +258,7 @@ static struct omap_mpu_timer_s *omap_mpu_timer_init(MemoryRegion *system_memory,
hwaddr base, hwaddr base,
qemu_irq irq, omap_clk clk) qemu_irq irq, omap_clk clk)
{ {
struct omap_mpu_timer_s *s = (struct omap_mpu_timer_s *) struct omap_mpu_timer_s *s = g_new0(struct omap_mpu_timer_s, 1);
g_malloc0(sizeof(struct omap_mpu_timer_s));
s->irq = irq; s->irq = irq;
s->clk = clk; s->clk = clk;
@ -388,8 +387,7 @@ static struct omap_watchdog_timer_s *omap_wd_timer_init(MemoryRegion *memory,
hwaddr base, hwaddr base,
qemu_irq irq, omap_clk clk) qemu_irq irq, omap_clk clk)
{ {
struct omap_watchdog_timer_s *s = (struct omap_watchdog_timer_s *) struct omap_watchdog_timer_s *s = g_new0(struct omap_watchdog_timer_s, 1);
g_malloc0(sizeof(struct omap_watchdog_timer_s));
s->timer.irq = irq; s->timer.irq = irq;
s->timer.clk = clk; s->timer.clk = clk;
@ -495,8 +493,7 @@ static struct omap_32khz_timer_s *omap_os_timer_init(MemoryRegion *memory,
hwaddr base, hwaddr base,
qemu_irq irq, omap_clk clk) qemu_irq irq, omap_clk clk)
{ {
struct omap_32khz_timer_s *s = (struct omap_32khz_timer_s *) struct omap_32khz_timer_s *s = g_new0(struct omap_32khz_timer_s, 1);
g_malloc0(sizeof(struct omap_32khz_timer_s));
s->timer.irq = irq; s->timer.irq = irq;
s->timer.clk = clk; s->timer.clk = clk;
@ -1236,8 +1233,7 @@ static struct omap_tipb_bridge_s *omap_tipb_bridge_init(
MemoryRegion *memory, hwaddr base, MemoryRegion *memory, hwaddr base,
qemu_irq abort_irq, omap_clk clk) qemu_irq abort_irq, omap_clk clk)
{ {
struct omap_tipb_bridge_s *s = (struct omap_tipb_bridge_s *) struct omap_tipb_bridge_s *s = g_new0(struct omap_tipb_bridge_s, 1);
g_malloc0(sizeof(struct omap_tipb_bridge_s));
s->abort = abort_irq; s->abort = abort_irq;
omap_tipb_bridge_reset(s); omap_tipb_bridge_reset(s);
@ -2099,8 +2095,7 @@ static struct omap_mpuio_s *omap_mpuio_init(MemoryRegion *memory,
qemu_irq kbd_int, qemu_irq gpio_int, qemu_irq wakeup, qemu_irq kbd_int, qemu_irq gpio_int, qemu_irq wakeup,
omap_clk clk) omap_clk clk)
{ {
struct omap_mpuio_s *s = (struct omap_mpuio_s *) struct omap_mpuio_s *s = g_new0(struct omap_mpuio_s, 1);
g_malloc0(sizeof(struct omap_mpuio_s));
s->irq = gpio_int; s->irq = gpio_int;
s->kbd_irq = kbd_int; s->kbd_irq = kbd_int;
@ -2292,8 +2287,7 @@ static struct omap_uwire_s *omap_uwire_init(MemoryRegion *system_memory,
qemu_irq dma, qemu_irq dma,
omap_clk clk) omap_clk clk)
{ {
struct omap_uwire_s *s = (struct omap_uwire_s *) struct omap_uwire_s *s = g_new0(struct omap_uwire_s, 1);
g_malloc0(sizeof(struct omap_uwire_s));
s->txirq = txirq; s->txirq = txirq;
s->rxirq = rxirq; s->rxirq = rxirq;
@ -2932,8 +2926,7 @@ static struct omap_rtc_s *omap_rtc_init(MemoryRegion *system_memory,
qemu_irq timerirq, qemu_irq alarmirq, qemu_irq timerirq, qemu_irq alarmirq,
omap_clk clk) omap_clk clk)
{ {
struct omap_rtc_s *s = (struct omap_rtc_s *) struct omap_rtc_s *s = g_new0(struct omap_rtc_s, 1);
g_malloc0(sizeof(struct omap_rtc_s));
s->irq = timerirq; s->irq = timerirq;
s->alarm = alarmirq; s->alarm = alarmirq;
@ -3468,8 +3461,7 @@ static struct omap_mcbsp_s *omap_mcbsp_init(MemoryRegion *system_memory,
qemu_irq txirq, qemu_irq rxirq, qemu_irq txirq, qemu_irq rxirq,
qemu_irq *dma, omap_clk clk) qemu_irq *dma, omap_clk clk)
{ {
struct omap_mcbsp_s *s = (struct omap_mcbsp_s *) struct omap_mcbsp_s *s = g_new0(struct omap_mcbsp_s, 1);
g_malloc0(sizeof(struct omap_mcbsp_s));
s->txirq = txirq; s->txirq = txirq;
s->rxirq = rxirq; s->rxirq = rxirq;
@ -3648,8 +3640,7 @@ static void omap_lpg_clk_update(void *opaque, int line, int on)
static struct omap_lpg_s *omap_lpg_init(MemoryRegion *system_memory, static struct omap_lpg_s *omap_lpg_init(MemoryRegion *system_memory,
hwaddr base, omap_clk clk) hwaddr base, omap_clk clk)
{ {
struct omap_lpg_s *s = (struct omap_lpg_s *) struct omap_lpg_s *s = g_new0(struct omap_lpg_s, 1);
g_malloc0(sizeof(struct omap_lpg_s));
s->tm = timer_new_ms(QEMU_CLOCK_VIRTUAL, omap_lpg_tick, s); s->tm = timer_new_ms(QEMU_CLOCK_VIRTUAL, omap_lpg_tick, s);
@ -3853,8 +3844,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory,
const char *core) const char *core)
{ {
int i; int i;
struct omap_mpu_state_s *s = (struct omap_mpu_state_s *) struct omap_mpu_state_s *s = g_new0(struct omap_mpu_state_s, 1);
g_malloc0(sizeof(struct omap_mpu_state_s));
qemu_irq dma_irqs[6]; qemu_irq dma_irqs[6];
DriveInfo *dinfo; DriveInfo *dinfo;
SysBusDevice *busdev; SysBusDevice *busdev;

15
hw/arm/omap2.c
View File

@ -596,8 +596,7 @@ static const MemoryRegionOps omap_eac_ops = {
static struct omap_eac_s *omap_eac_init(struct omap_target_agent_s *ta, static struct omap_eac_s *omap_eac_init(struct omap_target_agent_s *ta,
qemu_irq irq, qemu_irq *drq, omap_clk fclk, omap_clk iclk) qemu_irq irq, qemu_irq *drq, omap_clk fclk, omap_clk iclk)
{ {
struct omap_eac_s *s = (struct omap_eac_s *) struct omap_eac_s *s = g_new0(struct omap_eac_s, 1);
g_malloc0(sizeof(struct omap_eac_s));
s->irq = irq; s->irq = irq;
s->codec.rxdrq = *drq ++; s->codec.rxdrq = *drq ++;
@ -788,8 +787,7 @@ static struct omap_sti_s *omap_sti_init(struct omap_target_agent_s *ta,
hwaddr channel_base, qemu_irq irq, omap_clk clk, hwaddr channel_base, qemu_irq irq, omap_clk clk,
CharDriverState *chr) CharDriverState *chr)
{ {
struct omap_sti_s *s = (struct omap_sti_s *) struct omap_sti_s *s = g_new0(struct omap_sti_s, 1);
g_malloc0(sizeof(struct omap_sti_s));
s->irq = irq; s->irq = irq;
omap_sti_reset(s); omap_sti_reset(s);
@ -1806,8 +1804,7 @@ static struct omap_prcm_s *omap_prcm_init(struct omap_target_agent_s *ta,
qemu_irq mpu_int, qemu_irq dsp_int, qemu_irq iva_int, qemu_irq mpu_int, qemu_irq dsp_int, qemu_irq iva_int,
struct omap_mpu_state_s *mpu) struct omap_mpu_state_s *mpu)
{ {
struct omap_prcm_s *s = (struct omap_prcm_s *) struct omap_prcm_s *s = g_new0(struct omap_prcm_s, 1);
g_malloc0(sizeof(struct omap_prcm_s));
s->irq[0] = mpu_int; s->irq[0] = mpu_int;
s->irq[1] = dsp_int; s->irq[1] = dsp_int;
@ -2185,8 +2182,7 @@ static void omap_sysctl_reset(struct omap_sysctl_s *s)
static struct omap_sysctl_s *omap_sysctl_init(struct omap_target_agent_s *ta, static struct omap_sysctl_s *omap_sysctl_init(struct omap_target_agent_s *ta,
omap_clk iclk, struct omap_mpu_state_s *mpu) omap_clk iclk, struct omap_mpu_state_s *mpu)
{ {
struct omap_sysctl_s *s = (struct omap_sysctl_s *) struct omap_sysctl_s *s = g_new0(struct omap_sysctl_s, 1);
g_malloc0(sizeof(struct omap_sysctl_s));
s->mpu = mpu; s->mpu = mpu;
omap_sysctl_reset(s); omap_sysctl_reset(s);
@ -2248,8 +2244,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem,
unsigned long sdram_size, unsigned long sdram_size,
const char *core) const char *core)
{ {
struct omap_mpu_state_s *s = (struct omap_mpu_state_s *) struct omap_mpu_state_s *s = g_new0(struct omap_mpu_state_s, 1);
g_malloc0(sizeof(struct omap_mpu_state_s));
qemu_irq dma_irqs[4]; qemu_irq dma_irqs[4];
DriveInfo *dinfo; DriveInfo *dinfo;
int i; int i;

11
hw/arm/pxa2xx.c
View File

@ -1731,8 +1731,7 @@ static PXA2xxI2SState *pxa2xx_i2s_init(MemoryRegion *sysmem,
hwaddr base, hwaddr base,
qemu_irq irq, qemu_irq rx_dma, qemu_irq tx_dma) qemu_irq irq, qemu_irq rx_dma, qemu_irq tx_dma)
{ {
PXA2xxI2SState *s = (PXA2xxI2SState *) PXA2xxI2SState *s = g_new0(PXA2xxI2SState, 1);
g_malloc0(sizeof(PXA2xxI2SState));
s->irq = irq; s->irq = irq;
s->rx_dma = rx_dma; s->rx_dma = rx_dma;
@ -2061,7 +2060,7 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space,
PXA2xxState *s; PXA2xxState *s;
int i; int i;
DriveInfo *dinfo; DriveInfo *dinfo;
s = (PXA2xxState *) g_malloc0(sizeof(PXA2xxState)); s = g_new0(PXA2xxState, 1);
if (revision && strncmp(revision, "pxa27", 5)) { if (revision && strncmp(revision, "pxa27", 5)) {
fprintf(stderr, "Machine requires a PXA27x processor.\n"); fprintf(stderr, "Machine requires a PXA27x processor.\n");
@ -2157,7 +2156,7 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space,
vmstate_register(NULL, 0, &vmstate_pxa2xx_pm, s); vmstate_register(NULL, 0, &vmstate_pxa2xx_pm, s);
for (i = 0; pxa27x_ssp[i].io_base; i ++); for (i = 0; pxa27x_ssp[i].io_base; i ++);
s->ssp = (SSIBus **)g_malloc0(sizeof(SSIBus *) * i); s->ssp = g_new0(SSIBus *, i);
for (i = 0; pxa27x_ssp[i].io_base; i ++) { for (i = 0; pxa27x_ssp[i].io_base; i ++) {
DeviceState *dev; DeviceState *dev;
dev = sysbus_create_simple(TYPE_PXA2XX_SSP, pxa27x_ssp[i].io_base, dev = sysbus_create_simple(TYPE_PXA2XX_SSP, pxa27x_ssp[i].io_base,
@ -2202,7 +2201,7 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size)
int i; int i;
DriveInfo *dinfo; DriveInfo *dinfo;
s = (PXA2xxState *) g_malloc0(sizeof(PXA2xxState)); s = g_new0(PXA2xxState, 1);
s->cpu = cpu_arm_init("pxa255"); s->cpu = cpu_arm_init("pxa255");
if (s->cpu == NULL) { if (s->cpu == NULL) {
@ -2290,7 +2289,7 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size)
vmstate_register(NULL, 0, &vmstate_pxa2xx_pm, s); vmstate_register(NULL, 0, &vmstate_pxa2xx_pm, s);
for (i = 0; pxa255_ssp[i].io_base; i ++); for (i = 0; pxa255_ssp[i].io_base; i ++);
s->ssp = (SSIBus **)g_malloc0(sizeof(SSIBus *) * i); s->ssp = g_new0(SSIBus *, i);
for (i = 0; pxa255_ssp[i].io_base; i ++) { for (i = 0; pxa255_ssp[i].io_base; i ++) {
DeviceState *dev; DeviceState *dev;
dev = sysbus_create_simple(TYPE_PXA2XX_SSP, pxa255_ssp[i].io_base, dev = sysbus_create_simple(TYPE_PXA2XX_SSP, pxa255_ssp[i].io_base,

2
hw/arm/stellaris.c
View File

@ -675,7 +675,7 @@ static int stellaris_sys_init(uint32_t base, qemu_irq irq,
{ {
ssys_state *s; ssys_state *s;
s = (ssys_state *)g_malloc0(sizeof(ssys_state)); s = g_new0(ssys_state, 1);
s->irq = irq; s->irq = irq;
s->board = board; s->board = board;
/* Most devices come preprogrammed with a MAC address in the user data. */ /* Most devices come preprogrammed with a MAC address in the user data. */

2
hw/arm/strongarm.c
View File

@ -1588,7 +1588,7 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem,
StrongARMState *s; StrongARMState *s;
int i; int i;
s = g_malloc0(sizeof(StrongARMState)); s = g_new0(StrongARMState, 1);
if (!rev) { if (!rev) {
rev = "sa1110-b5"; rev = "sa1110-b5";

3
hw/char/omap_uart.c
View File

@ -55,8 +55,7 @@ struct omap_uart_s *omap_uart_init(hwaddr base,
qemu_irq txdma, qemu_irq rxdma, qemu_irq txdma, qemu_irq rxdma,
const char *label, CharDriverState *chr) const char *label, CharDriverState *chr)
{ {
struct omap_uart_s *s = (struct omap_uart_s *) struct omap_uart_s *s = g_new0(struct omap_uart_s, 1);
g_malloc0(sizeof(struct omap_uart_s));
s->base = base; s->base = base;
s->fclk = fclk; s->fclk = fclk;

3
hw/display/omap_dss.c
View File

@ -1051,8 +1051,7 @@ struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta,
omap_clk fck1, omap_clk fck2, omap_clk ck54m, omap_clk fck1, omap_clk fck2, omap_clk ck54m,
omap_clk ick1, omap_clk ick2) omap_clk ick1, omap_clk ick2)
{ {
struct omap_dss_s *s = (struct omap_dss_s *) struct omap_dss_s *s = g_new0(struct omap_dss_s, 1);
g_malloc0(sizeof(struct omap_dss_s));
s->irq = irq; s->irq = irq;
s->drq = drq; s->drq = drq;

3
hw/display/omap_lcdc.c
View File

@ -403,8 +403,7 @@ struct omap_lcd_panel_s *omap_lcdc_init(MemoryRegion *sysmem,
struct omap_dma_lcd_channel_s *dma, struct omap_dma_lcd_channel_s *dma,
omap_clk clk) omap_clk clk)
{ {
struct omap_lcd_panel_s *s = (struct omap_lcd_panel_s *) struct omap_lcd_panel_s *s = g_new0(struct omap_lcd_panel_s, 1);
g_malloc0(sizeof(struct omap_lcd_panel_s));
s->irq = irq; s->irq = irq;
s->dma = dma; s->dma = dma;

6
hw/dma/omap_dma.c
View File

@ -1626,8 +1626,7 @@ struct soc_dma_s *omap_dma_init(hwaddr base, qemu_irq *irqs,
enum omap_dma_model model) enum omap_dma_model model)
{ {
int num_irqs, memsize, i; int num_irqs, memsize, i;
struct omap_dma_s *s = (struct omap_dma_s *) struct omap_dma_s *s = g_new0(struct omap_dma_s, 1);
g_malloc0(sizeof(struct omap_dma_s));
if (model <= omap_dma_3_1) { if (model <= omap_dma_3_1) {
num_irqs = 6; num_irqs = 6;
@ -2061,8 +2060,7 @@ struct soc_dma_s *omap_dma4_init(hwaddr base, qemu_irq *irqs,
int chans, omap_clk iclk, omap_clk fclk) int chans, omap_clk iclk, omap_clk fclk)
{ {
int i; int i;
struct omap_dma_s *s = (struct omap_dma_s *) struct omap_dma_s *s = g_new0(struct omap_dma_s, 1);
g_malloc0(sizeof(struct omap_dma_s));
s->model = omap_dma_4; s->model = omap_dma_4;
s->chans = chans; s->chans = chans;

4
hw/gpio/omap_gpio.c
View File

@ -710,8 +710,8 @@ static int omap2_gpio_init(SysBusDevice *sbd)
} else { } else {
s->modulecount = 6; s->modulecount = 6;
} }
s->modules = g_malloc0(s->modulecount * sizeof(struct omap2_gpio_s)); s->modules = g_new0(struct omap2_gpio_s, s->modulecount);
s->handler = g_malloc0(s->modulecount * 32 * sizeof(qemu_irq)); s->handler = g_new0(qemu_irq, s->modulecount * 32);
qdev_init_gpio_in(dev, omap2_gpio_set, s->modulecount * 32); qdev_init_gpio_in(dev, omap2_gpio_set, s->modulecount * 32);
qdev_init_gpio_out(dev, s->handler, s->modulecount * 32); qdev_init_gpio_out(dev, s->handler, s->modulecount * 32);
for (i = 0; i < s->modulecount; i++) { for (i = 0; i < s->modulecount; i++) {

4
hw/input/stellaris_input.c
View File

@ -75,8 +75,8 @@ void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode)
gamepad_state *s; gamepad_state *s;
int i; int i;
s = (gamepad_state *)g_malloc0(sizeof (gamepad_state)); s = g_new0(gamepad_state, 1);
s->buttons = (gamepad_button *)g_malloc0(n * sizeof (gamepad_button)); s->buttons = g_new0(gamepad_button, n);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
s->buttons[i].irq = irq[i]; s->buttons[i].irq = irq[i];
s->buttons[i].keycode = keycode[i]; s->buttons[i].keycode = keycode[i];

2
hw/misc/omap_clk.c
View File

@ -1239,7 +1239,7 @@ void omap_clk_init(struct omap_mpu_state_s *mpu)
for (i = onchip_clks, count = 0; *i; i ++) for (i = onchip_clks, count = 0; *i; i ++)
if ((*i)->flags & flag) if ((*i)->flags & flag)
count ++; count ++;
mpu->clks = (struct clk *) g_malloc0(sizeof(struct clk) * (count + 1)); mpu->clks = g_new0(struct clk, count + 1);
for (i = onchip_clks, j = mpu->clks; *i; i ++) for (i = onchip_clks, j = mpu->clks; *i; i ++)
if ((*i)->flags & flag) { if ((*i)->flags & flag) {
memcpy(j, *i, sizeof(struct clk)); memcpy(j, *i, sizeof(struct clk));

3
hw/misc/omap_gpmc.c
View File

@ -826,8 +826,7 @@ struct omap_gpmc_s *omap_gpmc_init(struct omap_mpu_state_s *mpu,
qemu_irq irq, qemu_irq drq) qemu_irq irq, qemu_irq drq)
{ {
int cs; int cs;
struct omap_gpmc_s *s = (struct omap_gpmc_s *) struct omap_gpmc_s *s = g_new0(struct omap_gpmc_s, 1);
g_malloc0(sizeof(struct omap_gpmc_s));
memory_region_init_io(&s->iomem, NULL, &omap_gpmc_ops, s, "omap-gpmc", 0x1000); memory_region_init_io(&s->iomem, NULL, &omap_gpmc_ops, s, "omap-gpmc", 0x1000);
memory_region_add_subregion(get_system_memory(), base, &s->iomem); memory_region_add_subregion(get_system_memory(), base, &s->iomem);

3
hw/misc/omap_sdrc.c
View File

@ -157,8 +157,7 @@ static const MemoryRegionOps omap_sdrc_ops = {
struct omap_sdrc_s *omap_sdrc_init(MemoryRegion *sysmem, struct omap_sdrc_s *omap_sdrc_init(MemoryRegion *sysmem,
hwaddr base) hwaddr base)
{ {
struct omap_sdrc_s *s = (struct omap_sdrc_s *) struct omap_sdrc_s *s = g_new0(struct omap_sdrc_s, 1);
g_malloc0(sizeof(struct omap_sdrc_s));
omap_sdrc_reset(s); omap_sdrc_reset(s);

6
hw/sd/omap_mmc.c
View File

@ -578,8 +578,7 @@ struct omap_mmc_s *omap_mmc_init(hwaddr base,
BlockBackend *blk, BlockBackend *blk,
qemu_irq irq, qemu_irq dma[], omap_clk clk) qemu_irq irq, qemu_irq dma[], omap_clk clk)
{ {
struct omap_mmc_s *s = (struct omap_mmc_s *) struct omap_mmc_s *s = g_new0(struct omap_mmc_s, 1);
g_malloc0(sizeof(struct omap_mmc_s));
s->irq = irq; s->irq = irq;
s->dma = dma; s->dma = dma;
@ -605,8 +604,7 @@ struct omap_mmc_s *omap2_mmc_init(struct omap_target_agent_s *ta,
BlockBackend *blk, qemu_irq irq, qemu_irq dma[], BlockBackend *blk, qemu_irq irq, qemu_irq dma[],
omap_clk fclk, omap_clk iclk) omap_clk fclk, omap_clk iclk)
{ {
struct omap_mmc_s *s = (struct omap_mmc_s *) struct omap_mmc_s *s = g_new0(struct omap_mmc_s, 1);
g_malloc0(sizeof(struct omap_mmc_s));
s->irq = irq; s->irq = irq;
s->dma = dma; s->dma = dma;

3
hw/ssi/omap_spi.c
View File

@ -342,8 +342,7 @@ static const MemoryRegionOps omap_mcspi_ops = {
struct omap_mcspi_s *omap_mcspi_init(struct omap_target_agent_s *ta, int chnum, struct omap_mcspi_s *omap_mcspi_init(struct omap_target_agent_s *ta, int chnum,
qemu_irq irq, qemu_irq *drq, omap_clk fclk, omap_clk iclk) qemu_irq irq, qemu_irq *drq, omap_clk fclk, omap_clk iclk)
{ {
struct omap_mcspi_s *s = (struct omap_mcspi_s *) struct omap_mcspi_s *s = g_new0(struct omap_mcspi_s, 1);
g_malloc0(sizeof(struct omap_mcspi_s));
struct omap_mcspi_ch_s *ch = s->ch; struct omap_mcspi_ch_s *ch = s->ch;
s->irq = irq; s->irq = irq;

3
hw/timer/omap_gptimer.c
View File

@ -468,8 +468,7 @@ static const MemoryRegionOps omap_gp_timer_ops = {
struct omap_gp_timer_s *omap_gp_timer_init(struct omap_target_agent_s *ta, struct omap_gp_timer_s *omap_gp_timer_init(struct omap_target_agent_s *ta,
qemu_irq irq, omap_clk fclk, omap_clk iclk) qemu_irq irq, omap_clk fclk, omap_clk iclk)
{ {
struct omap_gp_timer_s *s = (struct omap_gp_timer_s *) struct omap_gp_timer_s *s = g_new0(struct omap_gp_timer_s, 1);
g_malloc0(sizeof(struct omap_gp_timer_s));
s->ta = ta; s->ta = ta;
s->irq = irq; s->irq = irq;