Skip to content

Commit

Permalink
vl: rename local variable in configure_accelerators
Browse files Browse the repository at this point in the history
Silly patch extracted from the next one, which is already big enough.

Because there are already local variables named "accel", we will name
the global vl.c variable for "-M accel" accelerators instead.  Rename
it already in configure_accelerators to be ready.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
bonzini committed Dec 15, 2020
1 parent 45c53fe commit 7245ca7
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions softmmu/vl.c
Expand Up @@ -2159,39 +2159,39 @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp)

static void configure_accelerators(const char *progname)
{
const char *accel;
const char *accelerators;
bool init_failed = false;

qemu_opts_foreach(qemu_find_opts("icount"),
do_configure_icount, NULL, &error_fatal);

accel = qemu_opt_get(qemu_get_machine_opts(), "accel");
accelerators = qemu_opt_get(qemu_get_machine_opts(), "accel");
if (QTAILQ_EMPTY(&qemu_accel_opts.head)) {
char **accel_list, **tmp;

if (accel == NULL) {
if (accelerators == NULL) {
/* Select the default accelerator */
bool have_tcg = accel_find("tcg");
bool have_kvm = accel_find("kvm");

if (have_tcg && have_kvm) {
if (g_str_has_suffix(progname, "kvm")) {
/* If the program name ends with "kvm", we prefer KVM */
accel = "kvm:tcg";
accelerators = "kvm:tcg";
} else {
accel = "tcg:kvm";
accelerators = "tcg:kvm";
}
} else if (have_kvm) {
accel = "kvm";
accelerators = "kvm";
} else if (have_tcg) {
accel = "tcg";
accelerators = "tcg";
} else {
error_report("No accelerator selected and"
" no default accelerator available");
exit(1);
}
}
accel_list = g_strsplit(accel, ":", 0);
accel_list = g_strsplit(accelerators, ":", 0);

for (tmp = accel_list; *tmp; tmp++) {
/*
Expand All @@ -2207,7 +2207,7 @@ static void configure_accelerators(const char *progname)
}
g_strfreev(accel_list);
} else {
if (accel != NULL) {
if (accelerators != NULL) {
error_report("The -accel and \"-machine accel=\" options are incompatible");
exit(1);
}
Expand Down

0 comments on commit 7245ca7

Please sign in to comment.