[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 2/3] vl: use qemu machine QOM class instead of gl
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH v3 2/3] vl: use qemu machine QOM class instead of global machines list |
Date: |
Wed, 5 Mar 2014 19:30:46 +0200 |
The machine registration flow is refactored to use the QOM functionality.
Instead of linking the machines into a list, each machine has a type
and the types can be traversed in the QOM way.
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
include/hw/boards.h | 1 +
vl.c | 75 ++++++++++++++++++++++++++++++++++++++---------------
2 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 15df78e..7c93384 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -49,6 +49,7 @@ struct QEMUMachine {
const char *hw_version;
};
+#define TYPE_MACHINE_SUFFIX "-machine"
int qemu_register_machine(QEMUMachine *m);
QEMUMachine *find_default_machine(void);
diff --git a/vl.c b/vl.c
index 685a7a9..9fff2eb 100644
--- a/vl.c
+++ b/vl.c
@@ -1525,54 +1525,81 @@ void pcmcia_info(Monitor *mon, const QDict *qdict)
/***********************************************************/
/* machine registration */
-static QEMUMachine *first_machine = NULL;
QEMUMachine *current_machine = NULL;
+static void machine_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+
+ mc->qemu_machine = data;
+}
+
int qemu_register_machine(QEMUMachine *m)
{
- QEMUMachine **pm;
- pm = &first_machine;
- while (*pm != NULL)
- pm = &(*pm)->next;
- m->next = NULL;
- *pm = m;
+ TypeInfo ti = {
+ .name = g_strconcat(m->name, TYPE_MACHINE_SUFFIX, NULL),
+ .parent = TYPE_MACHINE,
+ .class_init = machine_class_init,
+ .class_data = (void *)m,
+ };
+
+ type_register(&ti);
+
return 0;
}
static QEMUMachine *find_machine(const char *name)
{
- QEMUMachine *m;
+ GSList *el, *machines = object_class_get_list(TYPE_MACHINE, false);
+ QEMUMachine *m = NULL;
+
+ for (el = machines; el; el = el->next) {
+ MachineClass *mc = el->data;
- for(m = first_machine; m != NULL; m = m->next) {
- if (!strcmp(m->name, name))
- return m;
- if (m->alias && !strcmp(m->alias, name))
- return m;
+ if (!strcmp(mc->qemu_machine->name, name)) {
+ m = mc->qemu_machine;
+ break;
+ }
+ if (mc->qemu_machine->alias && !strcmp(mc->qemu_machine->alias, name))
{
+ m = mc->qemu_machine;
+ break;
+ }
}
- return NULL;
+
+ g_slist_free(machines);
+ return m;
}
QEMUMachine *find_default_machine(void)
{
- QEMUMachine *m;
+ GSList *el, *machines = object_class_get_list(TYPE_MACHINE, false);
+ QEMUMachine *m = NULL;
- for(m = first_machine; m != NULL; m = m->next) {
- if (m->is_default) {
- return m;
+ for (el = machines; el; el = el->next) {
+ MachineClass *mc = el->data;
+
+ if (mc->qemu_machine->is_default) {
+ m = mc->qemu_machine;
+ break;
}
}
- return NULL;
+
+ g_slist_free(machines);
+ return m;
}
MachineInfoList *qmp_query_machines(Error **errp)
{
+ GSList *el, *machines = object_class_get_list(TYPE_MACHINE, false);
MachineInfoList *mach_list = NULL;
QEMUMachine *m;
- for (m = first_machine; m; m = m->next) {
+ for (el = machines; el; el = el->next) {
+ MachineClass *mc = el->data;
MachineInfoList *entry;
MachineInfo *info;
+ m = mc->qemu_machine;
info = g_malloc0(sizeof(*info));
if (m->is_default) {
info->has_is_default = true;
@@ -1593,6 +1620,7 @@ MachineInfoList *qmp_query_machines(Error **errp)
mach_list = entry;
}
+ g_slist_free(machines);
return mach_list;
}
@@ -2560,6 +2588,7 @@ static int debugcon_parse(const char *devname)
static QEMUMachine *machine_parse(const char *name)
{
QEMUMachine *m, *machine = NULL;
+ GSList *el, *machines = object_class_get_list(TYPE_MACHINE, false);
if (name) {
machine = find_machine(name);
@@ -2568,13 +2597,17 @@ static QEMUMachine *machine_parse(const char *name)
return machine;
}
printf("Supported machines are:\n");
- for (m = first_machine; m != NULL; m = m->next) {
+ for (el = machines; el; el = el->next) {
+ MachineClass *mc = el->data;
+ m = mc->qemu_machine;
if (m->alias) {
printf("%-20s %s (alias of %s)\n", m->alias, m->desc, m->name);
}
printf("%-20s %s%s\n", m->name, m->desc,
m->is_default ? " (default)" : "");
}
+
+ g_slist_free(machines);
exit(!name || !is_help_option(name));
}
--
1.8.3.1
- [Qemu-devel] [PATCH v3 0/3] qemu-machine as a QOM object, Marcel Apfelbaum, 2014/03/05
- [Qemu-devel] [PATCH v3 1/3] hw/core: introduced qemu machine as QOM object, Marcel Apfelbaum, 2014/03/05
- [Qemu-devel] [PATCH v3 2/3] vl: use qemu machine QOM class instead of global machines list,
Marcel Apfelbaum <=
- [Qemu-devel] [PATCH v3 3/3] hw/boards: converted current_machine to be an instance of MachineCLass, Marcel Apfelbaum, 2014/03/05
- Re: [Qemu-devel] [PATCH v3 3/3] hw/boards: converted current_machine to be an instance of MachineCLass, Eric Blake, 2014/03/05
- Re: [Qemu-devel] [PATCH v3 3/3] hw/boards: converted current_machine to be an instance of MachineCLass, Andreas Färber, 2014/03/06
- Re: [Qemu-devel] [PATCH v3 3/3] hw/boards: converted current_machine to be an instance of MachineCLass, Marcel Apfelbaum, 2014/03/07
- Re: [Qemu-devel] [PATCH v3 3/3] hw/boards: converted current_machine to be an instance of MachineCLass, Andreas Färber, 2014/03/07
- Re: [Qemu-devel] [PATCH v3 3/3] hw/boards: converted current_machine to be an instance of MachineCLass, Marcel Apfelbaum, 2014/03/07