3e80f6902c
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
61 lines
1.6 KiB
C
61 lines
1.6 KiB
C
/*
|
|
* ARM CMSDK APB timer emulation
|
|
*
|
|
* Copyright (c) 2017 Linaro Limited
|
|
* Written by Peter Maydell
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#ifndef CMSDK_APB_TIMER_H
|
|
#define CMSDK_APB_TIMER_H
|
|
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/sysbus.h"
|
|
#include "hw/ptimer.h"
|
|
|
|
#define TYPE_CMSDK_APB_TIMER "cmsdk-apb-timer"
|
|
#define CMSDK_APB_TIMER(obj) OBJECT_CHECK(CMSDKAPBTIMER, (obj), \
|
|
TYPE_CMSDK_APB_TIMER)
|
|
|
|
typedef struct {
|
|
/*< private >*/
|
|
SysBusDevice parent_obj;
|
|
|
|
/*< public >*/
|
|
MemoryRegion iomem;
|
|
qemu_irq timerint;
|
|
uint32_t pclk_frq;
|
|
struct ptimer_state *timer;
|
|
|
|
uint32_t ctrl;
|
|
uint32_t value;
|
|
uint32_t reload;
|
|
uint32_t intstatus;
|
|
} CMSDKAPBTIMER;
|
|
|
|
/**
|
|
* cmsdk_apb_timer_create - convenience function to create TYPE_CMSDK_APB_TIMER
|
|
* @addr: location in system memory to map registers
|
|
* @pclk_frq: frequency in Hz of the PCLK clock (used for calculating baud rate)
|
|
*/
|
|
static inline DeviceState *cmsdk_apb_timer_create(hwaddr addr,
|
|
qemu_irq timerint,
|
|
uint32_t pclk_frq)
|
|
{
|
|
DeviceState *dev;
|
|
SysBusDevice *s;
|
|
|
|
dev = qdev_new(TYPE_CMSDK_APB_TIMER);
|
|
s = SYS_BUS_DEVICE(dev);
|
|
qdev_prop_set_uint32(dev, "pclk-frq", pclk_frq);
|
|
qdev_realize_and_unref(dev, NULL, &error_fatal);
|
|
sysbus_mmio_map(s, 0, addr);
|
|
sysbus_connect_irq(s, 0, timerint);
|
|
return dev;
|
|
}
|
|
|
|
#endif
|