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 lists1p.gnu.org (lists1p.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 979DEFED3FA for ; Fri, 24 Apr 2026 19:19:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wGM3N-0000P3-TB; Fri, 24 Apr 2026 15:19:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wGM3M-0000OF-Mm for qemu-arm@nongnu.org; Fri, 24 Apr 2026 15:19:04 -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 1wGM3K-00077p-R5 for qemu-arm@nongnu.org; Fri, 24 Apr 2026 15:19:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777058340; 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=iy0RjSV7hIDFmGODouT84CrAy0ZOOZ74p+RD+6ujHTU=; b=By1WZ+/0Si25jHpzUgE6hQeywFZJBbUJ3FBjaMCCPokRZjRz5Qe1CBsDvCq1DKUvqG/s7B 9I75ABPKvgVovGGelk/GSpJR6PowYHTspwOJPma3OZ50gNtC/Qfhzo2d5UNbOytajeeYQc JgzdHh9j41fwOBGU02h5rqxUASHnmYg= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-682-HIJO43vgOP2s3ndlW8CW6Q-1; Fri, 24 Apr 2026 15:18:58 -0400 X-MC-Unique: HIJO43vgOP2s3ndlW8CW6Q-1 X-Mimecast-MFC-AGG-ID: HIJO43vgOP2s3ndlW8CW6Q_1777058338 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-43d7d0947aeso5174489f8f.3 for ; Fri, 24 Apr 2026 12:18:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777058338; x=1777663138; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iy0RjSV7hIDFmGODouT84CrAy0ZOOZ74p+RD+6ujHTU=; b=pOUqLexRfYM6el3RM8QXE/X3aLk+Dd0J/kKdO1Urg7U/08jlnqlpHkYcPQg2FFbpc4 /W7OSlak0+wUpwTFnAiyJXlT1utBY/fvv7TD7sR2kzoLamnF4L0WgpF5el2M3nJwnub9 1YmOdrWwhVVO7klWvHAhO9VzJePHeUezP2DGNCt5YbMCc6yEChnAWURgF1bknCGzNuBg ZJr+FwtQFAmxBypLZMnNSBx5mZtV2xOZstuOKpBP8kaLJ5v7ZPKJqBvmlAVnk5kThiX/ 1Cn2SXs7pEaTOexfsC7yGWnoINFwNTBKEEp4NKB1kaxz8aY6vgIyBWwmry50VceQ09d1 EXpg== X-Gm-Message-State: AOJu0YwGUQqA1zBkx1gh/KYXu9uJ9EzJ6G6W09i5Oq5xofSnkm3c7jUW V83lMxPOewvV+VtT+4j5OD16PHyaoGVIx/zG7BO3k9PF9EARpN7Ux3JXM9AbfggnJKXEmQtVVXt sEfdkTdlLgOf4+XbrC4s6r7ag0u6+bcahRERC6MAQScspDtddfUmCLA== X-Gm-Gg: AeBDietItMti8/RgCj6PPvGNQPc3QQEGfxBbQQWsIBN3KsJ5raZHSxI9AnkpRRVw8Uu nTZmBzrThasxKlPQ8+mtkOrhfAwAp6y8jp9yz6yWA0ppkwzusj9sNM6z41pwEhMPrWJIuPWcz4t 9btTwSXPK3r/cCq0wK3O6oE70uFd3aLVOH8r8tLMlxI1TeAgi4MazANf4LYL5LJeNSwpoUGb/OT ADz6w9KqYOaEnnA25u8ljti4OhzdhUUpY9qoNAH0nSJyhy5uV4LLK+M0HzokPOuEHxCZyHOZtDb eTCP4ZJ8W+qUR6rkr5dqa0eK5PF1lawD9H+bxpBM8hHupA336HlTHhxV93IslsSWtvKdHp5SpAE fZIdlH3Or4iTuao3FHHTkyhzvIzWbIqI1rWj7vkXjDPIDACzwUpCprTrpN3CI6jU= X-Received: by 2002:a05:6000:2008:b0:43b:4982:fc73 with SMTP id ffacd0b85a97d-43fe3e08fc2mr53176308f8f.25.1777058337503; Fri, 24 Apr 2026 12:18:57 -0700 (PDT) X-Received: by 2002:a05:6000:2008:b0:43b:4982:fc73 with SMTP id ffacd0b85a97d-43fe3e08fc2mr53176251f8f.25.1777058336949; Fri, 24 Apr 2026 12:18:56 -0700 (PDT) Received: from redhat.com (bzq-79-177-155-147.red.bezeqint.net. [79.177.155.147]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43fe4cc07bbsm65470121f8f.11.2026.04.24.12.18.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2026 12:18:56 -0700 (PDT) Date: Fri, 24 Apr 2026 15:18:52 -0400 From: "Michael S. Tsirkin" To: Cornelia Huck Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Peter Maydell , 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 , Halil Pasic , Christian Borntraeger , Eric Farman , Matthew Rosato , Ilya Leoshkevich , David Hildenbrand Subject: Re: [PATCH for-11.1] hw: add compat machines for 11.1 Message-ID: <20260424151846-mutt-send-email-mst@kernel.org> References: <20260331140347.653404-1-cohuck@redhat.com> MIME-Version: 1.0 In-Reply-To: <20260331140347.653404-1-cohuck@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: oZvyLvG8SX9Y2DG9T_e7Ykzl6sy1LQ2JZyUmx8h6IrM_1777058338 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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, Mar 31, 2026 at 04:03:47PM +0200, Cornelia Huck wrote: > Add 11.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/core/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 ec0d8475ca40..d7e68d42ce02 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -3719,10 +3719,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_11_1_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(11, 1) > + > static void virt_machine_11_0_options(MachineClass *mc) > { > + virt_machine_11_1_options(mc); > + compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(11, 0) > +DEFINE_VIRT_MACHINE(11, 0) > > static void virt_machine_10_2_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 0aa77a57e956..1abc8ae73739 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -38,6 +38,9 @@ > #include "hw/acpi/generic_event_device.h" > #include "qemu/audio.h" > > +GlobalProperty hw_compat_11_0[] = {}; > +const size_t hw_compat_11_0_len = G_N_ELEMENTS(hw_compat_11_0); > + > GlobalProperty hw_compat_10_2[] = { > { "scsi-block", "migrate-pr", "off" }, > { "isa-cirrus-vga", "global-vmstate", "true" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 4b53b5be4a96..2ecad3c503fb 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -73,6 +73,9 @@ > #include "hw/xen/xen-bus.h" > #endif > > +GlobalProperty pc_compat_11_0[] = {}; > +const size_t pc_compat_11_0_len = G_N_ELEMENTS(pc_compat_11_0); > + > GlobalProperty pc_compat_10_2[] = {}; > const size_t pc_compat_10_2_len = G_N_ELEMENTS(pc_compat_10_2); > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 4d71e0d51a28..82457bdb167a 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -428,12 +428,21 @@ static void pc_i440fx_machine_options(MachineClass *m) > pc_piix_compat_defaults, pc_piix_compat_defaults_len); > } > > -static void pc_i440fx_machine_11_0_options(MachineClass *m) > +static void pc_i440fx_machine_11_1_options(MachineClass *m) > { > pc_i440fx_machine_options(m); > } > > -DEFINE_I440FX_MACHINE_AS_LATEST(11, 0); > +DEFINE_I440FX_MACHINE_AS_LATEST(11, 1); > + > +static void pc_i440fx_machine_11_0_options(MachineClass *m) > +{ > + pc_i440fx_machine_11_1_options(m); > + compat_props_add(m->compat_props, hw_compat_11_0, hw_compat_11_0_len); > + compat_props_add(m->compat_props, pc_compat_11_0, pc_compat_11_0_len); > +} > + > +DEFINE_I440FX_MACHINE(11, 0); > > static void pc_i440fx_machine_10_2_options(MachineClass *m) > { > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index cb23322f5a44..972dd9275f68 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -364,12 +364,21 @@ static void pc_q35_machine_options(MachineClass *m) > pc_q35_compat_defaults, pc_q35_compat_defaults_len); > } > > -static void pc_q35_machine_11_0_options(MachineClass *m) > +static void pc_q35_machine_11_1_options(MachineClass *m) > { > pc_q35_machine_options(m); > } > > -DEFINE_Q35_MACHINE_AS_LATEST(11, 0); > +DEFINE_Q35_MACHINE_AS_LATEST(11, 1); > + > +static void pc_q35_machine_11_0_options(MachineClass *m) > +{ > + pc_q35_machine_11_1_options(m); > + compat_props_add(m->compat_props, hw_compat_11_0, hw_compat_11_0_len); > + compat_props_add(m->compat_props, pc_compat_11_0, pc_compat_11_0_len); > +} > + > +DEFINE_Q35_MACHINE(11, 0); > > static void pc_q35_machine_10_2_options(MachineClass *m) > { > diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c > index ffe6e234155b..96c0fb73fea5 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_11_1_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(11, 1) > + > static void virt_machine_11_0_options(MachineClass *mc) > { > + virt_machine_11_1_options(mc); > + compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(11, 0) > +DEFINE_VIRT_MACHINE(11, 0) > > static void virt_machine_10_2_options(MachineClass *mc) > { > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 0ab39dfea6b8..428b491a7df1 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4760,15 +4760,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > #define DEFINE_SPAPR_MACHINE(major, minor) \ > DEFINE_SPAPR_MACHINE_IMPL(false, major, minor) > > +/* > + * pseries-11.1 > + */ > +static void spapr_machine_11_1_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE_AS_LATEST(11, 1); > + > /* > * pseries-11.0 > */ > static void spapr_machine_11_0_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_11_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len); > } > > -DEFINE_SPAPR_MACHINE_AS_LATEST(11, 0); > +DEFINE_SPAPR_MACHINE(11, 0); > > /* > * pseries-10.2 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 3ef009463d11..cc768daeb04c 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -907,14 +907,26 @@ static const TypeInfo ccw_machine_info = { > DEFINE_CCW_MACHINE_IMPL(false, major, minor) > > > +static void ccw_machine_11_1_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_11_1_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE_AS_LATEST(11, 1); > + > static void ccw_machine_11_0_instance_options(MachineState *machine) > { > + ccw_machine_11_1_instance_options(machine); > } > > static void ccw_machine_11_0_class_options(MachineClass *mc) > { > + ccw_machine_11_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len); > } > -DEFINE_CCW_MACHINE_AS_LATEST(11, 0); > +DEFINE_CCW_MACHINE(11, 0); > > static void ccw_machine_10_2_instance_options(MachineState *machine) > { > diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h > index b8dad0a1074d..db83fe92922b 100644 > --- a/include/hw/core/boards.h > +++ b/include/hw/core/boards.h > @@ -798,6 +798,9 @@ struct MachineState { > } \ > } while (0) > > +extern GlobalProperty hw_compat_11_0[]; > +extern const size_t hw_compat_11_0_len; > + > extern GlobalProperty hw_compat_10_2[]; > extern const size_t hw_compat_10_2_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 22325324d094..85a74363b52e 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -208,6 +208,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_11_0[]; > +extern const size_t pc_compat_11_0_len; > + > extern GlobalProperty pc_compat_10_2[]; > extern const size_t pc_compat_10_2_len; > > -- > 2.53.0