mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-28 21:03:54 -06:00
qom: Have class_base_init() take a const data argument
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:
parent
fbb23135d6
commit
f1fa787b92
6 changed files with 6 additions and 6 deletions
|
@ -1243,7 +1243,7 @@ static void machine_class_init(ObjectClass *oc, void *data)
|
|||
"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);
|
||||
mc->max_cpus = mc->max_cpus ?: 1;
|
||||
|
|
|
@ -693,7 +693,7 @@ static void device_finalize(Object *obj)
|
|||
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);
|
||||
|
||||
|
|
|
@ -2809,7 +2809,7 @@ static void pci_device_class_init(ObjectClass *klass, void *data)
|
|||
"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)) {
|
||||
ObjectClass *conventional =
|
||||
|
|
|
@ -487,7 +487,7 @@ struct TypeInfo
|
|||
size_t class_size;
|
||||
|
||||
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;
|
||||
|
||||
InterfaceInfo *interfaces;
|
||||
|
|
|
@ -55,7 +55,7 @@ struct TypeImpl
|
|||
size_t instance_align;
|
||||
|
||||
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;
|
||||
|
||||
|
|
|
@ -492,7 +492,7 @@ pub trait ObjectImpl: ObjectType + IsA<Object> {
|
|||
/// the effects of copying the contents of the parent's class struct
|
||||
/// to the descendants.
|
||||
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;
|
||||
|
||||
const TYPE_INFO: TypeInfo = TypeInfo {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue