mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 01:33:56 -06:00
qdev: Convert uses of qdev_create() with Coccinelle
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]
This commit is contained in:
parent
dc3edf8d8a
commit
3e80f6902c
127 changed files with 581 additions and 552 deletions
|
@ -654,7 +654,7 @@ etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr,
|
|||
DeviceState *dev;
|
||||
qemu_check_nic_model(nd, "fseth");
|
||||
|
||||
dev = qdev_create(NULL, "etraxfs-eth");
|
||||
dev = qdev_new("etraxfs-eth");
|
||||
qdev_set_nic_properties(dev, nd);
|
||||
qdev_prop_set_uint32(dev, "phyaddr", phyaddr);
|
||||
|
||||
|
@ -668,7 +668,7 @@ etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr,
|
|||
*/
|
||||
ETRAX_FS_ETH(dev)->dma_out = dma_out;
|
||||
ETRAX_FS_ETH(dev)->dma_in = dma_in;
|
||||
qdev_init_nofail(dev);
|
||||
qdev_realize_and_unref(dev, NULL, &error_fatal);
|
||||
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
|
||||
|
||||
return dev;
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
#include "hw/qdev-properties.h"
|
||||
#include "etsec.h"
|
||||
#include "registers.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/log.h"
|
||||
#include "qemu/module.h"
|
||||
|
||||
|
@ -452,9 +453,9 @@ DeviceState *etsec_create(hwaddr base,
|
|||
{
|
||||
DeviceState *dev;
|
||||
|
||||
dev = qdev_create(NULL, "eTSEC");
|
||||
dev = qdev_new("eTSEC");
|
||||
qdev_set_nic_properties(dev, nd);
|
||||
qdev_init_nofail(dev);
|
||||
qdev_realize_and_unref(dev, NULL, &error_fatal);
|
||||
|
||||
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, tx_irq);
|
||||
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, rx_irq);
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "hw/net/lan9118.h"
|
||||
#include "hw/ptimer.h"
|
||||
#include "hw/qdev-properties.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/log.h"
|
||||
#include "qemu/module.h"
|
||||
/* For crc32 */
|
||||
|
@ -1394,9 +1395,9 @@ void lan9118_init(NICInfo *nd, uint32_t base, qemu_irq irq)
|
|||
SysBusDevice *s;
|
||||
|
||||
qemu_check_nic_model(nd, "lan9118");
|
||||
dev = qdev_create(NULL, TYPE_LAN9118);
|
||||
dev = qdev_new(TYPE_LAN9118);
|
||||
qdev_set_nic_properties(dev, nd);
|
||||
qdev_init_nofail(dev);
|
||||
qdev_realize_and_unref(dev, NULL, &error_fatal);
|
||||
s = SYS_BUS_DEVICE(dev);
|
||||
sysbus_mmio_map(s, 0, base);
|
||||
sysbus_connect_irq(s, 0, irq);
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "hw/sysbus.h"
|
||||
#include "net/eth.h"
|
||||
|
@ -126,11 +127,11 @@ SysBusI82596State *lasi_82596_init(MemoryRegion *addr_space,
|
|||
.a = { 0x08, 0x00, 0x09, 0xef, 0x34, 0xf6 } };
|
||||
|
||||
qemu_check_nic_model(&nd_table[0], TYPE_LASI_82596);
|
||||
dev = qdev_create(NULL, TYPE_LASI_82596);
|
||||
dev = qdev_new(TYPE_LASI_82596);
|
||||
s = SYSBUS_I82596(dev);
|
||||
s->state.irq = lan_irq;
|
||||
qdev_set_nic_properties(dev, &nd_table[0]);
|
||||
qdev_init_nofail(dev);
|
||||
qdev_realize_and_unref(dev, NULL, &error_fatal);
|
||||
s->state.conf.macaddr = HP_MAC; /* set HP MAC prefix */
|
||||
|
||||
/* LASI 82596 ports in main memory. */
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
#include "hw/irq.h"
|
||||
#include "hw/net/smc91c111.h"
|
||||
#include "hw/qdev-properties.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/log.h"
|
||||
#include "qemu/module.h"
|
||||
/* For crc32 */
|
||||
|
@ -821,9 +822,9 @@ void smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq)
|
|||
SysBusDevice *s;
|
||||
|
||||
qemu_check_nic_model(nd, "smc91c111");
|
||||
dev = qdev_create(NULL, TYPE_SMC91C111);
|
||||
dev = qdev_new(TYPE_SMC91C111);
|
||||
qdev_set_nic_properties(dev, nd);
|
||||
qdev_init_nofail(dev);
|
||||
qdev_realize_and_unref(dev, NULL, &error_fatal);
|
||||
s = SYS_BUS_DEVICE(dev);
|
||||
sysbus_mmio_map(s, 0, base);
|
||||
sysbus_connect_irq(s, 0, irq);
|
||||
|
|
|
@ -372,11 +372,11 @@ void spapr_vlan_create(SpaprVioBus *bus, NICInfo *nd)
|
|||
{
|
||||
DeviceState *dev;
|
||||
|
||||
dev = qdev_create(&bus->bus, "spapr-vlan");
|
||||
dev = qdev_new("spapr-vlan");
|
||||
|
||||
qdev_set_nic_properties(dev, nd);
|
||||
|
||||
qdev_init_nofail(dev);
|
||||
qdev_realize_and_unref(dev, &bus->bus, &error_fatal);
|
||||
}
|
||||
|
||||
static int spapr_vlan_devnode(SpaprVioDevice *dev, void *fdt, int node_off)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue