From: David Gibson <david@gibson.dropbear.id.au>
To: Greg Kurz <groug@kaod.org>
Cc: david@redhat.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org,
clg@kaod.org, Igor Mammedov <imammedo@redhat.com>,
jdenemar@redhat.com
Subject: Re: [PATCH] spapr/kvm: Set default cpu model for all machine classes
Date: Thu, 31 Oct 2019 11:07:53 +0100 [thread overview]
Message-ID: <20191031100753.GW3552@umbus.metropole.lan> (raw)
In-Reply-To: <20191031091556.1c25fbe1@bahia.lan>
[-- Attachment #1: Type: text/plain, Size: 4240 bytes --]
On Thu, Oct 31, 2019 at 09:15:56AM +0100, Greg Kurz wrote:
> On Wed, 30 Oct 2019 17:32:43 +0100
> David Gibson <david@gibson.dropbear.id.au> wrote:
>
> > 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
> > ("qemu-s390x-cpu" instead of "host-s390x-cpu") as "default-cpu-type".
> >
>
> A PPC cpu model might be better.
Indeed.
>
> > 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>
>
> Missing S-o-b.
Oops, fixed.
> With these fixed.
>
> Reviewed-by: Greg Kurz <groug@kaod.org>
>
> > ---
> > target/ppc/kvm.c | 21 +++++++++++++--------
> > 1 file changed, 13 insertions(+), 8 deletions(-)
> >
> > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> > index 7d2e8969ac..c77f9848ec 100644
> > --- a/target/ppc/kvm.c
> > +++ b/target/ppc/kvm.c
> > @@ -100,7 +100,7 @@ static bool kvmppc_is_pr(KVMState *ks)
> > 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 int kvmppc_get_dec_bits(void);
> >
> > @@ -147,7 +147,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
> > exit(1);
> > }
> >
> > - kvm_ppc_register_host_cpu_type(ms);
> > + kvm_ppc_register_host_cpu_type();
> >
> > return 0;
> > }
> > @@ -2534,13 +2534,19 @@ PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void)
> > 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 = {
> > .name = TYPE_HOST_POWERPC_CPU,
> > .class_init = kvmppc_host_cpu_class_init,
> > };
> > - MachineClass *mc = MACHINE_GET_CLASS(ms);
> > PowerPCCPUClass *pvr_pcc;
> > ObjectClass *oc;
> > 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_register(&type_info);
> > - if (object_dynamic_cast(OBJECT(ms), TYPE_SPAPR_MACHINE)) {
> > - /* override TCG default cpu type with 'host' cpu model */
> > - mc->default_cpu_type = TYPE_HOST_POWERPC_CPU;
> > - }
> > + /* override TCG default cpu type with 'host' cpu model */
> > + object_class_foreach(pseries_machine_class_fixup, TYPE_SPAPR_MACHINE,
> > + false, NULL);
> >
> > oc = object_class_by_name(type_info.name);
> > g_assert(oc);
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-10-31 10:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 16:32 [PATCH] spapr/kvm: Set default cpu model for all machine classes David Gibson
2019-10-30 17:32 ` David Hildenbrand
2019-10-31 10:06 ` David Gibson
2019-10-30 18:16 ` no-reply
2019-10-30 19:38 ` no-reply
2019-10-31 8:15 ` Greg Kurz
2019-10-31 10:07 ` David Gibson [this message]
2019-10-31 8:28 ` Peter Maydell
2019-10-31 8:34 ` Peter Maydell
2019-11-01 12:27 ` Jiri Denemark
2019-11-13 14:43 ` Jiri Denemark
2019-11-13 15:09 ` Greg Kurz
2019-11-13 15:31 ` Peter Maydell
2019-11-13 16:00 ` Greg Kurz
2019-11-15 9:20 ` David Gibson
2019-11-15 10:42 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191031100753.GW3552@umbus.metropole.lan \
--to=david@gibson.dropbear.id.au \
--cc=clg@kaod.org \
--cc=david@redhat.com \
--cc=groug@kaod.org \
--cc=imammedo@redhat.com \
--cc=jdenemar@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).