mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vl: Clean up after previous commit

Browse Source 
Since the previous commit, find_machine() and find_default_machine()
don't have to deallocate on return.  This permits further
simplifications.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
Message-Id: <20190405064121.23662-4-richardw.yang@linux.intel.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Markus Armbruster 2019-04-05 14:41:20 +08:00 committed by Eduardo Habkost
parent c516cd1b34
commit f2c9302138
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vl.c
View File

@ -1468,40 +1468,31 @@ MachineState *current_machine;
static MachineClass *find_machine(const char *name, GSList *machines)
{
GSList *el;
MachineClass *mc = NULL;
for (el = machines; el; el = el->next) {
MachineClass *temp = el->data;
MachineClass *mc = el->data;
if (!strcmp(temp->name, name)) {
mc = temp;
break;
}
if (temp->alias &&
!strcmp(temp->alias, name)) {
mc = temp;
break;
if (!strcmp(mc->name, name) || !g_strcmp0(mc->alias, name)) {
return mc;
}
}
return mc;
return NULL;
}
static MachineClass *find_default_machine(GSList *machines)
{
GSList *el;
MachineClass *mc = NULL;
for (el = machines; el; el = el->next) {
MachineClass *temp = el->data;
MachineClass *mc = el->data;
if (temp->is_default) {
mc = temp;
break;
if (mc->is_default) {
return mc;
}
}
return mc;
return NULL;
}
MachineInfoList *qmp_query_machines(Error **errp)