mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 02:24:58 -06:00
qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
void object_property_set_FOO(Object *obj, FOO_TYPE value,
const char *name, Error **errp)
Having to pass value before name feels grating. Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
@@
identifier fun = {
object_property_get, object_property_parse, object_property_set_str,
object_property_set_link, object_property_set_bool,
object_property_set_int, object_property_set_uint, object_property_set,
object_property_set_qobject
};
expression obj, v, name, errp;
@@
- fun(obj, v, name, errp)
+ fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information". Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually. The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b
"audio: set default
value for pcspk.iobase property" resolved]
This commit is contained in:
parent
1c94a35164
commit
5325cc34a2
138 changed files with 712 additions and 741 deletions
|
@ -57,9 +57,8 @@ static void virtio_crypto_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|||
if (!qdev_realize(vdev, BUS(&vpci_dev->bus), errp)) {
|
||||
return;
|
||||
}
|
||||
object_property_set_link(OBJECT(vcrypto),
|
||||
OBJECT(vcrypto->vdev.conf.cryptodev), "cryptodev",
|
||||
NULL);
|
||||
object_property_set_link(OBJECT(vcrypto), "cryptodev",
|
||||
OBJECT(vcrypto->vdev.conf.cryptodev), NULL);
|
||||
}
|
||||
|
||||
static void virtio_crypto_pci_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
@ -65,9 +65,9 @@ static void virtio_iommu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|||
error_append_hint(errp, "Valid values are 0 and 1\n");
|
||||
}
|
||||
}
|
||||
object_property_set_link(OBJECT(dev),
|
||||
object_property_set_link(OBJECT(dev), "primary-bus",
|
||||
OBJECT(pci_get_bus(&vpci_dev->pci_dev)),
|
||||
"primary-bus", &error_abort);
|
||||
&error_abort);
|
||||
qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
|
||||
}
|
||||
|
||||
|
|
|
@ -22,13 +22,13 @@ static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|||
DeviceState *vdev = DEVICE(&mem_pci->vdev);
|
||||
|
||||
qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
|
||||
object_property_set_bool(OBJECT(vdev), true, "realized", errp);
|
||||
object_property_set_bool(OBJECT(vdev), "realized", true, errp);
|
||||
}
|
||||
|
||||
static void virtio_mem_pci_set_addr(MemoryDeviceState *md, uint64_t addr,
|
||||
Error **errp)
|
||||
{
|
||||
object_property_set_uint(OBJECT(md), addr, VIRTIO_MEM_ADDR_PROP, errp);
|
||||
object_property_set_uint(OBJECT(md), VIRTIO_MEM_ADDR_PROP, addr, errp);
|
||||
}
|
||||
|
||||
static uint64_t virtio_mem_pci_get_addr(const MemoryDeviceState *md)
|
||||
|
|
|
@ -28,7 +28,7 @@ static void virtio_pmem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|||
static void virtio_pmem_pci_set_addr(MemoryDeviceState *md, uint64_t addr,
|
||||
Error **errp)
|
||||
{
|
||||
object_property_set_uint(OBJECT(md), addr, VIRTIO_PMEM_ADDR_PROP, errp);
|
||||
object_property_set_uint(OBJECT(md), VIRTIO_PMEM_ADDR_PROP, addr, errp);
|
||||
}
|
||||
|
||||
static uint64_t virtio_pmem_pci_get_addr(const MemoryDeviceState *md)
|
||||
|
|
|
@ -41,8 +41,7 @@ static void virtio_rng_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|||
return;
|
||||
}
|
||||
|
||||
object_property_set_link(OBJECT(vrng),
|
||||
OBJECT(vrng->vdev.conf.rng), "rng",
|
||||
object_property_set_link(OBJECT(vrng), "rng", OBJECT(vrng->vdev.conf.rng),
|
||||
NULL);
|
||||
}
|
||||
|
||||
|
|
|
@ -208,8 +208,8 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp)
|
|||
/* The child property took a reference, we can safely drop ours now */
|
||||
object_unref(default_backend);
|
||||
|
||||
object_property_set_link(OBJECT(dev), default_backend,
|
||||
"rng", &error_abort);
|
||||
object_property_set_link(OBJECT(dev), "rng", default_backend,
|
||||
&error_abort);
|
||||
}
|
||||
|
||||
vrng->rng = vrng->conf.rng;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue