motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 09:13:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/core: Introduce device_class_set_props_n

Browse source 
Record the size of the array in DeviceClass.props_count_.
Iterate with known count in qdev_prop_walk.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Lei Yang <leiyang@redhat.com>
Link: https://lore.kernel.org/r/20241218134251.4724-14-richard.henderson@linaro.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Richard Henderson 2024-12-18 07:42:40 -06:00 • committed by Paolo Bonzini
parent 588611972f
commit cb9f4b28ee
4 changed files with 55 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
hw/core/qdev-properties.c
View file

@ -749,16 +749,13 @@ const PropertyInfo qdev_prop_array = {
/* --- public helpers --- */
static const Property *qdev_prop_walk(const Property *props, const char *name)
static const Property *qdev_prop_walk(DeviceClass *cls, const char *name)
{
if (!props) {
return NULL;
}
while (props->name) {
if (strcmp(props->name, name) == 0) {
return props;
for (int i = 0, n = cls->props_count_; i < n; ++i) {
const Property *prop = &cls->props_[i];
if (strcmp(prop->name, name) == 0) {
return prop;
}
props++;
}
return NULL;
}
@ -771,7 +768,7 @@ static const Property *qdev_prop_find(DeviceState *dev, const char *name)
/* device properties */
class = object_get_class(OBJECT(dev));
do {
prop = qdev_prop_walk(DEVICE_CLASS(class)->props_, name);
prop = qdev_prop_walk(DEVICE_CLASS(class), name);
if (prop) {
return prop;
}
@ -1064,9 +1061,31 @@ static void qdev_class_add_legacy_property(DeviceClass *dc, const Property *prop
void (device_class_set_props)(DeviceClass *dc, const Property *props)
{
const Property *prop;
size_t n;
dc->props_ = props;
for (prop = props; prop && prop->name; prop++) {
for (prop = props, n = 0; prop && prop->name; prop++, n++) {
qdev_class_add_legacy_property(dc, prop);
qdev_class_add_property(dc, prop->name, prop);
}
/* We used a hole in DeviceClass because that's still a lot. */
assert(n <= UINT16_MAX);
dc->props_count_ = n;
}
void device_class_set_props_n(DeviceClass *dc, const Property *props, size_t n)
{
/* We used a hole in DeviceClass because that's still a lot. */
assert(n <= UINT16_MAX);
assert(n != 0);
dc->props_ = props;
dc->props_count_ = n;
for (size_t i = 0; i < n; ++i) {
const Property *prop = &props[i];
assert(prop->name);
qdev_class_add_legacy_property(dc, prop);
qdev_class_add_property(dc, prop->name, prop);
}

1
hw/core/qdev.c
View file

@ -703,6 +703,7 @@ static void device_class_base_init(ObjectClass *class, void *data)
* so do not propagate them to the subclasses.
*/
klass->props_ = NULL;
klass->props_count_ = 0;
}
static void device_unparent(Object *obj)