When the user specifies a list of accelerators, we pick the first one that initializes successfully. Recent commit1a3ec8c156
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:1a3ec8c156
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20190401090827.20793-6-armbru@redhat.com>
153 lines
4.5 KiB
C
153 lines
4.5 KiB
C
/*
|
|
* QEMU System Emulator, accelerator interfaces
|
|
*
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
* Copyright (c) 2014 Red Hat Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "sysemu/accel.h"
|
|
#include "hw/boards.h"
|
|
#include "sysemu/arch_init.h"
|
|
#include "sysemu/sysemu.h"
|
|
#include "sysemu/kvm.h"
|
|
#include "sysemu/qtest.h"
|
|
#include "hw/xen/xen.h"
|
|
#include "qom/object.h"
|
|
#include "qemu/error-report.h"
|
|
#include "qemu/option.h"
|
|
#include "qapi/error.h"
|
|
|
|
static const TypeInfo accel_type = {
|
|
.name = TYPE_ACCEL,
|
|
.parent = TYPE_OBJECT,
|
|
.class_size = sizeof(AccelClass),
|
|
.instance_size = sizeof(AccelState),
|
|
};
|
|
|
|
/* Lookup AccelClass from opt_name. Returns NULL if not found */
|
|
static AccelClass *accel_find(const char *opt_name)
|
|
{
|
|
char *class_name = g_strdup_printf(ACCEL_CLASS_NAME("%s"), opt_name);
|
|
AccelClass *ac = ACCEL_CLASS(object_class_by_name(class_name));
|
|
g_free(class_name);
|
|
return ac;
|
|
}
|
|
|
|
static int accel_init_machine(AccelClass *acc, MachineState *ms)
|
|
{
|
|
ObjectClass *oc = OBJECT_CLASS(acc);
|
|
const char *cname = object_class_get_name(oc);
|
|
AccelState *accel = ACCEL(object_new(cname));
|
|
int ret;
|
|
ms->accelerator = accel;
|
|
*(acc->allowed) = true;
|
|
ret = acc->init_machine(ms);
|
|
if (ret < 0) {
|
|
ms->accelerator = NULL;
|
|
*(acc->allowed) = false;
|
|
object_unref(OBJECT(accel));
|
|
} else {
|
|
object_set_accelerator_compat_props(acc->compat_props);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
void configure_accelerator(MachineState *ms, const char *progname)
|
|
{
|
|
const char *accel;
|
|
char **accel_list, **tmp;
|
|
int ret;
|
|
bool accel_initialised = false;
|
|
bool init_failed = false;
|
|
AccelClass *acc = NULL;
|
|
|
|
accel = qemu_opt_get(qemu_get_machine_opts(), "accel");
|
|
if (accel == NULL) {
|
|
/* Select the default accelerator */
|
|
int pnlen = strlen(progname);
|
|
if (pnlen >= 3 && g_str_equal(&progname[pnlen - 3], "kvm")) {
|
|
/* If the program name ends with "kvm", we prefer KVM */
|
|
accel = "kvm:tcg";
|
|
} else {
|
|
#if defined(CONFIG_TCG)
|
|
accel = "tcg";
|
|
#elif defined(CONFIG_KVM)
|
|
accel = "kvm";
|
|
#else
|
|
error_report("No accelerator selected and"
|
|
" no default accelerator available");
|
|
exit(1);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
accel_list = g_strsplit(accel, ":", 0);
|
|
|
|
for (tmp = accel_list; !accel_initialised && tmp && *tmp; tmp++) {
|
|
acc = accel_find(*tmp);
|
|
if (!acc) {
|
|
continue;
|
|
}
|
|
if (acc->available && !acc->available()) {
|
|
printf("%s not supported for this target\n",
|
|
acc->name);
|
|
continue;
|
|
}
|
|
ret = accel_init_machine(acc, ms);
|
|
if (ret < 0) {
|
|
init_failed = true;
|
|
error_report("failed to initialize %s: %s",
|
|
acc->name, strerror(-ret));
|
|
} else {
|
|
accel_initialised = true;
|
|
}
|
|
}
|
|
g_strfreev(accel_list);
|
|
|
|
if (!accel_initialised) {
|
|
if (!init_failed) {
|
|
error_report("-machine accel=%s: No accelerator found", accel);
|
|
}
|
|
exit(1);
|
|
}
|
|
|
|
if (init_failed) {
|
|
error_report("Back to %s accelerator", acc->name);
|
|
}
|
|
}
|
|
|
|
void accel_setup_post(MachineState *ms)
|
|
{
|
|
AccelState *accel = ms->accelerator;
|
|
AccelClass *acc = ACCEL_GET_CLASS(accel);
|
|
if (acc->setup_post) {
|
|
acc->setup_post(ms, accel);
|
|
}
|
|
}
|
|
|
|
static void register_accel_types(void)
|
|
{
|
|
type_register_static(&accel_type);
|
|
}
|
|
|
|
type_init(register_accel_types);
|