| Message ID | 1440107676-17326-10-git-send-email-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 08/21/2015 12:54 AM, Eduardo Habkost wrote: > Now that all non-abstract TYPE_MACHINE subclasses have the -machine > suffix, add an assert to ensure this will be always true. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > hw/core/machine.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index ac4654e..e50c4b7 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -302,6 +302,14 @@ static void machine_class_init(ObjectClass *oc, void *data) > mc->default_ram_size = 128 * M_BYTE; > } > > +static void machine_class_base_init(ObjectClass *oc, void *data) > +{ > + if (!object_class_is_abstract(oc)) { > + const char *cname = object_class_get_name(oc); > + assert(g_str_has_suffix(cname, TYPE_MACHINE_SUFFIX)); > + } > +} > + > static void machine_initfn(Object *obj) > { > MachineState *ms = MACHINE(obj); > @@ -472,6 +480,7 @@ static const TypeInfo machine_info = { > .abstract = true, > .class_size = sizeof(MachineClass), > .class_init = machine_class_init, > + .class_base_init = machine_class_base_init, > .instance_size = sizeof(MachineState), > .instance_init = machine_initfn, > .instance_finalize = machine_finalize, > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Thanks, Marcel
diff --git a/hw/core/machine.c b/hw/core/machine.c index ac4654e..e50c4b7 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -302,6 +302,14 @@ static void machine_class_init(ObjectClass *oc, void *data) mc->default_ram_size = 128 * M_BYTE; } +static void machine_class_base_init(ObjectClass *oc, void *data) +{ + if (!object_class_is_abstract(oc)) { + const char *cname = object_class_get_name(oc); + assert(g_str_has_suffix(cname, TYPE_MACHINE_SUFFIX)); + } +} + static void machine_initfn(Object *obj) { MachineState *ms = MACHINE(obj); @@ -472,6 +480,7 @@ static const TypeInfo machine_info = { .abstract = true, .class_size = sizeof(MachineClass), .class_init = machine_class_init, + .class_base_init = machine_class_base_init, .instance_size = sizeof(MachineState), .instance_init = machine_initfn, .instance_finalize = machine_finalize,
Now that all non-abstract TYPE_MACHINE subclasses have the -machine suffix, add an assert to ensure this will be always true. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- hw/core/machine.c | 9 +++++++++ 1 file changed, 9 insertions(+)