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 89F5AC369B5 for ; Mon, 14 Apr 2025 11:40:41 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u4IAq-00049Z-8r; Mon, 14 Apr 2025 07:40:34 -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 1u4I9R-0003In-AE for qemu-devel@nongnu.org; Mon, 14 Apr 2025 07:39:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u4I9P-0005NV-8t for qemu-devel@nongnu.org; Mon, 14 Apr 2025 07:38:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744630731; 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=5URvcRM/PLa7qq1fqG1PEHfxEv6adZZhwD1Vlr/G7UY=; b=hLPpVfwmLtr8i8Blbe89fhO4S/tf/gxfGiD0/pXg2RDN633JvDhax91Hw8S3DAniLlc6Qh 34Ue+5pJIIuuAxIsVii86+/Kz9ojxuE/BjXdidFZJ2hZJ5MVfQh4W/SpX4g7lrWDNnbC4Z KEV8SQsO+g0QMSRxdQ2BgLxpH4TN8ig= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-257-uPnoGbX4PNqcFoqdEW6bnw-1; Mon, 14 Apr 2025 07:38:49 -0400 X-MC-Unique: uPnoGbX4PNqcFoqdEW6bnw-1 X-Mimecast-MFC-AGG-ID: uPnoGbX4PNqcFoqdEW6bnw_1744630729 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43cf327e9a2so37644975e9.3 for ; Mon, 14 Apr 2025 04:38:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744630729; x=1745235529; 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=5URvcRM/PLa7qq1fqG1PEHfxEv6adZZhwD1Vlr/G7UY=; b=l7swulf8Am4KW0HFhFoecIp1VrU6/asQ2+6wEh+F6rsX3Jq+FsbtQYbKsOQ54T0f9E l+r2G/eBuagOgtuCgelM4a1tONvVlIVOz7/tw1A/kfScA1k2I9LunwWZTYwuv9sZKk5c xo8HYc8Z1M4fqX292RznXL4I1T1Adj0BrzGKUQfetKGgli3CjJ0kNp8E4n2Lw6cMjwk/ ymdm69rTBrymubuM8mqM+lM3MEL0ujD3A4RoeaCd/VbWjH8RHZVtTvwt1xjbvex2sqWh +0ecKczFGFiuCThnzye3NoMW5akA0hs9Qrd1qkskI+Z5Cm0XwphrdaIpChMWMc0jPiP/ rVEQ== X-Forwarded-Encrypted: i=1; AJvYcCVUopXTGmJ2M23/hA6Du3c3k9QHE1r/k7eo4nP/d8hpghZIrs01JNI5p1XOP8hsgeBaAsjVfZVYQDj6@nongnu.org X-Gm-Message-State: AOJu0YzkeEizUz0EU32vbsJl0GvmwTsnwdkS8m6RRP4wiCo/S0RbF/R4 /cSHCZTuHfYe1zcpjX1SpEv+XPu8c5dq7AW+1ouSxMV/q3YC7Gf+ibrY/9X0BejfE/VpIdjPuhd PAVb9hVopIRpSAYmw3VlrpKVu5uBALMM7BXf/uTRhdCIXf8x23qf3 X-Gm-Gg: ASbGncv7Dv+itf0OcSrXBMtgveFofAODf/FCHIkqYJKhC3qdFn50UYRwBAiXT5qXoSC fiUrQWc8wCiA8PdoopCB8CK83XScMBBsAexKRhiPiOGOJlE1IgHuHeqhwDBmZsziqustQObJDZh VwZZ0jPBbVQ3SnsufZyccos9UObzCnlBQZ6CyX+51bgBY/QeTQdZXNOtwxLvw5ufoDmmN+GC1Mc PY+dNpd4GcMf2lShJbIy+LV+7CIUzc5ygeZcI2GENq2wqlfhYDzFbysgfeEQXn67413MZDaXZI4 1zEIpw== X-Received: by 2002:a5d:6d86:0:b0:39c:1efc:1c1c with SMTP id ffacd0b85a97d-39ea5211898mr10407937f8f.34.1744630728533; Mon, 14 Apr 2025 04:38:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGMZtwsuR0BSRDu0qboIHUb+ZsKz8XFYvq71+HDFM+9hTbZjcHdwKG5s417oWlQ36jRcsAC5g== X-Received: by 2002:a5d:6d86:0:b0:39c:1efc:1c1c with SMTP id ffacd0b85a97d-39ea5211898mr10407907f8f.34.1744630728023; Mon, 14 Apr 2025 04:38:48 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:1517:1000:ea83:8e5f:3302:3575]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39eaf43cccdsm10748166f8f.79.2025.04.14.04.38.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 04:38:47 -0700 (PDT) Date: Mon, 14 Apr 2025 07:38:43 -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 , Daniel Henrique Barboza , Harsh Prateek Bora , Thomas Huth , Halil Pasic , Christian Borntraeger , Eric Farman , David Hildenbrand , Ilya Leoshkevich , qemu-arm@nongnu.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org Subject: Re: [PATCH] hw: add compat machines for 10.1 Message-ID: <20250414073837-mutt-send-email-mst@kernel.org> References: <20250414094543.221241-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250414094543.221241-1-cohuck@redhat.com> Received-SPF: pass client-ip=170.10.129.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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@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-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Mon, Apr 14, 2025 at 11:45:43AM +0200, Cornelia Huck wrote: > Add 10.1 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 a96452f17a48..3e72adaa918f 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -3408,10 +3408,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_10_1_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(10, 1) > + > static void virt_machine_10_0_options(MachineClass *mc) > { > + virt_machine_10_1_options(mc); > + compat_props_add(mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(10, 0) > +DEFINE_VIRT_MACHINE(10, 0) > > static void virt_machine_9_2_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 63c6ef93d296..abfcedd4a5f7 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_0[] = {}; > +const size_t hw_compat_10_0_len = G_N_ELEMENTS(hw_compat_10_0); > + > GlobalProperty hw_compat_9_2[] = { > {"arm-cpu", "backcompat-pauth-default-use-qarma5", "true"}, > { "virtio-balloon-pci", "vectors", "0" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 01d0581f62a3..1b5d55e96d51 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -79,6 +79,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_0[] = {}; > +const size_t pc_compat_10_0_len = G_N_ELEMENTS(pc_compat_10_0); > + > GlobalProperty pc_compat_9_2[] = {}; > const size_t pc_compat_9_2_len = G_N_ELEMENTS(pc_compat_9_2); > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 6c91e2d29298..dbb59df64f75 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -479,12 +479,21 @@ static void pc_i440fx_machine_options(MachineClass *m) > "Use a different south bridge than PIIX3"); > } > > -static void pc_i440fx_machine_10_0_options(MachineClass *m) > +static void pc_i440fx_machine_10_1_options(MachineClass *m) > { > pc_i440fx_machine_options(m); > } > > -DEFINE_I440FX_MACHINE_AS_LATEST(10, 0); > +DEFINE_I440FX_MACHINE_AS_LATEST(10, 1); > + > +static void pc_i440fx_machine_10_0_options(MachineClass *m) > +{ > + pc_i440fx_machine_10_1_options(m); > + compat_props_add(m->compat_props, hw_compat_10_0, hw_compat_10_0_len); > + compat_props_add(m->compat_props, pc_compat_10_0, pc_compat_10_0_len); > +} > + > +DEFINE_I440FX_MACHINE(10, 0); > > static void pc_i440fx_machine_9_2_options(MachineClass *m) > { > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index fd96d0345c7d..c538b3d05b47 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -361,12 +361,21 @@ static void pc_q35_machine_options(MachineClass *m) > pc_q35_compat_defaults, pc_q35_compat_defaults_len); > } > > -static void pc_q35_machine_10_0_options(MachineClass *m) > +static void pc_q35_machine_10_1_options(MachineClass *m) > { > pc_q35_machine_options(m); > } > > -DEFINE_Q35_MACHINE_AS_LATEST(10, 0); > +DEFINE_Q35_MACHINE_AS_LATEST(10, 1); > + > +static void pc_q35_machine_10_0_options(MachineClass *m) > +{ > + pc_q35_machine_10_1_options(m); > + compat_props_add(m->compat_props, hw_compat_10_0, hw_compat_10_0_len); > + compat_props_add(m->compat_props, pc_compat_10_0, pc_compat_10_0_len); > +} > + > +DEFINE_Q35_MACHINE(10, 0); > > static void pc_q35_machine_9_2_options(MachineClass *m) > { > diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c > index d967bdd7438e..295a614e1619 100644 > --- a/hw/m68k/virt.c > +++ b/hw/m68k/virt.c > @@ -366,10 +366,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_1_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(10, 1) > + > static void virt_machine_10_0_options(MachineClass *mc) > { > + virt_machine_10_1_options(mc); > + compat_props_add(mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(10, 0) > +DEFINE_VIRT_MACHINE(10, 0) > > static void virt_machine_9_2_options(MachineClass *mc) > { > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index b0a0f8c68951..6fef1d167ae6 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4766,15 +4766,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.1 > + */ > +static void spapr_machine_10_1_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE_AS_LATEST(10, 1); > + > /* > * pseries-10.0 > */ > static void spapr_machine_10_0_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_10_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); > } > > -DEFINE_SPAPR_MACHINE_AS_LATEST(10, 0); > +DEFINE_SPAPR_MACHINE(10, 0); > > /* > * pseries-9.2 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 75b32182eb01..d64923a2c86b 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -921,14 +921,26 @@ static const TypeInfo ccw_machine_info = { > DEFINE_CCW_MACHINE_IMPL(false, major, minor) > > > +static void ccw_machine_10_1_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_10_1_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE_AS_LATEST(10, 1); > + > static void ccw_machine_10_0_instance_options(MachineState *machine) > { > + ccw_machine_10_1_instance_options(machine); > } > > static void ccw_machine_10_0_class_options(MachineClass *mc) > { > + ccw_machine_10_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); > } > -DEFINE_CCW_MACHINE_AS_LATEST(10, 0); > +DEFINE_CCW_MACHINE(10, 0); > > static void ccw_machine_9_2_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index f22b2e7fc75b..bfe8643a27ad 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -761,6 +761,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_10_0[]; > +extern const size_t hw_compat_10_0_len; > + > extern GlobalProperty hw_compat_9_2[]; > extern const size_t hw_compat_9_2_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 103b54301f82..8677dc8950b4 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -215,6 +215,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_0[]; > +extern const size_t pc_compat_10_0_len; > + > extern GlobalProperty pc_compat_9_2[]; > extern const size_t pc_compat_9_2_len; > > -- > 2.49.0