From: Eduardo Habkost <ehabkost@redhat.com>
To: Alistair Francis <alistair.francis@xilinx.com>
Cc: qemu-devel@nongnu.org, peter.maydell@linaro.org, f4bug@amsat.org,
imammedo@redhat.com, marcel@redhat.com, alistair23@gmail.com
Subject: Re: [Qemu-devel] [PATCH v5 1/6] machine: Convert the valid cpu types to use cpu_model
Date: Fri, 2 Feb 2018 16:23:26 -0200 [thread overview]
Message-ID: <20180202182326.GB22556@localhost.localdomain> (raw)
In-Reply-To: <56ba11cee61d769a9a2816fa990d472ab1480906.1517532021.git.alistair.francis@xilinx.com>
On Thu, Feb 01, 2018 at 04:42:05PM -0800, Alistair Francis wrote:
> As cpu_type is not a user visible string let's convert the
> valid_cpu_types to compare against cpu_model instead. This way we have a
> user friendly string to report back.
>
> Once we have a cpu_type to cpu_model conversion this patch should be
> reverted and we should use cpu_type instead.
>
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> ---
>
> hw/core/machine.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index cdc1163dc6..de5bac1c84 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -776,13 +776,12 @@ void machine_run_board_init(MachineState *machine)
> /* If the machine supports the valid_cpu_types check and the user
> * specified a CPU with -cpu check here that the user CPU is supported.
> */
> - if (machine_class->valid_cpu_types && machine->cpu_type) {
> - ObjectClass *class = object_class_by_name(machine->cpu_type);
> + if (machine_class->valid_cpu_types && machine->cpu_model) {
> int i;
>
> for (i = 0; machine_class->valid_cpu_types[i]; i++) {
> - if (object_class_dynamic_cast(class,
> - machine_class->valid_cpu_types[i])) {
> + if (!strcmp(machine->cpu_model,
> + machine_class->valid_cpu_types[i])) {
I would rename valid_cpu_types to valid_cpu_models to make the
new semantics clearer.
Anyway, I have bad and good news:
The bad news is Igor already sent patches last week that remove
MachineState::cpu_model, so this conflicts with his series. Now
parse_cpu_model() will be the only place where the original CPU model name is
available, but the function needs to work on *-user too. See:
"[PATCH v3 23/25] Use cpu_create(type) instead of cpu_init(cpu_model)".
The good news is that I think we can fix this very easily if
validation is done at the same place where parse_cpu_model() is
called. e.g.:
current_machine->cpu_type = machine_class->default_cpu_type;
if (cpu_model) {
current_machine->cpu_type = parse_cpu_model(cpu_model);
if (machine_class->valid_cpu_models) {
ObjectClass *class = object_class_by_name(machine->cpu_type);
int i;
for (i = 0; machine_class->valid_cpu_models[i]; i++) {
const char *valid_model = machine_class->valid_cpu_models[i];
ObjectClass *valid_class = cpu_class_by_name(machine->cpu_type, valid_model);
if (object_class_dynamic_cast(class,
object_class_get_name(valid_class))) {
/* Valid CPU type, we're good to go */
break;
}
}
if (!machine_class->valid_cpu_models[i]) {
error_report("Invalid CPU model: %s", cpu_model);
error_printf("The valid CPU models are: %s",
machine_class->valid_cpu_models[0]);
for (i = 1; machine_class->valid_cpu_models[i]; i++) {
error_printf(", %s", machine_class->valid_cpu_models[i]);
}
error_printf("\n");
exit(1);
}
}
}
This can be done inside main(), or moved inside
machine_run_board_init() if main() pass cpu_model as argument to
the function.
On either case, I think it's a good idea to do validation and
printing of error messages closer to the code that parses the
command-line options. This way we separate parsing/validation
from initialization.
> /* The user specificed CPU is in the valid field, we are
> * good to go.
> */
> @@ -792,8 +791,8 @@ void machine_run_board_init(MachineState *machine)
>
> if (!machine_class->valid_cpu_types[i]) {
> /* The user specified CPU is not valid */
> - error_report("Invalid CPU type: %s", machine->cpu_type);
> - error_printf("The valid types are: %s",
> + error_report("Invalid CPU model: %s", machine->cpu_model);
> + error_printf("The valid models are: %s",
> machine_class->valid_cpu_types[0]);
> for (i = 1; machine_class->valid_cpu_types[i]; i++) {
> error_printf(", %s", machine_class->valid_cpu_types[i]);
> --
> 2.14.1
>
>
--
Eduardo
next prev parent reply other threads:[~2018-02-02 18:25 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-02 0:42 [Qemu-devel] [PATCH v5 0/6] Add a valid_cpu_types property Alistair Francis
2018-02-02 0:42 ` [Qemu-devel] [PATCH v5 1/6] machine: Convert the valid cpu types to use cpu_model Alistair Francis
2018-02-02 18:23 ` Eduardo Habkost [this message]
2018-02-05 11:22 ` Igor Mammedov
2018-02-05 13:54 ` Eduardo Habkost
2018-02-05 14:42 ` Igor Mammedov
2018-02-05 22:42 ` Eduardo Habkost
2018-02-06 14:43 ` Igor Mammedov
2019-06-17 5:09 ` Philippe Mathieu-Daudé
2019-06-17 14:43 ` Eduardo Habkost
2019-06-17 15:01 ` Igor Mammedov
2019-06-17 15:15 ` Philippe Mathieu-Daudé
2019-06-17 15:33 ` Igor Mammedov
2019-06-17 16:27 ` Eduardo Habkost
2019-06-18 11:34 ` Igor Mammedov
2019-06-18 13:55 ` Eduardo Habkost
2019-06-20 9:02 ` Igor Mammedov
2019-06-20 14:43 ` Eduardo Habkost
2020-01-23 18:48 ` Philippe Mathieu-Daudé
2020-02-06 20:59 ` Eduardo Habkost
2018-02-02 0:42 ` [Qemu-devel] [PATCH v5 2/6] netduino2: Specify the valid CPUs Alistair Francis
2018-02-02 0:42 ` [Qemu-devel] [PATCH v5 3/6] bcm2836: Use the Cortex-A7 instead of Cortex-A15 Alistair Francis
2018-02-15 13:23 ` Philippe Mathieu-Daudé
2018-02-15 22:41 ` Alistair Francis
2018-02-02 0:42 ` [Qemu-devel] [PATCH v5 4/6] raspi: Specify the valid CPUs Alistair Francis
2018-02-15 11:29 ` Peter Maydell
2018-02-15 13:04 ` Philippe Mathieu-Daudé
2018-02-15 13:17 ` Peter Maydell
2018-02-15 17:08 ` Igor Mammedov
2018-02-02 0:42 ` [Qemu-devel] [PATCH v5 5/6] xlnx-zcu102: " Alistair Francis
2018-02-02 0:42 ` [Qemu-devel] [PATCH v5 6/6] xilinx_zynq: " Alistair Francis
2018-03-13 23:13 ` [Qemu-devel] [PATCH v5 0/6] Add a valid_cpu_types property Philippe Mathieu-Daudé
2018-03-21 14:33 ` Igor Mammedov
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=20180202182326.GB22556@localhost.localdomain \
--to=ehabkost@redhat.com \
--cc=alistair.francis@xilinx.com \
--cc=alistair23@gmail.com \
--cc=f4bug@amsat.org \
--cc=imammedo@redhat.com \
--cc=marcel@redhat.com \
--cc=peter.maydell@linaro.org \
--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 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).