Commit 79b9d4bd authored by Markus Armbruster's avatar Markus Armbruster
Browse files

accel: Unbreak accelerator fallback 



When the user specifies a list of accelerators, we pick the first one
that initializes successfully.  Recent commit 1a3ec8c1 broke that.
Reproducer:

    $ qemu-system-x86_64 --machine accel=xen:tcg
    xencall: error: Could not obtain handle on privileged command interface: No such file or directory
    xen be core: xen be core: can't open xen interface
    can't open xen interface
    qemu-system-x86_64: failed to initialize Xen: Operation not permitted
    qemu-system-x86_64: /home/armbru/work/qemu/qom/object.c:436: object_set_accelerator_compat_props: Assertion `!object_compat_props[0]' failed.

Root cause: we register accelerator compat properties even when the
accelerator fails.  The failed assertion is
object_set_accelerator_compat_props() telling us off.  Fix by calling
it only for the accelerator that succeeded.

Fixes: 1a3ec8c1
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20190401090827.20793-6-armbru@redhat.com>
parent 0427b625

accel/accel.c

+2 −1
Original line number Diff line number Diff line
@@ -65,8 +65,9 @@ static int accel_init_machine(AccelClass *acc, MachineState *ms) 
        ms->accelerator = NULL;

        *(acc->allowed) = false;

        object_unref(OBJECT(accel));

    }

    } else {

        object_set_accelerator_compat_props(acc->compat_props);

    }

    return ret;

}