All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Igor Mammedov <imammedo@redhat.com>, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v2 3/5] vl.c: convert cpu_model to cpu type and set of global properties before machine_init()
Date: Thu, 14 Sep 2017 15:19:21 -0300	[thread overview]
Message-ID: <4cb8e4a1-ea7f-bcdd-f50e-3467c6a2ac36@amsat.org> (raw)
In-Reply-To: <1505318697-77161-4-git-send-email-imammedo@redhat.com>

On 09/13/2017 01:04 PM, Igor Mammedov wrote:
> All machines that support user specified cpu_model either call
> cpu_generic_init() or cpu_class_by_name()/CPUClass::parse_features
> to parse feature string and to get CPU type to create.
> 
> Which leads to code duplication and hard-codding default CPU model
> within machine_foo_init() code. Which makes it impossible to
> get CPU type before machine_init() is run.
> 
> So instead of setting default CPUs models and doing parsing in
> target specific machine_foo_init() in various ways, provide
> a generic data driven cpu_model parsing before machine_init()
> is called.
> 
> in follow up per target patches, it will allow to:
>    * define default CPU type in consistent/generic manner
>      per machine type and drop custom code that fallbacks
>      to default if cpu_model is NULL
>    * drop custom features parsing in targets and do it
>      in centralized way.
>    * for cases of
>        cpu_generic_init(TYPE_BASE/DEFAULT_CPU, "some_cpu")
>      replace it with
>        cpu_create(machine->cpu_type) || cpu_create(TYPE_FOO)
>      depending if CPU type is user settable or not.
>      not doing useless parsing and clearly documenting where
>      CPU model is user settable or fixed one.
> 
> Patch allows machine subclasses to define default CPU type
> per machine class at class_init() time and if that is set
> generic code will parse cpu_model into a MachineState::cpu_type
> which will be used to create CPUs for that machine instance
> and allows gradual per board conversion.
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>

Acked-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
> Target specific changes will split into separate per target/machine
> patches to make changes reviewable.
> ---
>   include/hw/boards.h |  6 ++++++
>   vl.c                | 10 ++++++++++
>   2 files changed, 16 insertions(+)
> 
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 7f044d1..6b67ada 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -125,6 +125,10 @@ typedef struct {
>    *    Caller is responsible for freeing returned list.
>    * @has_hotpluggable_cpus:
>    *    If true, board supports CPUs creation with -device/device_add.
> + * @default_cpu_type:
> + *    specifies default CPU_TYPE, which will be used for parsing target
> + *    specific features and for creating CPUs if CPU name wasn't provided
> + *    explicitly at CLI
>    * @minimum_page_bits:
>    *    If non-zero, the board promises never to create a CPU with a page size
>    *    smaller than this, so QEMU can use a more efficient larger page
> @@ -177,6 +181,7 @@ struct MachineClass {
>       GArray *compat_props;
>       const char *hw_version;
>       ram_addr_t default_ram_size;
> +    const char *default_cpu_type;
>       bool option_rom_has_mr;
>       bool rom_file_has_mr;
>       int minimum_page_bits;
> @@ -231,6 +236,7 @@ struct MachineState {
>       char *kernel_cmdline;
>       char *initrd_filename;
>       const char *cpu_model;
> +    const char *cpu_type;
>       AccelState *accelerator;
>       CPUArchIdList *possible_cpus;
>   };
> diff --git a/vl.c b/vl.c
> index fb1f05b..034180f 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -4636,6 +4636,16 @@ int main(int argc, char **argv, char **envp)
>       current_machine->boot_order = boot_order;
>       current_machine->cpu_model = cpu_model;
>   
> +
> +    /* parse features once if machine provides default cpu_type */
> +    if (machine_class->default_cpu_type) {
> +        current_machine->cpu_type = machine_class->default_cpu_type;
> +        if (cpu_model) {
> +            current_machine->cpu_type =
> +                cpu_parse_cpu_model(machine_class->default_cpu_type, cpu_model);
> +        }
> +    }
> +
>       machine_run_board_init(current_machine);
>   
>       realtime_init();
> 

  reply	other threads:[~2017-09-14 18:19 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-13 16:04 [Qemu-devel] [PATCH v2 0/5] generalize parsing of cpu_model (x86/arm) Igor Mammedov
2017-09-13 16:04 ` [Qemu-devel] [PATCH v2 1/5] qom: cpus: split cpu_generic_init() on feature parsing and cpu creation parts Igor Mammedov
2017-09-13 16:04 ` [Qemu-devel] [PATCH v2 2/5] cpu: make cpu_generic_init() abort QEMU on error Igor Mammedov
2017-09-13 16:04 ` [Qemu-devel] [PATCH v2 3/5] vl.c: convert cpu_model to cpu type and set of global properties before machine_init() Igor Mammedov
2017-09-14 18:19   ` Philippe Mathieu-Daudé [this message]
2017-09-13 16:04 ` [Qemu-devel] [PATCH v2 4/5] pc: use generic cpu_model parsing Igor Mammedov
2017-09-13 16:04 ` [Qemu-devel] [PATCH v2 5/5] arm: drop intermediate cpu_model -> cpu type parsing and use cpu type directly Igor Mammedov
2017-09-14  3:47   ` Philippe Mathieu-Daudé
2017-09-14  7:50     ` Igor Mammedov
2017-09-14 22:09       ` Alistair Francis
2017-09-14 17:57   ` Alistair Francis
2017-09-18 21:53   ` [Qemu-devel] [PATCH] !fixup arm: missed comment update Philippe Mathieu-Daudé
2017-09-15 15:03 ` [Qemu-devel] [PATCH v2 0/5] generalize parsing of cpu_model (x86/arm) Igor Mammedov
2017-09-18 16:42   ` Igor Mammedov
2017-09-19 12:11     ` Eduardo Habkost
2017-09-19 12:46       ` Igor Mammedov
2017-09-19 12:56       ` Philippe Mathieu-Daudé

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=4cb8e4a1-ea7f-bcdd-f50e-3467c6a2ac36@amsat.org \
    --to=f4bug@amsat.org \
    --cc=imammedo@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.