From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33294) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4hHq-0003Kp-VH for qemu-devel@nongnu.org; Wed, 31 Jul 2013 21:02:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4hHl-0004er-0n for qemu-devel@nongnu.org; Wed, 31 Jul 2013 21:02:38 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 1 Aug 2013 03:02:21 +0200 Message-Id: <1375318941-17624-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-next] spapr: Avoid "HOST@0" CPU node name in SLOF device tree for -cpu host List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , Alexander Graf , "open list:sPAPR" , Anthony Liguori , Prerna Saxena , =?UTF-8?q?Andreas=20F=C3=A4rber?= By default on KVM or when user asks for it via -cpu host, cpu_model will be "host" and sPAPR merely upper-cases it for the SLOF device tree. Change it so that we get the underlying CPU type, e.g., "POWER7_V2.3@0". Reported-by: Prerna Saxena Signed-off-by: Andreas F=C3=A4rber --- This avoids a PVR based lookup in common code. Tested with local patches for POWER5+_v2.1 support and modified SLOF. hw/ppc/spapr.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 16bfab9..95579b9 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1072,7 +1072,7 @@ static void ppc_spapr_init(QEMUMachineInitArgs *arg= s) const char *kernel_cmdline =3D args->kernel_cmdline; const char *initrd_filename =3D args->initrd_filename; const char *boot_device =3D args->boot_device; - PowerPCCPU *cpu; + PowerPCCPU *cpu =3D NULL; CPUPPCState *env; PCIHostState *phb; int i; @@ -1307,6 +1307,15 @@ static void ppc_spapr_init(QEMUMachineInitArgs *ar= gs) register_savevm_live(NULL, "spapr/htab", -1, 1, &savevm_htab_handlers, spapr); =20 + if (kvm_enabled() && strcmp(cpu_model, "host") =3D=3D 0) { + ObjectClass *cpu_class =3D object_get_class(OBJECT(cpu)); + ObjectClass *parent_cpu_class =3D object_class_get_parent(cpu_cl= ass); + const char *parent_name =3D object_class_get_name(parent_cpu_cla= ss); + + cpu_model =3D g_strndup(parent_name, + strlen(parent_name) - strlen("-" TYPE_POWERPC_CPU)); + } + /* Prepare the device tree */ spapr->fdt_skel =3D spapr_create_fdt_skel(cpu_model, initrd_base, initrd_size, --=20 1.8.1.4