diff options
author | Thomas Huth <thuth@redhat.com> | 2018-10-05 16:13:12 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-01-11 13:57:23 +0100 |
commit | 98e56ae6798cc5f5e432e8d93d5d18ebdeb7e496 (patch) | |
tree | 7a537a59dc600cb6c0a1196e1edfe3a5c14bb3b4 /accel | |
parent | a311f891abf3833c1e4c5a62a6e5b0f1b81f22c3 (diff) | |
download | qemu-98e56ae6798cc5f5e432e8d93d5d18ebdeb7e496.zip qemu-98e56ae6798cc5f5e432e8d93d5d18ebdeb7e496.tar.gz qemu-98e56ae6798cc5f5e432e8d93d5d18ebdeb7e496.tar.bz2 |
accel: Improve selection of the default accelerator
When compiling with "--disable-tcg", we currently still use "tcg"
as default accelerator. "kvm" should be used in this case instead.
Also, some downstream distros provide QEMU binaries which have "kvm"
in their names (e.g. "qemu-kvm" on RHEL or "kvm" on Ubuntu) that use
KVM by default - and some users might want to do something similar
with upstream binaries, too. Accomodate them by using "kvm:tcg" as
default when we detect such a binary name.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1538748792-19444-1-git-send-email-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'accel')
-rw-r--r-- | accel/accel.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/accel/accel.c b/accel/accel.c index 6db5d8f..68b6d56 100644 --- a/accel/accel.c +++ b/accel/accel.c @@ -69,7 +69,7 @@ static int accel_init_machine(AccelClass *acc, MachineState *ms) return ret; } -void configure_accelerator(MachineState *ms) +void configure_accelerator(MachineState *ms, const char *progname) { const char *accel; char **accel_list, **tmp; @@ -80,8 +80,20 @@ void configure_accelerator(MachineState *ms) accel = qemu_opt_get(qemu_get_machine_opts(), "accel"); if (accel == NULL) { - /* Use the default "accelerator", tcg */ - accel = "tcg"; + /* 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 "No default accelerator available" +#endif + } } accel_list = g_strsplit(accel, ":", 0); |