From: Cornelia Huck <cohuck@redhat.com>
To: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: "Eduardo Habkost" <eduardo@habkost.net>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Greg Kurz" <groug@kaod.org>,
qemu-devel@nongnu.org, "Halil Pasic" <pasic@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
"Cédric Le Goater" <clg@kaod.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: Re: [PATCH for-7.0] hw: Add compat machines for 7.0
Date: Fri, 17 Dec 2021 15:29:13 +0100 [thread overview]
Message-ID: <87fsqrqp8m.fsf@redhat.com> (raw)
In-Reply-To: <YbyR1C+77+moWF/O@redhat.com>
On Fri, Dec 17 2021, Daniel P. Berrangé <berrange@redhat.com> wrote:
> On Fri, Dec 17, 2021 at 09:13:55AM +0100, Cornelia Huck wrote:
>> On Wed, Dec 08 2021, Cornelia Huck <cohuck@redhat.com> wrote:
>>
>> > Add 7.0 machine types for arm/i440fx/q35/s390x/spapr.
>> >
>> > Signed-off-by: Cornelia Huck <cohuck@redhat.com>
>> > ---
>> > hw/arm/virt.c | 9 ++++++++-
>> > hw/core/machine.c | 3 +++
>> > hw/i386/pc.c | 3 +++
>> > hw/i386/pc_piix.c | 14 +++++++++++++-
>> > hw/i386/pc_q35.c | 13 ++++++++++++-
>> > hw/ppc/spapr.c | 15 +++++++++++++--
>> > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
>> > include/hw/boards.h | 3 +++
>> > include/hw/i386/pc.h | 3 +++
>> > 9 files changed, 71 insertions(+), 6 deletions(-)
>> >
>>
>
>
>> > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
>> > index 223dd3e05d15..b03026bf0648 100644
>> > --- a/hw/i386/pc_piix.c
>> > +++ b/hw/i386/pc_piix.c
>> > @@ -413,7 +413,7 @@ static void pc_i440fx_machine_options(MachineClass *m)
>> > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
>> > }
>> >
>> > -static void pc_i440fx_6_2_machine_options(MachineClass *m)
>> > +static void pc_i440fx_7_0_machine_options(MachineClass *m)
>> > {
>> > PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
>> > pc_i440fx_machine_options(m);
>> > @@ -422,6 +422,18 @@ static void pc_i440fx_6_2_machine_options(MachineClass *m)
>> > pcmc->default_cpu_version = 1;
>> > }
>> >
>> > +DEFINE_I440FX_MACHINE(v7_0, "pc-i440fx-7.0", NULL,
>> > + pc_i440fx_7_0_machine_options);
>> > +
>> > +static void pc_i440fx_6_2_machine_options(MachineClass *m)
>> > +{
>> > + pc_i440fx_machine_options(m);
>
> Needs to be pc_i440fx_7_0_machine_options()
>
>> > + m->alias = NULL;
>> > + m->is_default = false;
>> > + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len);
>> > + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len);
>> > +}
>> > +
>> > DEFINE_I440FX_MACHINE(v6_2, "pc-i440fx-6.2", NULL,
>> > pc_i440fx_6_2_machine_options);
>> >
>> > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
>> > index e1e100316d93..6b66eb16bb64 100644
>> > --- a/hw/i386/pc_q35.c
>> > +++ b/hw/i386/pc_q35.c
>> > @@ -360,7 +360,7 @@ static void pc_q35_machine_options(MachineClass *m)
>> > m->max_cpus = 288;
>> > }
>> >
>> > -static void pc_q35_6_2_machine_options(MachineClass *m)
>> > +static void pc_q35_7_0_machine_options(MachineClass *m)
>> > {
>> > PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
>> > pc_q35_machine_options(m);
>> > @@ -368,6 +368,17 @@ static void pc_q35_6_2_machine_options(MachineClass *m)
>> > pcmc->default_cpu_version = 1;
>> > }
>> >
>> > +DEFINE_Q35_MACHINE(v7_0, "pc-q35-7.0", NULL,
>> > + pc_q35_7_0_machine_options);
>> > +
>> > +static void pc_q35_6_2_machine_options(MachineClass *m)
>> > +{
>> > + pc_q35_machine_options(m);
>
> Needs to be pc_q35_7_0_machine_options()
>
>> > + m->alias = NULL;
>> > + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len);
>> > + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len);
>> > +}
>> > +
>> > DEFINE_Q35_MACHINE(v6_2, "pc-q35-6.2", NULL,
>> > pc_q35_6_2_machine_options);
>> >
>>
>> So, this apparently causes some problems with one of the avocado tests:
>>
>> 162-tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_4_1_alias -> AssertionError: None != 'Cascadelake-Server-v1' : Cascadelake-Server must be an alias of Cascadelake-Server-v1
>>
>> (full output at https://gitlab.com/qemu-project/qemu/-/jobs/1893456217)
>>
>> I have looked at the patch again and do not see what might be wrong (has
>> something changed with the cpu model versioning recently?)
>>
>> Does anyone else (especially the x86 folks) have an idea?
>
> AFAICT, just a typo in chaining up the methods I've pointed out inline.
Duh, indeed. Thanks for spotting this.
Will send a v2.
next prev parent reply other threads:[~2021-12-17 14:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-08 17:02 [PATCH for-7.0] hw: Add compat machines for 7.0 Cornelia Huck
2021-12-08 17:32 ` Cédric Le Goater
2021-12-14 13:15 ` Thomas Huth
2021-12-14 15:10 ` Philippe Mathieu-Daudé
2021-12-15 17:17 ` Juan Quintela
2021-12-17 8:13 ` Cornelia Huck
2021-12-17 13:34 ` Daniel P. Berrangé
2021-12-17 14:29 ` Cornelia Huck [this message]
2021-12-24 11:56 ` Andrew Jones
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=87fsqrqp8m.fsf@redhat.com \
--to=cohuck@redhat.com \
--cc=berrange@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=clg@kaod.org \
--cc=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=eduardo@habkost.net \
--cc=groug@kaod.org \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/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).