Commit 6db1857e authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Eduardo Habkost
Browse files

vl: Abort if multiple machines are registered as default 



It would be confusing to have multiple default machines.
Abort if this ever occurs.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200207161948.15972-4-philmd@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarLaurent Vivier <laurent@vivier.eu>
Tested-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent ea0ac7f6

softmmu/vl.c

+4 −2
Original line number Diff line number Diff line
@@ -1163,16 +1163,18 @@ static MachineClass *find_machine(const char *name, GSList *machines) 
static MachineClass *find_default_machine(GSList *machines)

{

    GSList *el;

    MachineClass *default_machineclass = NULL;



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

        MachineClass *mc = el->data;



        if (mc->is_default) {

            return mc;

            assert(default_machineclass == NULL && "Multiple default machines");

            default_machineclass = mc;

        }

    }



    return NULL;

    return default_machineclass;

}



static int machine_help_func(QemuOpts *opts, MachineState *machine)