From nobody Mon Feb 9 16:01:05 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1767787799; cv=none; d=zohomail.com; s=zohoarc; b=TKMRTa/jkcYKWuG407AfEpNAm3kbx/jp2im6T2KFyCrZ3cjeUujNlrX12CNKvqkelQzOK5BjmCEirRRlv0h93I2Qtmbnl2I8h2pU7jqsVK5SXMYLdajpaB4sGy+nq4KwoY+2r9bg4eERrZPL6T/LBrE46cUY5rrXj5FUjdv+9ho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767787799; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=A8jtFfWEnrXsdxJwtHJj5VeC+95moyNsGdOAbR+Kn64=; b=hwHnNtPy0RNcPwr7DepbCfWX5k2Re/Jc3pKL6RV7ladVlz5g7oLVFAv9hgBMAoayF2qvrOIcbTQhoWJtxOSQbFtDPlD3Xz7xySRPZG0/FTTURqefBEgmrkO/MzTnh2mZC3l1OzeAoDpRtvx3d6iyMHEDrSsSHPoSstJvlD+JSI4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767787799236127.68597408732182; Wed, 7 Jan 2026 04:09:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdSJb-0003s8-Eb; Wed, 07 Jan 2026 07:07:04 -0500 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 1vdSJU-0003ra-VT for qemu-devel@nongnu.org; Wed, 07 Jan 2026 07:06:56 -0500 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 1vdSJM-00027H-7E for qemu-devel@nongnu.org; Wed, 07 Jan 2026 07:06:51 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-175-vrgBzPJ6MbaaS56AO1PScQ-1; Wed, 07 Jan 2026 07:06:44 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E90AF18005B8; Wed, 7 Jan 2026 12:06:43 +0000 (UTC) Received: from thuth-p1g4.str.redhat.com (dhcp-192-176.str.redhat.com [10.33.192.176]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E3ADF1956048; Wed, 7 Jan 2026 12:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767787606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A8jtFfWEnrXsdxJwtHJj5VeC+95moyNsGdOAbR+Kn64=; b=OX4pG6iJMNTXfvaeEXRQb4nFP/H+aqo+48Kcwq76+QgaaBChVcT1aTBw4plJ0p+JZV/Rju nG9kVMTWbRjkobuyTvj5RlW/a/E6U1x5J/A3n0fGpZX6mzP49vQHPXIPoTUjFwU12W2tgK +08HWlJ+KJwvXPb60xF+Zt2Gd18jEK0= X-MC-Unique: vrgBzPJ6MbaaS56AO1PScQ-1 X-Mimecast-MFC-AGG-ID: vrgBzPJ6MbaaS56AO1PScQ_1767787604 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Cornelia Huck Subject: [PULL 02/14] hw: add compat machines for 11.0 Date: Wed, 7 Jan 2026 13:06:26 +0100 Message-ID: <20260107120638.56735-3-thuth@redhat.com> In-Reply-To: <20260107120638.56735-1-thuth@redhat.com> References: <20260107120638.56735-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@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_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1767787801109158500 Content-Type: text/plain; charset="utf-8" From: Cornelia Huck Add 11.0 machine types for arm/i440fx/m68k/q35/s390x/spapr. Signed-off-by: Cornelia Huck Reviewed-by: Thomas Huth Message-ID: <20251112130031.2484181-1-cohuck@redhat.com> Signed-off-by: Thomas Huth --- include/hw/core/boards.h | 3 +++ include/hw/i386/pc.h | 3 +++ 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 +++++++++++++- 10 files changed, 76 insertions(+), 9 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 815845207b0..07f89387525 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -798,6 +798,9 @@ struct MachineState { } \ } while (0) =20 +extern GlobalProperty hw_compat_10_2[]; +extern const size_t hw_compat_10_2_len; + extern GlobalProperty hw_compat_10_1[]; extern const size_t hw_compat_10_1_len; =20 diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index b3a45ab71a8..1890c61a387 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, siz= e_t flash_size); /* sgx.c */ void pc_machine_init_sgx_epc(PCMachineState *pcms); =20 +extern GlobalProperty pc_compat_10_2[]; +extern const size_t pc_compat_10_2_len; + extern GlobalProperty pc_compat_10_1[]; extern const size_t pc_compat_10_1_len; =20 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index fd0e28f030a..9d0568a7d56 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3533,10 +3533,17 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); =20 +static void virt_machine_11_0_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 0) + static void virt_machine_10_2_options(MachineClass *mc) { + virt_machine_11_0_options(mc); + compat_props_add(mc->compat_props, hw_compat_10_2, hw_compat_10_2_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(10, 2) +DEFINE_VIRT_MACHINE(10, 2) =20 static void virt_machine_10_1_options(MachineClass *mc) { diff --git a/hw/core/machine.c b/hw/core/machine.c index 51c28468ff9..6411e68856b 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" =20 +GlobalProperty hw_compat_10_2[] =3D {}; +const size_t hw_compat_10_2_len =3D G_N_ELEMENTS(hw_compat_10_2); + GlobalProperty hw_compat_10_1[] =3D { { TYPE_ACPI_GED, "x-has-hest-addr", "false" }, { TYPE_VIRTIO_NET, "host_tunnel", "off" }, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 1478a26f11b..5cb074c0a08 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, }, =20 +GlobalProperty pc_compat_10_2[] =3D {}; +const size_t pc_compat_10_2_len =3D G_N_ELEMENTS(pc_compat_10_2); + GlobalProperty pc_compat_10_1[] =3D { { "mch", "extended-tseg-mbytes", "16" }, }; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 2e2671d6050..fea158fc4bf 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -438,12 +438,21 @@ static void pc_i440fx_machine_options(MachineClass *m) pc_piix_compat_defaults, pc_piix_compat_defaults_len); } =20 -static void pc_i440fx_machine_10_2_options(MachineClass *m) +static void pc_i440fx_machine_11_0_options(MachineClass *m) { pc_i440fx_machine_options(m); } =20 -DEFINE_I440FX_MACHINE_AS_LATEST(10, 2); +DEFINE_I440FX_MACHINE_AS_LATEST(11, 0); + +static void pc_i440fx_machine_10_2_options(MachineClass *m) +{ + pc_i440fx_machine_11_0_options(m); + compat_props_add(m->compat_props, hw_compat_10_2, hw_compat_10_2_len); + compat_props_add(m->compat_props, pc_compat_10_2, pc_compat_10_2_len); +} + +DEFINE_I440FX_MACHINE(10, 2); =20 static void pc_i440fx_machine_10_1_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 18158ad15e4..4d6046e47b0 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); } =20 -static void pc_q35_machine_10_2_options(MachineClass *m) +static void pc_q35_machine_11_0_options(MachineClass *m) { pc_q35_machine_options(m); } =20 -DEFINE_Q35_MACHINE_AS_LATEST(10, 2); +DEFINE_Q35_MACHINE_AS_LATEST(11, 0); + +static void pc_q35_machine_10_2_options(MachineClass *m) +{ + pc_q35_machine_11_0_options(m); + compat_props_add(m->compat_props, hw_compat_10_2, hw_compat_10_2_len); + compat_props_add(m->compat_props, pc_compat_10_2, pc_compat_10_2_len); +} + +DEFINE_Q35_MACHINE(10, 2); =20 static void pc_q35_machine_10_1_options(MachineClass *m) { diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 7be3a248000..e67900c727d 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) =20 +static void virt_machine_11_0_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(11, 0) + static void virt_machine_10_2_options(MachineClass *mc) { + virt_machine_11_0_options(mc); + compat_props_add(mc->compat_props, hw_compat_10_2, hw_compat_10_2_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(10, 2) +DEFINE_VIRT_MACHINE(10, 2) =20 static void virt_machine_10_1_options(MachineClass *mc) { diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index bcf6aa560f3..3d87450be53 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4751,15 +4751,26 @@ static void spapr_machine_latest_class_options(Mach= ineClass *mc) #define DEFINE_SPAPR_MACHINE(major, minor) \ DEFINE_SPAPR_MACHINE_IMPL(false, major, minor) =20 +/* + * pseries-11.0 + */ +static void spapr_machine_11_0_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE_AS_LATEST(11, 0); + /* * pseries-10.2 */ static void spapr_machine_10_2_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_11_0_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_10_2, hw_compat_10_2_len); } =20 -DEFINE_SPAPR_MACHINE_AS_LATEST(10, 2); +DEFINE_SPAPR_MACHINE(10, 2); =20 /* * pseries-10.1 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 05aa6e15c38..5e9bab2ee7e 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -890,14 +890,26 @@ static const TypeInfo ccw_machine_info =3D { DEFINE_CCW_MACHINE_IMPL(false, major, minor) =20 =20 +static void ccw_machine_11_0_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_11_0_class_options(MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE_AS_LATEST(11, 0); + static void ccw_machine_10_2_instance_options(MachineState *machine) { + ccw_machine_11_0_instance_options(machine); } =20 static void ccw_machine_10_2_class_options(MachineClass *mc) { + ccw_machine_11_0_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_10_2, hw_compat_10_2_len); } -DEFINE_CCW_MACHINE_AS_LATEST(10, 2); +DEFINE_CCW_MACHINE(10, 2); =20 static void ccw_machine_10_1_instance_options(MachineState *machine) { --=20 2.52.0