mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 18:23:57 -06:00
hw/core: Remove device_class_set_props function
All uses of device_class_set_props() are now using arrays. Validate this compile-time in the device_class_set_props macro and call device_class_set_props_n using the known size of the array. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Tested-by: Lei Yang <leiyang@redhat.com> Link: https://lore.kernel.org/r/20241218134251.4724-19-richard.henderson@linaro.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
5f99764869
commit
1088d41795
2 changed files with 6 additions and 26 deletions
|
@ -948,22 +948,18 @@ char *qdev_get_own_fw_dev_path_from_handler(BusState *bus, DeviceState *dev);
|
|||
* To modify an inherited property you need to use????
|
||||
*
|
||||
* Validate that @props has at least one Property plus the terminator.
|
||||
* Validate that @props is an array, not a pointer, via ARRAY_SIZE.
|
||||
* Validate that the array is terminated at compile-time (with -O2),
|
||||
* which requires the array to be const.
|
||||
*/
|
||||
void device_class_set_props(DeviceClass *dc, const Property *props);
|
||||
|
||||
#define device_class_set_props(dc, props) \
|
||||
do { \
|
||||
QEMU_BUILD_BUG_ON(sizeof(props) != sizeof(const Property *) && \
|
||||
sizeof(props) < 2 * sizeof(Property)); \
|
||||
if (sizeof(props) != sizeof(const Property *)) { \
|
||||
size_t props_count_ = sizeof(props) / sizeof(Property) - 1; \
|
||||
if ((props)[props_count_].name != NULL) { \
|
||||
qemu_build_not_reached(); \
|
||||
} \
|
||||
QEMU_BUILD_BUG_ON(sizeof(props) == 0); \
|
||||
size_t props_count_ = ARRAY_SIZE(props) - 1; \
|
||||
if ((props)[props_count_].name != NULL) { \
|
||||
qemu_build_not_reached(); \
|
||||
} \
|
||||
(device_class_set_props)((dc), (props)); \
|
||||
device_class_set_props_n((dc), (props), props_count_); \
|
||||
} while (0)
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue