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]
89 lines
2.4 KiB
C
89 lines
2.4 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2 or later, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef HW_PL011_H
|
|
#define HW_PL011_H
|
|
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/sysbus.h"
|
|
#include "chardev/char-fe.h"
|
|
#include "qapi/error.h"
|
|
|
|
#define TYPE_PL011 "pl011"
|
|
#define PL011(obj) OBJECT_CHECK(PL011State, (obj), TYPE_PL011)
|
|
|
|
/* This shares the same struct (and cast macro) as the base pl011 device */
|
|
#define TYPE_PL011_LUMINARY "pl011_luminary"
|
|
|
|
typedef struct PL011State {
|
|
SysBusDevice parent_obj;
|
|
|
|
MemoryRegion iomem;
|
|
uint32_t readbuff;
|
|
uint32_t flags;
|
|
uint32_t lcr;
|
|
uint32_t rsr;
|
|
uint32_t cr;
|
|
uint32_t dmacr;
|
|
uint32_t int_enabled;
|
|
uint32_t int_level;
|
|
uint32_t read_fifo[16];
|
|
uint32_t ilpr;
|
|
uint32_t ibrd;
|
|
uint32_t fbrd;
|
|
uint32_t ifl;
|
|
int read_pos;
|
|
int read_count;
|
|
int read_trigger;
|
|
CharBackend chr;
|
|
qemu_irq irq[6];
|
|
const unsigned char *id;
|
|
} PL011State;
|
|
|
|
static inline DeviceState *pl011_create(hwaddr addr,
|
|
qemu_irq irq,
|
|
Chardev *chr)
|
|
{
|
|
DeviceState *dev;
|
|
SysBusDevice *s;
|
|
|
|
dev = qdev_new("pl011");
|
|
s = SYS_BUS_DEVICE(dev);
|
|
qdev_prop_set_chr(dev, "chardev", chr);
|
|
qdev_realize_and_unref(dev, NULL, &error_fatal);
|
|
sysbus_mmio_map(s, 0, addr);
|
|
sysbus_connect_irq(s, 0, irq);
|
|
|
|
return dev;
|
|
}
|
|
|
|
static inline DeviceState *pl011_luminary_create(hwaddr addr,
|
|
qemu_irq irq,
|
|
Chardev *chr)
|
|
{
|
|
DeviceState *dev;
|
|
SysBusDevice *s;
|
|
|
|
dev = qdev_new("pl011_luminary");
|
|
s = SYS_BUS_DEVICE(dev);
|
|
qdev_prop_set_chr(dev, "chardev", chr);
|
|
qdev_realize_and_unref(dev, NULL, &error_fatal);
|
|
sysbus_mmio_map(s, 0, addr);
|
|
sysbus_connect_irq(s, 0, irq);
|
|
|
|
return dev;
|
|
}
|
|
|
|
#endif
|