From patchwork Wed Apr 17 02:59:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 1086778 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44kRtJ6KWbz9s4Y for ; Wed, 17 Apr 2019 13:04:56 +1000 (AEST) Received: from localhost ([127.0.0.1]:45948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGasY-0005jZ-U0 for incoming@patchwork.ozlabs.org; Tue, 16 Apr 2019 23:04:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGans-0002uT-60 for qemu-devel@nongnu.org; Tue, 16 Apr 2019 23:00:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGanp-0007o4-3d for qemu-devel@nongnu.org; Tue, 16 Apr 2019 23:00:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35816) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hGann-0007mY-VJ; Tue, 16 Apr 2019 23:00:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7DFCE3081244; Wed, 17 Apr 2019 02:59:58 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDF6F608A4; Wed, 17 Apr 2019 02:59:57 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 16 Apr 2019 23:59:44 -0300 Message-Id: <20190417025944.16154-6-ehabkost@redhat.com> In-Reply-To: <20190417025944.16154-1-ehabkost@redhat.com> References: <20190417025944.16154-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 17 Apr 2019 02:59:58 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 5/5] cpu: Add MachineState parameter to parse_features() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Eduardo Habkost , Like Xu , Riku Voipio , Mark Cave-Ayland , Laurent Vivier , Markus Armbruster , qemu-ppc@nongnu.org, Igor Mammedov , Paolo Bonzini , David Gibson , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The ppc implementation of parse_features() requires the machine object to be created before it gets called. This is far from obvious when reading the code at main(). Instead of making it call qdev_get_machine(), require the caller of parse_cpu_option() to provide the machine object. This makes the initialization dependency explicit at main(), and will let us move qdev_get_machine() to CONFIG_SOFTMMU in the future. Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson Acked-by: David Gibson --- include/qom/cpu.h | 5 +++-- target/ppc/cpu-qom.h | 3 ++- exec.c | 4 ++-- qom/cpu.c | 3 ++- target/i386/cpu.c | 3 ++- target/ppc/translate_init.inc.c | 7 ++++--- target/sparc/cpu.c | 3 ++- vl.c | 3 ++- 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/include/qom/cpu.h b/include/qom/cpu.h index e11b14d9ac..cbc8e103bb 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -164,7 +164,8 @@ typedef struct CPUClass { /*< public >*/ ObjectClass *(*class_by_name)(const char *cpu_model); - void (*parse_features)(const char *typename, char *str, Error **errp); + void (*parse_features)(MachineState *machine, const char *typename, + char *str, Error **errp); void (*reset)(CPUState *cpu); int reset_dump_flags; @@ -697,7 +698,7 @@ CPUState *cpu_create(const char *typename); * Returns: type of CPU to create or prints error and terminates process * if an error occurred. */ -const char *parse_cpu_option(const char *cpu_option); +const char *parse_cpu_option(MachineState *machine, const char *cpu_option); /** * lookup_cpu_class: diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index be9b4c30c3..7891465554 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -167,7 +167,8 @@ typedef struct PowerPCCPUClass { DeviceRealize parent_realize; DeviceUnrealize parent_unrealize; void (*parent_reset)(CPUState *cpu); - void (*parent_parse_features)(const char *type, char *str, Error **errp); + void (*parent_parse_features)(MachineState *machine, const char *type, + char *str, Error **errp); uint32_t pvr; bool (*pvr_match)(struct PowerPCCPUClass *pcc, uint32_t pvr); diff --git a/exec.c b/exec.c index d359e709a6..1ca95df9d8 100644 --- a/exec.c +++ b/exec.c @@ -992,7 +992,7 @@ CPUClass *lookup_cpu_class(const char *cpu_model, Error **errp) return CPU_CLASS(oc); } -const char *parse_cpu_option(const char *cpu_option) +const char *parse_cpu_option(MachineState *machine, const char *cpu_option) { CPUClass *cc; gchar **model_pieces; @@ -1002,7 +1002,7 @@ const char *parse_cpu_option(const char *cpu_option) cc = lookup_cpu_class(model_pieces[0], &error_fatal); cpu_type = object_class_get_name(OBJECT_CLASS(cc)); - cc->parse_features(cpu_type, model_pieces[1], &error_fatal); + cc->parse_features(machine, cpu_type, model_pieces[1], &error_fatal); g_strfreev(model_pieces); return cpu_type; } diff --git a/qom/cpu.c b/qom/cpu.c index a8d2958956..c8a7b56148 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -291,7 +291,8 @@ ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) return cc->class_by_name(cpu_model); } -static void cpu_common_parse_features(const char *typename, char *features, +static void cpu_common_parse_features(MachineState *machine, + const char *typename, char *features, Error **errp) { char *val; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index d6bb57d210..f5e15ac5da 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3528,7 +3528,8 @@ static gint compare_string(gconstpointer a, gconstpointer b) /* Parse "+feature,-feature,feature=foo" CPU feature string */ -static void x86_cpu_parse_featurestr(const char *typename, char *features, +static void x86_cpu_parse_featurestr(MachineState *machine, + const char *typename, char *features, Error **errp) { char *featurestr; /* Single 'key=value" string being parsed */ diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index 0bd555eb19..2ad223fcca 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -10119,10 +10119,11 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name) return oc; } -static void ppc_cpu_parse_featurestr(const char *type, char *features, +static void ppc_cpu_parse_featurestr(MachineState *ms, + const char *type, char *features, Error **errp) { - Object *machine = qdev_get_machine(); + Object *machine = OBJECT(ms); const PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(object_class_by_name(type)); if (!features) { @@ -10171,7 +10172,7 @@ static void ppc_cpu_parse_featurestr(const char *type, char *features, } /* do property processing with generic handler */ - pcc->parent_parse_features(type, features, errp); + pcc->parent_parse_features(ms, type, features, errp); } PowerPCCPUClass *ppc_cpu_get_family_class(PowerPCCPUClass *pcc) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 4a4445bdf5..7e360de5ee 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -115,7 +115,8 @@ cpu_add_feat_as_prop(const char *typename, const char *name, const char *val) } /* Parse "+feature,-feature,feature=foo" CPU feature string */ -static void sparc_cpu_parse_features(const char *typename, char *features, +static void sparc_cpu_parse_features(MachineState *machine, + const char *typename, char *features, Error **errp) { GList *l, *plus_features = NULL, *minus_features = NULL; diff --git a/vl.c b/vl.c index c57e28d1da..e78c4d5a53 100644 --- a/vl.c +++ b/vl.c @@ -4466,7 +4466,8 @@ int main(int argc, char **argv, char **envp) /* parse features once if machine provides default cpu_type */ current_machine->cpu_type = machine_class->default_cpu_type; if (cpu_option) { - current_machine->cpu_type = parse_cpu_option(cpu_option); + current_machine->cpu_type = + parse_cpu_option(current_machine, cpu_option); } parse_numa_opts(current_machine);