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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A053CC87FD1 for ; Tue, 5 Aug 2025 12:28:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujGlD-0004KB-8I; Tue, 05 Aug 2025 08:27:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ujGlA-0004DF-0b for qemu-arm@nongnu.org; Tue, 05 Aug 2025 08:27:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ujGl6-0004nx-55 for qemu-arm@nongnu.org; Tue, 05 Aug 2025 08:27:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754396804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xtwCF+slk3iUvx5J+lbYi6HGbSFqiS4GPdt/W2+BsYg=; b=BejmcGrCwO/zmLnqcsxvWJdfSCFn2d3+l4XUZjjqWGalDjui7shA8orUbBJrLXdEzZrN/O qtbuWuexYt8yXVK5wcar0SzvGkkq+Mm4hNmD3igk53O6f9DXp7PQ0bx33V0dOVvRaoBWIY 391gI3SK4W2QYLDzH/Net7/65aIjSc8= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-464-EWKNDH7RMb2lbxIZzXk12g-1; Tue, 05 Aug 2025 08:26:42 -0400 X-MC-Unique: EWKNDH7RMb2lbxIZzXk12g-1 X-Mimecast-MFC-AGG-ID: EWKNDH7RMb2lbxIZzXk12g_1754396801 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-459d8020b7bso13919775e9.3 for ; Tue, 05 Aug 2025 05:26:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754396801; x=1755001601; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xtwCF+slk3iUvx5J+lbYi6HGbSFqiS4GPdt/W2+BsYg=; b=NTFXwqFX3xfZjpRfV+xg1uLrFiuzPsUxLK1ClWJgq7liNQPe2DTQ/s1epVQgkyuVpP DKwodGAJlOLrs8uO/uL/1BZtBl5CpS7tzlcHRCXxVxHH1oH6ODWK/fiG4BjniNDsLfte ch8e6L0Syjt4qZhqNuL3CCsjbL/CnEowCZyTRAanVsfUEQd/W/m7d1gW+NlV8APmCfFc WsqcWmthoWupdG7Hyq6qRnNjRlOmbO8igiDJ4//p8MRnYYVmSZEY3txm5pWcC9FoKTUM HwOQrq4WX0qlvqQZBNH0nTZT6+RWTcMmzuznwN9Pj5DS1NMUbOT9NA/sAOkozZ/cjd5k HzMA== X-Forwarded-Encrypted: i=1; AJvYcCW2O1A/r770CiUPRdUydcpGc5pcO4wMlt3ZoY8ossJrdJRcvRwPUnZfGoQG5QnLI3GMRXSV7/J3ug==@nongnu.org X-Gm-Message-State: AOJu0YyvwrLfenBnHLjKaWfh0dIe60qfE5ARgwrkgsWSH7C0tnrDDzVx p/mPrj2ZW/8HbrMSvZlSNIpBXsYYaldCJRZbfri5RezznY7XqiA0Sh91g2i9nFSZ2n+xjdoys6T kncGoY8nrRu/4P/MLYHvIIgT65qSOLEBkhLSAL9RJCqfcVu11Joxa+Q== X-Gm-Gg: ASbGncvVNiUs8KM1duQhCB2+KuCabIDQU77KYBBIC3bBdxGNHT2UzUu2EuYm+ISY4jk XCLeg5yFj9kq1is5itaX0Mai6iAv+DDOZ+W9AoR6pkyD+a2f8er0Tdq9FitdwEg38P9vnz4cU3m R+OkTNIth71MVZpy9Nh3PDfA04X3buGEbkel226mL9Jfvolg2TUxHcRvwR6YNW1Uhgbzqd3LCSj e7UdVBugp2cjCpMYNV/BUhbUiARXjK8u+U+MhGdFl16ctzjzO6yrxZZs/3yszyTyInAGBPwwizD MVH4N9xfTCuZgivG4KLMmuzMDClUa4cF X-Received: by 2002:a05:600c:35d5:b0:459:e20e:be2f with SMTP id 5b1f17b1804b1-459e20ec22cmr22118305e9.14.1754396801138; Tue, 05 Aug 2025 05:26:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2FNwrqlnGCAnA3iQgTMZJJnNmwqJ0gzhvZalTPvSAQYr3BRpFiiWhBVZ7QyqOyFtWQWZgtw== X-Received: by 2002:a05:600c:35d5:b0:459:e20e:be2f with SMTP id 5b1f17b1804b1-459e20ec22cmr22117915e9.14.1754396800633; Tue, 05 Aug 2025 05:26:40 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:1515:7300:62e6:253a:2a96:5e3]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459e58542f3sm1595975e9.10.2025.08.05.05.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Aug 2025 05:26:40 -0700 (PDT) Date: Tue, 5 Aug 2025 08:26:36 -0400 From: "Michael S. Tsirkin" To: Cornelia Huck Cc: Peter Maydell , Eduardo Habkost , Marcel Apfelbaum , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Yanan Wang , Zhao Liu , Paolo Bonzini , Richard Henderson , Laurent Vivier , Nicholas Piggin , Harsh Prateek Bora , David Hildenbrand , Ilya Leoshkevich , Thomas Huth , Halil Pasic , Christian Borntraeger , Eric Farman , Matthew Rosato , qemu-arm@nongnu.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org Subject: Re: [PATCH for-10.2] hw: add compat machines for 10.2 Message-ID: <20250805082628-mutt-send-email-mst@kernel.org> References: <20250805095616.1168905-1-cohuck@redhat.com> MIME-Version: 1.0 In-Reply-To: <20250805095616.1168905-1-cohuck@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9jkBslfQd9aPqKCcKlPgjSBSUpmVv9t0gjUemh3zATk_1754396801 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org On Tue, Aug 05, 2025 at 11:56:16AM +0200, Cornelia Huck wrote: > Add 10.2 machine types for arm/i440fx/m68k/q35/s390x/spapr. > > Signed-off-by: Cornelia Huck Acked-by: Michael S. Tsirkin > --- > hw/arm/virt.c | 9 ++++++++- > hw/core/machine.c | 3 +++ > hw/i386/pc.c | 3 +++ > hw/i386/pc_piix.c | 13 +++++++++++-- > hw/i386/pc_q35.c | 13 +++++++++++-- > hw/m68k/virt.c | 9 ++++++++- > hw/ppc/spapr.c | 15 +++++++++++++-- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 10 files changed, 76 insertions(+), 9 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index ef6be3660f5f..9326cfc895f7 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -3455,10 +3455,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_10_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(10, 2) > + > static void virt_machine_10_1_options(MachineClass *mc) > { > + virt_machine_10_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_10_1, hw_compat_10_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(10, 1) > +DEFINE_VIRT_MACHINE(10, 1) > > static void virt_machine_10_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index bd47527479a7..38c949c4f2ce 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -37,6 +37,9 @@ > #include "hw/virtio/virtio-iommu.h" > #include "audio/audio.h" > > +GlobalProperty hw_compat_10_1[] = {}; > +const size_t hw_compat_10_1_len = G_N_ELEMENTS(hw_compat_10_1); > + > GlobalProperty hw_compat_10_0[] = { > { "scsi-hd", "dpofua", "off" }, > { "vfio-pci", "x-migration-load-config-after-iter", "off" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 2f58e73d3347..bc048a6d1374 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -81,6 +81,9 @@ > { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\ > { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }, > > +GlobalProperty pc_compat_10_1[] = {}; > +const size_t pc_compat_10_1_len = G_N_ELEMENTS(pc_compat_10_1); > + > GlobalProperty pc_compat_10_0[] = { > { TYPE_X86_CPU, "x-consistent-cache", "false" }, > { TYPE_X86_CPU, "x-vendor-cpuid-only-v2", "false" }, > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index c03324281bdb..d165ac72ed75 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -504,12 +504,21 @@ static void pc_i440fx_machine_options(MachineClass *m) > pc_piix_compat_defaults, pc_piix_compat_defaults_len); > } > > -static void pc_i440fx_machine_10_1_options(MachineClass *m) > +static void pc_i440fx_machine_10_2_options(MachineClass *m) > { > pc_i440fx_machine_options(m); > } > > -DEFINE_I440FX_MACHINE_AS_LATEST(10, 1); > +DEFINE_I440FX_MACHINE_AS_LATEST(10, 2); > + > +static void pc_i440fx_machine_10_1_options(MachineClass *m) > +{ > + pc_i440fx_machine_10_2_options(m); > + compat_props_add(m->compat_props, hw_compat_10_1, hw_compat_10_1_len); > + compat_props_add(m->compat_props, pc_compat_10_1, pc_compat_10_1_len); > +} > + > +DEFINE_I440FX_MACHINE(10, 1); > > static void pc_i440fx_machine_10_0_options(MachineClass *m) > { > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index b309b2b378db..e89951285e58 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -374,12 +374,21 @@ static void pc_q35_machine_options(MachineClass *m) > pc_q35_compat_defaults, pc_q35_compat_defaults_len); > } > > -static void pc_q35_machine_10_1_options(MachineClass *m) > +static void pc_q35_machine_10_2_options(MachineClass *m) > { > pc_q35_machine_options(m); > } > > -DEFINE_Q35_MACHINE_AS_LATEST(10, 1); > +DEFINE_Q35_MACHINE_AS_LATEST(10, 2); > + > +static void pc_q35_machine_10_1_options(MachineClass *m) > +{ > + pc_q35_machine_10_2_options(m); > + compat_props_add(m->compat_props, hw_compat_10_1, hw_compat_10_1_len); > + compat_props_add(m->compat_props, pc_compat_10_1, pc_compat_10_1_len); > +} > + > +DEFINE_Q35_MACHINE(10, 1); > > static void pc_q35_machine_10_0_options(MachineClass *m) > { > diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c > index 875fd00ef8d2..98cfe43c73ae 100644 > --- a/hw/m68k/virt.c > +++ b/hw/m68k/virt.c > @@ -367,10 +367,17 @@ type_init(virt_machine_register_types) > #define DEFINE_VIRT_MACHINE(major, minor) \ > DEFINE_VIRT_MACHINE_IMPL(false, major, minor) > > +static void virt_machine_10_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(10, 2) > + > static void virt_machine_10_1_options(MachineClass *mc) > { > + virt_machine_10_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_10_1, hw_compat_10_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(10, 1) > +DEFINE_VIRT_MACHINE(10, 1) > > static void virt_machine_10_0_options(MachineClass *mc) > { > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 1855a3cd8d03..eb22333404d3 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4761,15 +4761,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > #define DEFINE_SPAPR_MACHINE(major, minor) \ > DEFINE_SPAPR_MACHINE_IMPL(false, major, minor) > > +/* > + * pseries-10.2 > + */ > +static void spapr_machine_10_2_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE_AS_LATEST(10, 2); > + > /* > * pseries-10.1 > */ > static void spapr_machine_10_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_10_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_10_1, hw_compat_10_1_len); > } > > -DEFINE_SPAPR_MACHINE_AS_LATEST(10, 1); > +DEFINE_SPAPR_MACHINE(10, 1); > > /* > * pseries-10.0 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index a79bd13275b9..d0c6e80cb050 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -911,14 +911,26 @@ static const TypeInfo ccw_machine_info = { > DEFINE_CCW_MACHINE_IMPL(false, major, minor) > > > +static void ccw_machine_10_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_10_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE_AS_LATEST(10, 2); > + > static void ccw_machine_10_1_instance_options(MachineState *machine) > { > + ccw_machine_10_2_instance_options(machine); > } > > static void ccw_machine_10_1_class_options(MachineClass *mc) > { > + ccw_machine_10_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_10_1, hw_compat_10_1_len); > } > -DEFINE_CCW_MACHINE_AS_LATEST(10, 1); > +DEFINE_CCW_MACHINE(10, 1); > > static void ccw_machine_10_0_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index f94713e6e29a..665b6201214c 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -779,6 +779,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_10_1[]; > +extern const size_t hw_compat_10_1_len; > + > extern GlobalProperty hw_compat_10_0[]; > extern const size_t hw_compat_10_0_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 79b72c54dd3f..e83157ab358f 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -214,6 +214,9 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size); > /* sgx.c */ > void pc_machine_init_sgx_epc(PCMachineState *pcms); > > +extern GlobalProperty pc_compat_10_1[]; > +extern const size_t pc_compat_10_1_len; > + > extern GlobalProperty pc_compat_10_0[]; > extern const size_t pc_compat_10_0_len; > > -- > 2.50.1