From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecE6U-0004NJ-Qe for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:35:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecE6T-0007vX-Rv for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:35:54 -0500 From: Igor Mammedov Date: Thu, 18 Jan 2018 18:33:59 +0100 Message-Id: <1516296842-136976-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1516296842-136976-1-git-send-email-imammedo@redhat.com> References: <1516296842-136976-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [RFC v2 2/5] machine: prepare machine 'none' to gradually switch to cpu_create() API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier , Peter Maydell , Eduardo Habkost , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, qemu-arm@nongnu.org temporarily add #ifdef CPU_RESOLVING_TYPE in null-machine.c, so that each target could gradually switch to cpu_create() and not converted yet could continue to use cpu_init(). Once all targets are converted temporary ifdefs, MachineState::cpu_model and cpu_init() API will be removed Signed-off-by: Igor Mammedov --- hw/core/null-machine.c | 13 ++++++++++++- vl.c | 8 +++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index 864832d..3cc6a49 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -23,10 +23,18 @@ static void machine_none_init(MachineState *mch) { CPUState *cpu = NULL; +#ifdef CPU_RESOLVING_TYPE + MachineClass *mc = MACHINE_GET_CLASS(mch); - /* Initialize CPU (if a model has been specified) */ + /* Initialize CPU if cpu_type pointer is user provided + * (i.e. != to pointer tot static default cpu type string) + */ + if (mch->cpu_type != mc->default_cpu_type) { + cpu = cpu_create(mch->cpu_type); +#else if (mch->cpu_model) { cpu = cpu_init(mch->cpu_model); +#endif if (!cpu) { error_report("Unable to initialize CPU"); exit(1); @@ -54,6 +62,9 @@ static void machine_none_machine_init(MachineClass *mc) mc->init = machine_none_init; mc->max_cpus = 1; mc->default_ram_size = 0; +#ifdef CPU_RESOLVING_TYPE + mc->default_cpu_type = CPU_RESOLVING_TYPE; +#endif } DEFINE_MACHINE("none", machine_none_machine_init) diff --git a/vl.c b/vl.c index 2586f25..8aa0131 100644 --- a/vl.c +++ b/vl.c @@ -4609,7 +4609,6 @@ int main(int argc, char **argv, char **envp) current_machine->maxram_size = maxram_size; current_machine->ram_slots = ram_slots; current_machine->boot_order = boot_order; - current_machine->cpu_model = cpu_model; parse_numa_opts(current_machine); @@ -4619,6 +4618,13 @@ int main(int argc, char **argv, char **envp) if (cpu_model) { current_machine->cpu_type = cpu_parse_cpu_model(machine_class->default_cpu_type, cpu_model); + + /* machine 'none' depends on default cpu type pointer not being + * equal to resolved type name pointer to fugure out if type was + * user provided, make sure that if it becomes not true in future + * it won't beark silently */ + g_assert( + current_machine->cpu_type != machine_class->default_cpu_type); } } -- 2.7.4