Am 24.02.2012 15:13, schrieb Luiz Capitulino: > Signed-off-by: Luiz Capitulino <lcapitul...@redhat.com>
Unless this fixes a bug, I'd rather not refactor this as in my head this is already just object_class_foreach() / object_class_by_name(), similar to CPUs on my qom-cpu branch. Andreas > --- > hw/boards.h | 3 ++- > vl.c | 16 ++++++---------- > 2 files changed, 8 insertions(+), 11 deletions(-) > > diff --git a/hw/boards.h b/hw/boards.h > index 342a774..1eb8314 100644 > --- a/hw/boards.h > +++ b/hw/boards.h > @@ -4,6 +4,7 @@ > #define HW_BOARDS_H > > #include "qdev.h" > +#include "qemu-queue.h" > > typedef void QEMUMachineInitFunc(ram_addr_t ram_size, > const char *boot_device, > @@ -28,7 +29,7 @@ typedef struct QEMUMachine { > int is_default; > const char *default_machine_opts; > GlobalProperty *compat_props; > - struct QEMUMachine *next; > + QTAILQ_ENTRY(QEMUMachine) next; > } QEMUMachine; > > void machine_register(QEMUMachine *m); > diff --git a/vl.c b/vl.c > index 9f9927c..4935106 100644 > --- a/vl.c > +++ b/vl.c > @@ -1160,24 +1160,20 @@ void pcmcia_info(Monitor *mon) > /***********************************************************/ > /* machine registration */ > > -static QEMUMachine *first_machine = NULL; > +static QTAILQ_HEAD(QEMUMachineHead, QEMUMachine) machine_types = > + QTAILQ_HEAD_INITIALIZER(machine_types); > QEMUMachine *current_machine = NULL; > > void machine_register(QEMUMachine *m) > { > - QEMUMachine **pm; > - pm = &first_machine; > - while (*pm != NULL) > - pm = &(*pm)->next; > - m->next = NULL; > - *pm = m; > + QTAILQ_INSERT_TAIL(&machine_types, m, next); > } > > static QEMUMachine *machine_find(const char *name) > { > QEMUMachine *m; > > - for(m = first_machine; m != NULL; m = m->next) { > + QTAILQ_FOREACH(m, &machine_types, next) { > if (!strcmp(m->name, name)) > return m; > if (m->alias && !strcmp(m->alias, name)) > @@ -1190,7 +1186,7 @@ QEMUMachine *machine_find_default(void) > { > QEMUMachine *m; > > - for(m = first_machine; m != NULL; m = m->next) { > + QTAILQ_FOREACH(m, &machine_types, next) { > if (m->is_default) { > return m; > } > @@ -1203,7 +1199,7 @@ void machine_print_all(void) > QEMUMachine *m; > > printf("Supported machines are:\n"); > - for (m = first_machine; m != NULL; m = m->next) { > + QTAILQ_FOREACH(m, &machine_types, next) { > if (m->alias) { > printf("%-10s %s (alias of %s)\n", m->alias, m->desc, m->name); > } -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg