From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C03EC433B4 for ; Wed, 31 Mar 2021 14:40:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3CF7E61007 for ; Wed, 31 Mar 2021 14:40:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3CF7E61007 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRc0p-0003Aa-8T for qemu-devel@archiver.kernel.org; Wed, 31 Mar 2021 10:40:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRc08-0002UB-Fd for qemu-devel@nongnu.org; Wed, 31 Mar 2021 10:39:20 -0400 Received: from 9.mo51.mail-out.ovh.net ([46.105.48.137]:42444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRc02-0004IW-Lo for qemu-devel@nongnu.org; Wed, 31 Mar 2021 10:39:20 -0400 Received: from mxplan5.mail.ovh.net (unknown [10.108.20.2]) by mo51.mail-out.ovh.net (Postfix) with ESMTPS id 0DB4E27A80A; Wed, 31 Mar 2021 16:39:01 +0200 (CEST) Received: from kaod.org (37.59.142.99) by DAG8EX1.mxp5.local (172.16.2.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Wed, 31 Mar 2021 16:39:00 +0200 Authentication-Results: garm.ovh; auth=pass (GARM-99G0036fc58b45-ff78-4824-af7d-a93de646668b, 9D8442807461E38AC8E896D56D3346AE12FD8989) smtp.auth=groug@kaod.org X-OVh-ClientIp: 78.197.208.248 Date: Wed, 31 Mar 2021 16:38:59 +0200 From: Greg Kurz To: Cornelia Huck Subject: Re: [PATCH for-6.1] hw: add compat machines for 6.1 Message-ID: <20210331163859.4976e907@bahia.lan> In-Reply-To: <20210331111900.118274-1-cohuck@redhat.com> References: <20210331111900.118274-1-cohuck@redhat.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [37.59.142.99] X-ClientProxiedBy: DAG5EX2.mxp5.local (172.16.2.42) To DAG8EX1.mxp5.local (172.16.2.71) X-Ovh-Tracer-GUID: 5a15dab5-502c-4e8c-9050-ccee492d84e4 X-Ovh-Tracer-Id: 9909326557342439812 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduledrudeivddgkedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepfffhvffukfgjfhfogggtgfhisehtjeertdertddvnecuhfhrohhmpefirhgvghcumfhurhiiuceoghhrohhugheskhgrohgurdhorhhgqeenucggtffrrghtthgvrhhnpeefuddtieejjeevheekieeltefgleetkeetheettdeifeffvefhffelffdtfeeljeenucfkpheptddrtddrtddrtddpfeejrdehledrudegvddrleelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepmhigphhlrghnhedrmhgrihhlrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehgrhhouhhgsehkrghougdrohhrghdprhgtphhtthhopehqvghmuhdqshefledtgiesnhhonhhgnhhurdhorhhg Received-SPF: pass client-ip=46.105.48.137; envelope-from=groug@kaod.org; helo=9.mo51.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Eduardo Habkost , "Michael S. Tsirkin" , David Hildenbrand , Richard Henderson , qemu-devel@nongnu.org, Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, 31 Mar 2021 13:19:00 +0200 Cornelia Huck wrote: > Add 6.1 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Cornelia Huck > --- > hw/arm/virt.c | 7 ++++++- > 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 +++++++++++++-- For the ppc part, Acked-by: Greg Kurz > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 9 files changed, 69 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index aa2bbd14e090..d2645f4752af 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2753,10 +2753,15 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_6_1_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(6, 1) > + > static void virt_machine_6_0_options(MachineClass *mc) > { > } > -DEFINE_VIRT_MACHINE_AS_LATEST(6, 0) > +DEFINE_VIRT_MACHINE(6, 0) > > static void virt_machine_5_2_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 9935c6ddd564..4dac3197008e 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -36,6 +36,9 @@ > #include "hw/virtio/virtio.h" > #include "hw/virtio/virtio-pci.h" > > +GlobalProperty hw_compat_6_0[] = {}; > +const size_t hw_compat_6_0_len = G_N_ELEMENTS(hw_compat_6_0); > + > GlobalProperty hw_compat_5_2[] = { > { "ICH9-LPC", "smm-compat", "on"}, > { "PIIX4_PM", "smm-compat", "on"}, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 8a84b25a031e..364816efc9d2 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -96,6 +96,9 @@ > #include "trace.h" > #include CONFIG_DEVICES > > +GlobalProperty pc_compat_6_0[] = {}; > +const size_t pc_compat_6_0_len = G_N_ELEMENTS(pc_compat_6_0); > + > GlobalProperty pc_compat_5_2[] = { > { "ICH9-LPC", "x-smi-cpu-hotunplug", "off" }, > }; > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 46cc951073b4..4e8edffeaf66 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -415,7 +415,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_6_0_machine_options(MachineClass *m) > +static void pc_i440fx_6_1_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -424,6 +424,18 @@ static void pc_i440fx_6_0_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v6_1, "pc-i440fx-6.1", NULL, > + pc_i440fx_6_1_machine_options); > + > +static void pc_i440fx_6_0_machine_options(MachineClass *m) > +{ > + pc_i440fx_6_1_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_6_0, hw_compat_6_0_len); > + compat_props_add(m->compat_props, pc_compat_6_0, pc_compat_6_0_len); > +} > + > DEFINE_I440FX_MACHINE(v6_0, "pc-i440fx-6.0", NULL, > pc_i440fx_6_0_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 53450190f549..458ed41c65de 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -345,7 +345,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_6_0_machine_options(MachineClass *m) > +static void pc_q35_6_1_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -353,6 +353,17 @@ static void pc_q35_6_0_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v6_1, "pc-q35-6.1", NULL, > + pc_q35_6_1_machine_options); > + > +static void pc_q35_6_0_machine_options(MachineClass *m) > +{ > + pc_q35_6_1_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_6_0, hw_compat_6_0_len); > + compat_props_add(m->compat_props, pc_compat_6_0, pc_compat_6_0_len); > +} > + > DEFINE_Q35_MACHINE(v6_0, "pc-q35-6.0", NULL, > pc_q35_6_0_machine_options); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index d56418ca2942..fbc3aa9b3a15 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4596,15 +4596,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-6.1 > + */ > +static void spapr_machine_6_1_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(6_1, "6.1", true); > + > /* > * pseries-6.0 > */ > static void spapr_machine_6_0_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_6_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_6_0, hw_compat_6_0_len); > } > > -DEFINE_SPAPR_MACHINE(6_0, "6.0", true); > +DEFINE_SPAPR_MACHINE(6_0, "6.0", false); > > /* > * pseries-5.2 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 2972b607f364..56b52d2d3091 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -795,14 +795,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_6_1_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_6_1_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(6_1, "6.1", true); > + > static void ccw_machine_6_0_instance_options(MachineState *machine) > { > + ccw_machine_6_1_instance_options(machine); > } > > static void ccw_machine_6_0_class_options(MachineClass *mc) > { > + ccw_machine_6_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_6_0, hw_compat_6_0_len); > } > -DEFINE_CCW_MACHINE(6_0, "6.0", true); > +DEFINE_CCW_MACHINE(6_0, "6.0", false); > > static void ccw_machine_5_2_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 4a90549ad855..d209601a8b8a 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -314,6 +314,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_6_0[]; > +extern const size_t hw_compat_6_0_len; > + > extern GlobalProperty hw_compat_5_2[]; > extern const size_t hw_compat_5_2_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index dcf060b79185..1522a3359a93 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -197,6 +197,9 @@ bool pc_system_ovmf_table_find(const char *entry, uint8_t **data, > void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > const CPUArchIdList *apic_ids, GArray *entry); > > +extern GlobalProperty pc_compat_6_0[]; > +extern const size_t pc_compat_6_0_len; > + > extern GlobalProperty pc_compat_5_2[]; > extern const size_t pc_compat_5_2_len; >