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

qom: Have class_base_init() take a const data argument

Browse source 
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250424194905.82506-3-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-02-09 22:15:54 +01:00
parent fbb23135d6
commit f1fa787b92
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/core/machine.c
View file

@ -1243,7 +1243,7 @@ static void machine_class_init(ObjectClass *oc, void *data)
"Memory size configuration"); "Memory size configuration");
} }
static void machine_class_base_init(ObjectClass *oc, void *data) static void machine_class_base_init(ObjectClass *oc, const void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
mc->max_cpus = mc->max_cpus ?: 1; mc->max_cpus = mc->max_cpus ?: 1;

2
hw/core/qdev.c
View file

@ -693,7 +693,7 @@ static void device_finalize(Object *obj)
g_free(dev->id); g_free(dev->id);
} }
static void device_class_base_init(ObjectClass *class, void *data) static void device_class_base_init(ObjectClass *class, const void *data)
{ {
DeviceClass *klass = DEVICE_CLASS(class); DeviceClass *klass = DEVICE_CLASS(class);

2
hw/pci/pci.c
View file

@ -2809,7 +2809,7 @@ static void pci_device_class_init(ObjectClass *klass, void *data)
"access to indirect DMA memory"); "access to indirect DMA memory");
} }
static void pci_device_class_base_init(ObjectClass *klass, void *data) static void pci_device_class_base_init(ObjectClass *klass, const void *data)
{ {
if (!object_class_is_abstract(klass)) { if (!object_class_is_abstract(klass)) {
ObjectClass *conventional = ObjectClass *conventional =

2
include/qom/object.h
View file

@ -487,7 +487,7 @@ struct TypeInfo
size_t class_size; size_t class_size;
void (*class_init)(ObjectClass *klass, void *data); void (*class_init)(ObjectClass *klass, void *data);
void (*class_base_init)(ObjectClass *klass, void *data); void (*class_base_init)(ObjectClass *klass, const void *data);
void *class_data; void *class_data;
InterfaceInfo *interfaces; InterfaceInfo *interfaces;

2
qom/object.c
View file

@ -55,7 +55,7 @@ struct TypeImpl
size_t instance_align; size_t instance_align;
void (*class_init)(ObjectClass *klass, void *data); void (*class_init)(ObjectClass *klass, void *data);
void (*class_base_init)(ObjectClass *klass, void *data); void (*class_base_init)(ObjectClass *klass, const void *data);
void *class_data; void *class_data;

2
rust/qemu-api/src/qom.rs
View file

@ -492,7 +492,7 @@ pub trait ObjectImpl: ObjectType + IsA<Object> {
/// the effects of copying the contents of the parent's class struct /// the effects of copying the contents of the parent's class struct
/// to the descendants. /// to the descendants.
const CLASS_BASE_INIT: Option< const CLASS_BASE_INIT: Option<
unsafe extern "C" fn(klass: *mut ObjectClass, data: *mut c_void), unsafe extern "C" fn(klass: *mut ObjectClass, data: *const c_void),
> = None; > = None;
const TYPE_INFO: TypeInfo = TypeInfo { const TYPE_INFO: TypeInfo = TypeInfo {