From nobody Wed Feb 11 02:54:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) 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=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) 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 1508214733421962.7773613113607; Mon, 16 Oct 2017 21:32:13 -0700 (PDT) Received: from localhost ([::1]:36388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4JY1-000881-LE for importer@patchew.org; Tue, 17 Oct 2017 00:32:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4JOU-0008JE-Ej 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 1e4JOT-0006wk-6J for qemu-devel@nongnu.org; Tue, 17 Oct 2017 00:22:18 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:59183) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4JOS-0006s7-Sf; Tue, 17 Oct 2017 00:22:17 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3yGMTr4lDWz9t38; 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=fINetpFNGgKJ1/cXv8G4mkP8QWK9ihVuz43VR79vH7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dW6tWjGfYku2KStZvNs+5HDE+e832VHl7lEWhc5L66PjrW39cIedNqYl3PEQo0SYx dtJbqNuSnpyQp0Mq2dReUJSO0RXBM4Gdr+f/csXHoYEqMUXn+pE/Atuieun0z3EADL 4FhBx04oQCvP7+zQn/glFw/SxFT/kscXIcLEIFe8= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 17 Oct 2017 15:21:31 +1100 Message-Id: <20171017042152.29443-14-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: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 13/34] ppc: mac_oldworld: 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_0 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_oldworld.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index bc7c8b7bd7..010ea36bf2 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -108,11 +108,8 @@ static void ppc_heathrow_init(MachineState *machine) linux_boot =3D (kernel_filename !=3D NULL); =20 /* init CPUs */ - if (machine->cpu_model =3D=3D NULL) - machine->cpu_model =3D "G3"; 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 16.6 Mhz */ @@ -385,6 +382,7 @@ static void heathrow_class_init(ObjectClass *oc, void *= data) /* TOFIX "cad" when Mac floppy is implemented */ mc->default_boot_order =3D "cd"; mc->kvm_type =3D heathrow_kvm_type; + mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("750_v3.1"); } =20 static const TypeInfo ppc_heathrow_machine_info =3D { --=20 2.13.6