[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/9] machine: Add a valid_cpu_types property
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 4/9] machine: Add a valid_cpu_types property |
Date: |
Thu, 5 Oct 2017 17:36:33 -0300 |
From: Alistair Francis <address@hidden>
This patch add a MachineClass element that can be set in the machine C
code to specify a list of supported CPU types. If the supported CPU
types are specified the user enter CPU (by -cpu at runtime) is checked
against the supported types and QEMU exits if they aren't supported.
Signed-off-by: Alistair Francis <address@hidden>
Message-Id: <address@hidden>
[ehabkost: removed assert(), rewrote comment]
Signed-off-by: Eduardo Habkost <address@hidden>
---
include/hw/boards.h | 1 +
hw/core/machine.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 156e0a5701..191a5b3cd8 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -191,6 +191,7 @@ struct MachineClass {
bool has_hotpluggable_cpus;
bool ignore_memory_transaction_failures;
int numa_mem_align_shift;
+ const char **valid_cpu_types;
void (*numa_auto_assign_ram)(MachineClass *mc, NodeInfo *nodes,
int nb_nodes, ram_addr_t size);
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 80647edc2a..36c2fb069c 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -758,6 +758,38 @@ void machine_run_board_init(MachineState *machine)
if (nb_numa_nodes) {
machine_numa_finish_init(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);
+ int i;
+
+ for (i = 0; machine_class->valid_cpu_types[i]; i++) {
+ if (object_class_dynamic_cast(class,
+ machine_class->valid_cpu_types[i])) {
+ /* The user specificed CPU is in the valid field, we are
+ * good to go.
+ */
+ break;
+ }
+ }
+
+ 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",
+ 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]);
+ }
+ error_printf("\n");
+
+ exit(1);
+ }
+ }
+
machine_class->init(machine);
}
--
2.13.6
- [Qemu-devel] [PULL 0/9] x86 and machine queue, 2017-10-05, Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 1/9] hw/acpi-build: Make assignment statement of next_base easy to read, Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 2/9] ACPI/unit-test: Add a new testcase for RAM allocation in numa node, Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 3/9] qom/cpu: move cpu_model null check to cpu_class_by_name(), Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 4/9] machine: Add a valid_cpu_types property,
Eduardo Habkost <=
- [Qemu-devel] [PULL 5/9] vl: Eliminate defconfig variable, Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 6/9] qemu-options: Deprecate -nodefconfig, Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 7/9] config: qemu_config_parse() return number of config groups, Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 8/9] qom: update doc comment for type_register[_static](), Eduardo Habkost, 2017/10/05
- [Qemu-devel] [PULL 9/9] x86: Correct translation of some rdgsbase and wrgsbase encodings, Eduardo Habkost, 2017/10/05
- Re: [Qemu-devel] [PULL 0/9] x86 and machine queue, 2017-10-05, Peter Maydell, 2017/10/06