Commit f2c93021 authored by Markus Armbruster's avatar Markus Armbruster Committed by Eduardo Habkost
Browse files

vl: Clean up after previous commit 



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

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Message-Id: <20190405064121.23662-4-richardw.yang@linux.intel.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent c516cd1b

vl.c

+8 −17
Original line number Original line Diff line number Diff line
@@ -1468,40 +1468,31 @@ MachineState *current_machine; 
static MachineClass *find_machine(const char *name, GSList *machines)

static MachineClass *find_machine(const char *name, GSList *machines)

{

{

    GSList *el;

    GSList *el;

    MachineClass *mc = NULL;





    for (el = machines; el; el = el->next) {

    for (el = machines; el; el = el->next) {

        MachineClass *temp = el->data;

        MachineClass *mc = el->data;





        if (!strcmp(temp->name, name)) {

        if (!strcmp(mc->name, name) || !g_strcmp0(mc->alias, name)) {

            mc = temp;

            return mc;

            break;

        }

        if (temp->alias &&

            !strcmp(temp->alias, name)) {

            mc = temp;

            break;

        }

        }

    }

    }





    return mc;

    return NULL;

}

}





static MachineClass *find_default_machine(GSList *machines)

static MachineClass *find_default_machine(GSList *machines)

{

{

    GSList *el;

    GSList *el;

    MachineClass *mc = NULL;





    for (el = machines; el; el = el->next) {

    for (el = machines; el; el = el->next) {

        MachineClass *temp = el->data;

        MachineClass *mc = el->data;





        if (temp->is_default) {

        if (mc->is_default) {

            mc = temp;

            return mc;

            break;

        }

        }

    }

    }





    return mc;

    return NULL;

}

}





MachineInfoList *qmp_query_machines(Error **errp)

MachineInfoList *qmp_query_machines(Error **errp)