| Message ID | 1394552156-18901-2-git-send-email-marcel.a@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, 2014-03-11 at 17:35 +0200, Marcel Apfelbaum wrote: > The QemuMachine assignment into the QOM machine it is common > to all machines until the conversion is over. It is not > specific to vl.c . This also helps with the conversion of the machines to QOM: No need to register the machines with 'machine_init()'. Thanks, Marcel > > Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com> > --- > hw/core/machine.c | 8 ++++++++ > vl.c | 8 -------- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index d3ffef7..4b49a7d 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -12,12 +12,20 @@ > > #include "hw/boards.h" > > +static void machine_base_class_init(ObjectClass *oc, void *data) > +{ > + MachineClass *mc = MACHINE_CLASS(oc); > + > + mc->qemu_machine = data; > +} > + > static const TypeInfo machine_info = { > .name = TYPE_MACHINE, > .parent = TYPE_OBJECT, > .abstract = true, > .class_size = sizeof(MachineClass), > .instance_size = sizeof(MachineState), > + .class_base_init = machine_base_class_init, > }; > > static void machine_register_types(void) > diff --git a/vl.c b/vl.c > index d75ca55..6a380d9 100644 > --- a/vl.c > +++ b/vl.c > @@ -1531,19 +1531,11 @@ void pcmcia_info(Monitor *mon, const QDict *qdict) > > MachineState *current_machine; > > -static void machine_class_init(ObjectClass *oc, void *data) > -{ > - MachineClass *mc = MACHINE_CLASS(oc); > - > - mc->qemu_machine = data; > -} > - > int qemu_register_machine(QEMUMachine *m) > { > TypeInfo ti = { > .name = g_strconcat(m->name, TYPE_MACHINE_SUFFIX, NULL), > .parent = TYPE_MACHINE, > - .class_init = machine_class_init, > .class_data = (void *)m, > }; I'll remove the casting to void* here, thanks Eric! Marcel >
diff --git a/hw/core/machine.c b/hw/core/machine.c index d3ffef7..4b49a7d 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -12,12 +12,20 @@ #include "hw/boards.h" +static void machine_base_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + + mc->qemu_machine = data; +} + static const TypeInfo machine_info = { .name = TYPE_MACHINE, .parent = TYPE_OBJECT, .abstract = true, .class_size = sizeof(MachineClass), .instance_size = sizeof(MachineState), + .class_base_init = machine_base_class_init, }; static void machine_register_types(void) diff --git a/vl.c b/vl.c index d75ca55..6a380d9 100644 --- a/vl.c +++ b/vl.c @@ -1531,19 +1531,11 @@ void pcmcia_info(Monitor *mon, const QDict *qdict) MachineState *current_machine; -static void machine_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc = MACHINE_CLASS(oc); - - mc->qemu_machine = data; -} - int qemu_register_machine(QEMUMachine *m) { TypeInfo ti = { .name = g_strconcat(m->name, TYPE_MACHINE_SUFFIX, NULL), .parent = TYPE_MACHINE, - .class_init = machine_class_init, .class_data = (void *)m, };
The QemuMachine assignment into the QOM machine it is common to all machines until the conversion is over. It is not specific to vl.c . Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com> --- hw/core/machine.c | 8 ++++++++ vl.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-)