| Message ID | 1375318941-17624-1-git-send-email-afaerber@suse.de |
|---|---|
| State | New |
| Headers | show |
On 08/01/2013 06:32 AM, Andreas Färber wrote: > 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 <prerna@linux.vnet.ibm.com> > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- ACK. Reviewed and tested --Works as expected. I'll send out an updated follow-up patch later in the day which ensures PAPR compliance for nomenclature. Regards,
Am 08.08.2013 07:15, schrieb Prerna Saxena: > On 08/01/2013 06:32 AM, Andreas Färber wrote: >> 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 <prerna@linux.vnet.ibm.com> >> Signed-off-by: Andreas Färber <afaerber@suse.de> >> --- > > ACK. > Reviewed and tested --Works as expected. Thanks. Looking deeper into the issue I have come up with a simpler solution that will obsolete this patch. Andreas > > I'll send out an updated follow-up patch later in the day which ensures > PAPR compliance for nomenclature. > > Regards, >
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 *args) const char *kernel_cmdline = args->kernel_cmdline; const char *initrd_filename = args->initrd_filename; const char *boot_device = args->boot_device; - PowerPCCPU *cpu; + PowerPCCPU *cpu = NULL; CPUPPCState *env; PCIHostState *phb; int i; @@ -1307,6 +1307,15 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args) register_savevm_live(NULL, "spapr/htab", -1, 1, &savevm_htab_handlers, spapr); + if (kvm_enabled() && strcmp(cpu_model, "host") == 0) { + ObjectClass *cpu_class = object_get_class(OBJECT(cpu)); + ObjectClass *parent_cpu_class = object_class_get_parent(cpu_class); + const char *parent_name = object_class_get_name(parent_cpu_class); + + cpu_model = g_strndup(parent_name, + strlen(parent_name) - strlen("-" TYPE_POWERPC_CPU)); + } + /* Prepare the device tree */ spapr->fdt_skel = spapr_create_fdt_skel(cpu_model, initrd_base, initrd_size,
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 <prerna@linux.vnet.ibm.com> Signed-off-by: Andreas Färber <afaerber@suse.de> --- 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(-)