From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org
Cc: thuth@redhat.com, elmarco@redhat.com
Subject: Re: [PATCH v2 05/18] vl: merge -accel processing into configure_accelerators
Date: Tue, 10 Dec 2019 12:57:57 +0100 [thread overview]
Message-ID: <7a8adff9-7346-df04-f753-38cf333812cb@redhat.com> (raw)
In-Reply-To: <1575903705-12925-6-git-send-email-pbonzini@redhat.com>
On 12/9/19 4:01 PM, Paolo Bonzini wrote:
> The next step is to move the parsing of "-machine accel=..." into vl.c,
> unifying it with the configure_accelerators() function that has just
> been introduced. This way, we will be able to desugar it into multiple
> "-accel" options, without polluting accel/accel.c.
>
> The CONFIG_TCG and CONFIG_KVM symbols are not available in vl.c, but
> we can use accel_find instead to find their value at runtime. Once we
> know that the binary has one of TCG or KVM, the default accelerator
> can be expressed simply as "tcg:kvm", because TCG never fails to initialize.
>
> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> accel/accel.c | 69 ++------------------------------------------------
> include/sysemu/accel.h | 4 ++-
> vl.c | 64 ++++++++++++++++++++++++++++++++++++++++++----
> 3 files changed, 64 insertions(+), 73 deletions(-)
>
> diff --git a/accel/accel.c b/accel/accel.c
> index 5fa3171..60c3827 100644
> --- a/accel/accel.c
> +++ b/accel/accel.c
> @@ -28,13 +28,7 @@
> #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,
> @@ -44,7 +38,7 @@ static const TypeInfo accel_type = {
> };
>
> /* Lookup AccelClass from opt_name. Returns NULL if not found */
> -static AccelClass *accel_find(const char *opt_name)
> +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));
> @@ -52,7 +46,7 @@ static AccelClass *accel_find(const char *opt_name)
> return ac;
> }
>
> -static int accel_init_machine(AccelClass *acc, MachineState *ms)
> +int accel_init_machine(AccelClass *acc, MachineState *ms)
> {
> ObjectClass *oc = OBJECT_CLASS(acc);
> const char *cname = object_class_get_name(oc);
> @@ -71,65 +65,6 @@ static int accel_init_machine(AccelClass *acc, MachineState *ms)
> 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;
> - }
> - 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;
> diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h
> index 8eb60b8..90b6213 100644
> --- a/include/sysemu/accel.h
> +++ b/include/sysemu/accel.h
> @@ -66,7 +66,9 @@ typedef struct AccelClass {
>
> extern unsigned long tcg_tb_size;
>
> -void configure_accelerator(MachineState *ms, const char *progname);
> +AccelClass *accel_find(const char *opt_name);
> +int accel_init_machine(AccelClass *acc, MachineState *ms);
> +
> /* Called just before os_setup_post (ie just before drop OS privs) */
> void accel_setup_post(MachineState *ms);
>
> diff --git a/vl.c b/vl.c
> index 1ad6dfb..19c77b4 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2839,8 +2839,65 @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp)
> return 0;
> }
>
> -static void configure_accelerators(void)
> +static void configure_accelerators(const char *progname)
> {
> + const char *accel;
> + char **accel_list, **tmp;
> + int ret;
> + bool accel_initialised = false;
> + bool init_failed = false;
> + AccelClass *acc = NULL;
> +
> + qemu_opts_foreach(qemu_find_opts("icount"),
> + do_configure_icount, NULL, &error_fatal);
> +
> + accel = qemu_opt_get(qemu_get_machine_opts(), "accel");
> + if (accel == NULL) {
> + /* Select the default accelerator */
> + if (!accel_find("tcg") && !accel_find("kvm")) {
> + error_report("No accelerator selected and"
> + " no default accelerator available");
> + exit(1);
> + } else {
> + 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 {
> + accel = "tcg:kvm";
> + }
> + }
> + }
> +
> + accel_list = g_strsplit(accel, ":", 0);
> +
> + for (tmp = accel_list; !accel_initialised && tmp && *tmp; tmp++) {
> + acc = accel_find(*tmp);
> + if (!acc) {
> + continue;
> + }
> + ret = accel_init_machine(acc, current_machine);
> + 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);
> + }
> +
> qemu_opts_foreach(qemu_find_opts("accel"),
> do_configure_accelerator, NULL, &error_fatal);
>
> @@ -4190,9 +4247,7 @@ int main(int argc, char **argv, char **envp)
> * Note: uses machine properties such as kernel-irqchip, must run
> * after machine_set_property().
> */
> - qemu_opts_foreach(qemu_find_opts("icount"),
> - do_configure_icount, NULL, &error_fatal);
> - configure_accelerator(current_machine, argv[0]);
> + configure_accelerators(argv[0]);
>
> /*
> * Beware, QOM objects created before this point miss global and
> @@ -4277,7 +4332,6 @@ int main(int argc, char **argv, char **envp)
> qemu_spice_init();
>
> cpu_ticks_init();
> - configure_accelerators();
>
> if (default_net) {
> QemuOptsList *net = qemu_find_opts("net");
>
next prev parent reply other threads:[~2019-12-10 11:59 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 15:01 [PATCH v2 00/18] Complete the implementation of -accel Paolo Bonzini
2019-12-09 15:01 ` [PATCH v2 01/18] memory: do not look at current_machine->accel Paolo Bonzini
2019-12-12 4:39 ` Richard Henderson
2019-12-09 15:01 ` [PATCH v2 02/18] vl: move icount configuration earlier Paolo Bonzini
2019-12-12 4:41 ` Richard Henderson
2019-12-09 15:01 ` [PATCH v2 03/18] tcg: move qemu_tcg_configure to accel/tcg/tcg-all.c Paolo Bonzini
2019-12-10 11:55 ` Philippe Mathieu-Daudé
2019-12-10 12:05 ` Marc-André Lureau
2019-12-12 4:47 ` Richard Henderson
2019-12-09 15:01 ` [PATCH v2 04/18] vl: extract accelerator option processing to a separate function Paolo Bonzini
2019-12-10 11:56 ` Philippe Mathieu-Daudé
2019-12-09 15:01 ` [PATCH v2 05/18] vl: merge -accel processing into configure_accelerators Paolo Bonzini
2019-12-10 11:57 ` Philippe Mathieu-Daudé [this message]
2019-12-09 15:01 ` [PATCH v2 06/18] accel: compile accel/accel.c just once Paolo Bonzini
2019-12-10 11:58 ` Philippe Mathieu-Daudé
2019-12-09 15:01 ` [PATCH v2 07/18] vl: introduce object_parse_property_opt Paolo Bonzini
2019-12-10 11:53 ` Philippe Mathieu-Daudé
2019-12-09 15:01 ` [PATCH v2 08/18] vl: configure accelerators from -accel options Paolo Bonzini
2019-12-09 15:01 ` [PATCH v2 09/18] vl: warn for unavailable accelerators, clarify messages Paolo Bonzini
2019-12-09 15:01 ` [PATCH v2 10/18] qom: introduce object_register_sugar_prop Paolo Bonzini
2019-12-10 12:36 ` Marc-André Lureau
2019-12-09 15:01 ` [PATCH v2 11/18] qom: add object_new_with_class Paolo Bonzini
2019-12-09 15:31 ` Philippe Mathieu-Daudé
2019-12-09 17:14 ` Paolo Bonzini
2019-12-09 15:01 ` [PATCH v2 12/18] accel: pass object to accel_init_machine Paolo Bonzini
2019-12-09 15:01 ` [PATCH v2 13/18] tcg: convert "-accel threads" to a QOM property Paolo Bonzini
2019-12-09 15:28 ` Philippe Mathieu-Daudé
2019-12-09 15:01 ` [PATCH v2 14/18] tcg: add "-accel tcg, tb-size" and deprecate "-tb-size" Paolo Bonzini
2019-12-09 15:52 ` Philippe Mathieu-Daudé
2019-12-09 17:18 ` Paolo Bonzini
2019-12-10 12:53 ` Marc-André Lureau
2019-12-09 15:01 ` [PATCH v2 15/18] xen: convert "-machine igd-passthru" to an accelerator property Paolo Bonzini
2019-12-09 15:48 ` Philippe Mathieu-Daudé
2019-12-10 12:56 ` Marc-André Lureau
2019-12-10 17:44 ` Paolo Bonzini
2019-12-09 15:01 ` [PATCH v2 16/18] kvm: convert "-machine kvm_shadow_mem" " Paolo Bonzini
2019-12-10 12:01 ` Philippe Mathieu-Daudé
2019-12-09 15:01 ` [PATCH v2 17/18] kvm: introduce kvm_kernel_irqchip_* functions Paolo Bonzini
2019-12-10 12:02 ` Philippe Mathieu-Daudé
2019-12-09 15:01 ` [PATCH v2 18/18] kvm: convert "-machine kernel_irqchip" to an accelerator property Paolo Bonzini
2019-12-10 12:05 ` Philippe Mathieu-Daudé
2019-12-09 22:42 ` [PATCH v2 00/18] Complete the implementation of -accel no-reply
2019-12-09 22:58 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7a8adff9-7346-df04-f753-38cf333812cb@redhat.com \
--to=philmd@redhat.com \
--cc=elmarco@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).