From nobody Wed Feb 11 02:54:43 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150821442667414.5848558955189; Mon, 16 Oct 2017 21:27:06 -0700 (PDT) Received: from localhost ([::1]:36360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4JT2-0003Yy-UC for importer@patchew.org; Tue, 17 Oct 2017 00:27:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4JOT-0008Hs-JI for qemu-devel@nongnu.org; Tue, 17 Oct 2017 00:22:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4JOS-0006vv-EN for qemu-devel@nongnu.org; Tue, 17 Oct 2017 00:22:17 -0400 Received: from ozlabs.org ([103.22.144.67]:52031) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4JOS-0006sD-48; Tue, 17 Oct 2017 00:22:16 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3yGMTr0x6Pz9t2l; Tue, 17 Oct 2017 15:22:07 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1508214128; bh=pZ5MgWhP9kf2zhILqcIZlqXEWHP097LnVzHKNoGOAjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MIySchlrnT4fMhwggmlCZadfQ3oBIShDeRtWkDWGHE5y4x8J0bNPWKzNTKBWqRvqa yT17JKXL7b6xRMF2ziwDZSEgkiUx7nQ673Dh/afEc0SNQrbAVn+yvtgboQA1nJFpIv KlO1+HvKIEpAXGw1KHRIFb/ofzyJF5Jc2qzyD7Ho= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 17 Oct 2017 15:21:30 +1100 Message-Id: <20171017042152.29443-13-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171017042152.29443-1-david@gibson.dropbear.id.au> References: <20171017042152.29443-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 12/34] ppc: mac_newworld: use generic cpu_model parsing 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: agraf@suse.de, ehabkost@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, imammedo@redhat.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Igor Mammedov Signed-off-by: Igor Mammedov Acked-by: David Gibson Signed-off-by: David Gibson --- hw/ppc/mac_newworld.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 6d0ace20ca..3fa7c429d5 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -174,16 +174,8 @@ static void ppc_core99_init(MachineState *machine) linux_boot =3D (kernel_filename !=3D NULL); =20 /* init CPUs */ - if (machine->cpu_model =3D=3D NULL) { -#ifdef TARGET_PPC64 - machine->cpu_model =3D "970fx"; -#else - machine->cpu_model =3D "G4"; -#endif - } for (i =3D 0; i < smp_cpus; i++) { - cpu =3D POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, - machine->cpu_model)); + cpu =3D POWERPC_CPU(cpu_create(machine->cpu_type)); env =3D &cpu->env; =20 /* Set time-base frequency to 100 Mhz */ @@ -520,6 +512,11 @@ static void core99_machine_class_init(ObjectClass *oc,= void *data) mc->max_cpus =3D MAX_CPUS; mc->default_boot_order =3D "cd"; mc->kvm_type =3D core99_kvm_type; +#ifdef TARGET_PPC64 + mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("970fx_v3.1"); +#else + mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("7400_v2.9"); +#endif } =20 static const TypeInfo core99_machine_info =3D { --=20 2.13.6