[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/5] boards: switch machine type list to QTAILQ
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 4/5] boards: switch machine type list to QTAILQ |
Date: |
Fri, 24 Feb 2012 12:13:11 -0200 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
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);
}
--
1.7.9.111.gf3fb0.dirty
- [Qemu-devel] [PATCH 3/5] boards: introduce machine_print_all(), (continued)
[Qemu-devel] [PATCH 4/5] boards: switch machine type list to QTAILQ,
Luiz Capitulino <=
[Qemu-devel] [PATCH 5/5] boards: move all machine type functions to boards.c, Luiz Capitulino, 2012/02/24
Re: [Qemu-devel] [PATCH 0/5]: Improve machine type functions, Anthony Liguori, 2012/02/24