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]
49 lines
1.1 KiB
C
49 lines
1.1 KiB
C
#ifndef HW_LM32_H
|
|
#define HW_LM32_H
|
|
|
|
#include "hw/char/lm32_juart.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "qapi/error.h"
|
|
|
|
static inline DeviceState *lm32_pic_init(qemu_irq cpu_irq)
|
|
{
|
|
DeviceState *dev;
|
|
SysBusDevice *d;
|
|
|
|
dev = qdev_new("lm32-pic");
|
|
qdev_realize_and_unref(dev, NULL, &error_fatal);
|
|
d = SYS_BUS_DEVICE(dev);
|
|
sysbus_connect_irq(d, 0, cpu_irq);
|
|
|
|
return dev;
|
|
}
|
|
|
|
static inline DeviceState *lm32_juart_init(Chardev *chr)
|
|
{
|
|
DeviceState *dev;
|
|
|
|
dev = qdev_new(TYPE_LM32_JUART);
|
|
qdev_prop_set_chr(dev, "chardev", chr);
|
|
qdev_realize_and_unref(dev, NULL, &error_fatal);
|
|
|
|
return dev;
|
|
}
|
|
|
|
static inline DeviceState *lm32_uart_create(hwaddr addr,
|
|
qemu_irq irq,
|
|
Chardev *chr)
|
|
{
|
|
DeviceState *dev;
|
|
SysBusDevice *s;
|
|
|
|
dev = qdev_new("lm32-uart");
|
|
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
|