mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spapr/kvm: Set default cpu model for all machine classes

Browse Source 
We have to set the default model of all machine classes, not just for
the active one. Otherwise, "query-machines" will indicate the wrong
CPU model (e.g. "power9_v2.0-powerpc64-cpu" instead of
"host-powerpc64-cpu") as "default-cpu-type".

s390x already fixed this in de60a92e "s390x/kvm: Set default cpu model for
all machine classes".  This patch applies a similar fix for the pseries-*
machine types on ppc64.

Doing a
    {"execute":"query-machines"}
under KVM now results in
    {
      "hotpluggable-cpus": true,
      "name": "pseries-4.2",
      "numa-mem-supported": true,
      "default-cpu-type": "host-powerpc64-cpu",
      "is-default": true,
      "cpu-max": 1024,
      "deprecated": false,
      "alias": "pseries"
    },
    {
      "hotpluggable-cpus": true,
      "name": "pseries-4.1",
      "numa-mem-supported": true,
      "default-cpu-type": "host-powerpc64-cpu",
      "cpu-max": 1024,
      "deprecated": false
    },
    ...

Libvirt probes all machines via "-machine none,accel=kvm:tcg" and will
currently see the wrong CPU model under KVM.

Reported-by: Jiři Denemark <jdenemar@redhat.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Tested-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
This commit is contained in:
David Gibson 2019-10-30 17:20:35 +01:00 committed by Laurent Vivier
parent a49f62b9fd
commit 165dc3edd7
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
target/ppc/kvm.c
View File

@ -100,7 +100,7 @@ static bool kvmppc_is_pr(KVMState *ks)
return kvm_vm_check_extension(ks, KVM_CAP_PPC_GET_PVINFO) != 0; return kvm_vm_check_extension(ks, KVM_CAP_PPC_GET_PVINFO) != 0;
} }
static int kvm_ppc_register_host_cpu_type(MachineState *ms); static int kvm_ppc_register_host_cpu_type(void);
static void kvmppc_get_cpu_characteristics(KVMState *s); static void kvmppc_get_cpu_characteristics(KVMState *s);
static int kvmppc_get_dec_bits(void); static int kvmppc_get_dec_bits(void);
@ -147,7 +147,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
exit(1); exit(1);
} }
kvm_ppc_register_host_cpu_type(ms); kvm_ppc_register_host_cpu_type();
return 0; return 0;
} }
@ -2534,13 +2534,19 @@ PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void)
return pvr_pcc; return pvr_pcc;
} }
static int kvm_ppc_register_host_cpu_type(MachineState *ms) static void pseries_machine_class_fixup(ObjectClass *oc, void *opaque)
{
MachineClass *mc = MACHINE_CLASS(oc);
mc->default_cpu_type = TYPE_HOST_POWERPC_CPU;
}
static int kvm_ppc_register_host_cpu_type(void)
{ {
TypeInfo type_info = { TypeInfo type_info = {
.name = TYPE_HOST_POWERPC_CPU, .name = TYPE_HOST_POWERPC_CPU,
.class_init = kvmppc_host_cpu_class_init, .class_init = kvmppc_host_cpu_class_init,
}; };
MachineClass *mc = MACHINE_GET_CLASS(ms);
PowerPCCPUClass *pvr_pcc; PowerPCCPUClass *pvr_pcc;
ObjectClass *oc; ObjectClass *oc;
DeviceClass *dc; DeviceClass *dc;
@ -2552,10 +2558,9 @@ static int kvm_ppc_register_host_cpu_type(MachineState *ms)
} }
type_info.parent = object_class_get_name(OBJECT_CLASS(pvr_pcc)); type_info.parent = object_class_get_name(OBJECT_CLASS(pvr_pcc));
type_register(&type_info); type_register(&type_info);
if (object_dynamic_cast(OBJECT(ms), TYPE_SPAPR_MACHINE)) { /* override TCG default cpu type with 'host' cpu model */
/* override TCG default cpu type with 'host' cpu model */ object_class_foreach(pseries_machine_class_fixup, TYPE_SPAPR_MACHINE,
mc->default_cpu_type = TYPE_HOST_POWERPC_CPU; false, NULL);
}
oc = object_class_by_name(type_info.name); oc = object_class_by_name(type_info.name);
g_assert(oc); g_assert(oc);