ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vl: rename local variable in configure_accelerators 

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>
This commit is contained in:
Paolo Bonzini 2020-11-02 10:46:52 -05:00
parent 45c53fe64c
commit 7245ca7411
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
softmmu/vl.c
View File

@ -2159,17 +2159,17 @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp)
static void configure_accelerators(const char *progname) static void configure_accelerators(const char *progname)
{ {
const char *accel; const char *accelerators;
bool init_failed = false; bool init_failed = false;
qemu_opts_foreach(qemu_find_opts("icount"), qemu_opts_foreach(qemu_find_opts("icount"),
do_configure_icount, NULL, &error_fatal); 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)) { if (QTAILQ_EMPTY(&qemu_accel_opts.head)) {
char **accel_list, **tmp; char **accel_list, **tmp;
if (accel == NULL) { if (accelerators == NULL) {
/* Select the default accelerator */ /* Select the default accelerator */
bool have_tcg = accel_find("tcg"); bool have_tcg = accel_find("tcg");
bool have_kvm = accel_find("kvm"); bool have_kvm = accel_find("kvm");
@ -2177,21 +2177,21 @@ static void configure_accelerators(const char *progname)
if (have_tcg && have_kvm) { if (have_tcg && have_kvm) {
if (g_str_has_suffix(progname, "kvm")) { if (g_str_has_suffix(progname, "kvm")) {
/* If the program name ends with "kvm", we prefer KVM */ /* If the program name ends with "kvm", we prefer KVM */
accel = "kvm:tcg"; accelerators = "kvm:tcg";
} else { } else {
accel = "tcg:kvm"; accelerators = "tcg:kvm";
} }
} else if (have_kvm) { } else if (have_kvm) {
accel = "kvm"; accelerators = "kvm";
} else if (have_tcg) { } else if (have_tcg) {
accel = "tcg"; accelerators = "tcg";
} else { } else {
error_report("No accelerator selected and" error_report("No accelerator selected and"
" no default accelerator available"); " no default accelerator available");
exit(1); exit(1);
} }
} }
accel_list = g_strsplit(accel, ":", 0); accel_list = g_strsplit(accelerators, ":", 0);
for (tmp = accel_list; *tmp; tmp++) { for (tmp = accel_list; *tmp; tmp++) {
/* /*
@ -2207,7 +2207,7 @@ static void configure_accelerators(const char *progname)
} }
g_strfreev(accel_list); g_strfreev(accel_list);
} else { } else {
if (accel != NULL) { if (accelerators != NULL) {
error_report("The -accel and \"-machine accel=\" options are incompatible"); error_report("The -accel and \"-machine accel=\" options are incompatible");
exit(1); exit(1);
} }