{"id":2227157,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2227157/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260423094856.270215-9-cohuck@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260423094856.270215-9-cohuck@redhat.com>","date":"2026-04-23T09:48:53","name":"[PULL,08/11] hw: add compat machines for 11.1","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a0b92028d5f7cb7e8a17c82ec348fa6b59967e8c","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/1.1/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260423094856.270215-9-cohuck@redhat.com/mbox/","series":[{"id":501169,"url":"http://patchwork.ozlabs.org/api/1.1/series/501169/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501169","date":"2026-04-23T09:48:46","name":"[PULL,01/11] target/s390x/kvm: Simplify the async pfault handling code","version":1,"mbox":"http://patchwork.ozlabs.org/series/501169/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2227157/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2227157/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=b7gwF6z+;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g1WYf0CrMz1yGs\n\tfor ; Thu, 23 Apr 2026 19:50:45 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wFqhH-00006t-Pj; Thu, 23 Apr 2026 05:50:11 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wFqgW-00088R-H4\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 05:49:27 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wFqgU-0001Ok-8G\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 05:49:23 -0400","from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-138-ZEDwaiy5PP6CUUBcZ_xuUQ-1; Thu,\n 23 Apr 2026 05:49:18 -0400","from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 773E4195609E; Thu, 23 Apr 2026 09:49:17 +0000 (UTC)","from gondolin.str.redhat.com (dhcp-192-224.str.redhat.com\n [10.33.192.224])\n by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 4DCD53000709; Thu, 23 Apr 2026 09:49:16 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1776937761;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=/IUNg/bqXGhAM46xsuGhUHknfvqkJ/1A+TqtAjw7bCI=;\n b=b7gwF6z+y73gzdIjpT2dTz0SoH7vOrmLv0Is1sYnKwiIyw/CZCmVvQWL4cpCmyScSnh+nU\n yomfeKSEQ24zNHL7OQfkp4STI59CMnLIV9M0DVJaNM2PqCyWa1NVqT/+uE901BjjVEMUBq\n zQ0Of4QI2E4xABzK3Ga0zO+HCd7UXpQ=","X-MC-Unique":"ZEDwaiy5PP6CUUBcZ_xuUQ-1","X-Mimecast-MFC-AGG-ID":"ZEDwaiy5PP6CUUBcZ_xuUQ_1776937757","From":"Cornelia Huck ","To":"qemu-devel@nongnu.org","Cc":"qemu-s390x@nongnu.org, Cornelia Huck ,\n Eric Farman ","Subject":"[PULL 08/11] hw: add compat machines for 11.1","Date":"Thu, 23 Apr 2026 11:48:53 +0200","Message-ID":"<20260423094856.270215-9-cohuck@redhat.com>","In-Reply-To":"<20260423094856.270215-1-cohuck@redhat.com>","References":"<20260423094856.270215-1-cohuck@redhat.com>","MIME-Version":"1.0","Content-type":"text/plain","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.4","Received-SPF":"pass client-ip=170.10.133.124; envelope-from=cohuck@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"12","X-Spam_score":"1.2","X-Spam_bar":"+","X-Spam_report":"(1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001,\n SPF_PASS=-0.001 autolearn=no autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Add 11.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.\n\nReviewed-by: Eric Farman # s390\nSigned-off-by: Cornelia Huck \nMessage-ID: <20260331140347.653404-1-cohuck@redhat.com>\n---\n hw/arm/virt.c | 9 ++++++++-\n hw/core/machine.c | 3 +++\n hw/i386/pc.c | 3 +++\n hw/i386/pc_piix.c | 13 +++++++++++--\n hw/i386/pc_q35.c | 13 +++++++++++--\n hw/m68k/virt.c | 9 ++++++++-\n hw/ppc/spapr.c | 15 +++++++++++++--\n hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-\n include/hw/core/boards.h | 3 +++\n include/hw/i386/pc.h | 3 +++\n 10 files changed, 76 insertions(+), 9 deletions(-)","diff":"diff --git a/hw/arm/virt.c b/hw/arm/virt.c\nindex ec0d8475ca40..d7e68d42ce02 100644\n--- a/hw/arm/virt.c\n+++ b/hw/arm/virt.c\n@@ -3719,10 +3719,17 @@ static void machvirt_machine_init(void)\n }\n type_init(machvirt_machine_init);\n \n+static void virt_machine_11_1_options(MachineClass *mc)\n+{\n+}\n+DEFINE_VIRT_MACHINE_AS_LATEST(11, 1)\n+\n static void virt_machine_11_0_options(MachineClass *mc)\n {\n+ virt_machine_11_1_options(mc);\n+ compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len);\n }\n-DEFINE_VIRT_MACHINE_AS_LATEST(11, 0)\n+DEFINE_VIRT_MACHINE(11, 0)\n \n static void virt_machine_10_2_options(MachineClass *mc)\n {\ndiff --git a/hw/core/machine.c b/hw/core/machine.c\nindex 0aa77a57e956..1abc8ae73739 100644\n--- a/hw/core/machine.c\n+++ b/hw/core/machine.c\n@@ -38,6 +38,9 @@\n #include \"hw/acpi/generic_event_device.h\"\n #include \"qemu/audio.h\"\n \n+GlobalProperty hw_compat_11_0[] = {};\n+const size_t hw_compat_11_0_len = G_N_ELEMENTS(hw_compat_11_0);\n+\n GlobalProperty hw_compat_10_2[] = {\n { \"scsi-block\", \"migrate-pr\", \"off\" },\n { \"isa-cirrus-vga\", \"global-vmstate\", \"true\" },\ndiff --git a/hw/i386/pc.c b/hw/i386/pc.c\nindex 4b53b5be4a96..2ecad3c503fb 100644\n--- a/hw/i386/pc.c\n+++ b/hw/i386/pc.c\n@@ -73,6 +73,9 @@\n #include \"hw/xen/xen-bus.h\"\n #endif\n \n+GlobalProperty pc_compat_11_0[] = {};\n+const size_t pc_compat_11_0_len = G_N_ELEMENTS(pc_compat_11_0);\n+\n GlobalProperty pc_compat_10_2[] = {};\n const size_t pc_compat_10_2_len = G_N_ELEMENTS(pc_compat_10_2);\n \ndiff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c\nindex 4d71e0d51a28..82457bdb167a 100644\n--- a/hw/i386/pc_piix.c\n+++ b/hw/i386/pc_piix.c\n@@ -428,12 +428,21 @@ static void pc_i440fx_machine_options(MachineClass *m)\n pc_piix_compat_defaults, pc_piix_compat_defaults_len);\n }\n \n-static void pc_i440fx_machine_11_0_options(MachineClass *m)\n+static void pc_i440fx_machine_11_1_options(MachineClass *m)\n {\n pc_i440fx_machine_options(m);\n }\n \n-DEFINE_I440FX_MACHINE_AS_LATEST(11, 0);\n+DEFINE_I440FX_MACHINE_AS_LATEST(11, 1);\n+\n+static void pc_i440fx_machine_11_0_options(MachineClass *m)\n+{\n+ pc_i440fx_machine_11_1_options(m);\n+ compat_props_add(m->compat_props, hw_compat_11_0, hw_compat_11_0_len);\n+ compat_props_add(m->compat_props, pc_compat_11_0, pc_compat_11_0_len);\n+}\n+\n+DEFINE_I440FX_MACHINE(11, 0);\n \n static void pc_i440fx_machine_10_2_options(MachineClass *m)\n {\ndiff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c\nindex cb23322f5a44..972dd9275f68 100644\n--- a/hw/i386/pc_q35.c\n+++ b/hw/i386/pc_q35.c\n@@ -364,12 +364,21 @@ static void pc_q35_machine_options(MachineClass *m)\n pc_q35_compat_defaults, pc_q35_compat_defaults_len);\n }\n \n-static void pc_q35_machine_11_0_options(MachineClass *m)\n+static void pc_q35_machine_11_1_options(MachineClass *m)\n {\n pc_q35_machine_options(m);\n }\n \n-DEFINE_Q35_MACHINE_AS_LATEST(11, 0);\n+DEFINE_Q35_MACHINE_AS_LATEST(11, 1);\n+\n+static void pc_q35_machine_11_0_options(MachineClass *m)\n+{\n+ pc_q35_machine_11_1_options(m);\n+ compat_props_add(m->compat_props, hw_compat_11_0, hw_compat_11_0_len);\n+ compat_props_add(m->compat_props, pc_compat_11_0, pc_compat_11_0_len);\n+}\n+\n+DEFINE_Q35_MACHINE(11, 0);\n \n static void pc_q35_machine_10_2_options(MachineClass *m)\n {\ndiff --git a/hw/m68k/virt.c b/hw/m68k/virt.c\nindex ffe6e234155b..96c0fb73fea5 100644\n--- a/hw/m68k/virt.c\n+++ b/hw/m68k/virt.c\n@@ -367,10 +367,17 @@ type_init(virt_machine_register_types)\n #define DEFINE_VIRT_MACHINE(major, minor) \\\n DEFINE_VIRT_MACHINE_IMPL(false, major, minor)\n \n+static void virt_machine_11_1_options(MachineClass *mc)\n+{\n+}\n+DEFINE_VIRT_MACHINE_AS_LATEST(11, 1)\n+\n static void virt_machine_11_0_options(MachineClass *mc)\n {\n+ virt_machine_11_1_options(mc);\n+ compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len);\n }\n-DEFINE_VIRT_MACHINE_AS_LATEST(11, 0)\n+DEFINE_VIRT_MACHINE(11, 0)\n \n static void virt_machine_10_2_options(MachineClass *mc)\n {\ndiff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c\nindex 0ab39dfea6b8..428b491a7df1 100644\n--- a/hw/ppc/spapr.c\n+++ b/hw/ppc/spapr.c\n@@ -4760,15 +4760,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)\n #define DEFINE_SPAPR_MACHINE(major, minor) \\\n DEFINE_SPAPR_MACHINE_IMPL(false, major, minor)\n \n+/*\n+ * pseries-11.1\n+ */\n+static void spapr_machine_11_1_class_options(MachineClass *mc)\n+{\n+ /* Defaults for the latest behaviour inherited from the base class */\n+}\n+\n+DEFINE_SPAPR_MACHINE_AS_LATEST(11, 1);\n+\n /*\n * pseries-11.0\n */\n static void spapr_machine_11_0_class_options(MachineClass *mc)\n {\n- /* Defaults for the latest behaviour inherited from the base class */\n+ spapr_machine_11_1_class_options(mc);\n+ compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len);\n }\n \n-DEFINE_SPAPR_MACHINE_AS_LATEST(11, 0);\n+DEFINE_SPAPR_MACHINE(11, 0);\n \n /*\n * pseries-10.2\ndiff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex 3ef009463d11..cc768daeb04c 100644\n--- a/hw/s390x/s390-virtio-ccw.c\n+++ b/hw/s390x/s390-virtio-ccw.c\n@@ -907,14 +907,26 @@ static const TypeInfo ccw_machine_info = {\n DEFINE_CCW_MACHINE_IMPL(false, major, minor)\n \n \n+static void ccw_machine_11_1_instance_options(MachineState *machine)\n+{\n+}\n+\n+static void ccw_machine_11_1_class_options(MachineClass *mc)\n+{\n+}\n+DEFINE_CCW_MACHINE_AS_LATEST(11, 1);\n+\n static void ccw_machine_11_0_instance_options(MachineState *machine)\n {\n+ ccw_machine_11_1_instance_options(machine);\n }\n \n static void ccw_machine_11_0_class_options(MachineClass *mc)\n {\n+ ccw_machine_11_1_class_options(mc);\n+ compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len);\n }\n-DEFINE_CCW_MACHINE_AS_LATEST(11, 0);\n+DEFINE_CCW_MACHINE(11, 0);\n \n static void ccw_machine_10_2_instance_options(MachineState *machine)\n {\ndiff --git a/include/hw/core/boards.h b/include/hw/core/boards.h\nindex b8dad0a1074d..db83fe92922b 100644\n--- a/include/hw/core/boards.h\n+++ b/include/hw/core/boards.h\n@@ -798,6 +798,9 @@ struct MachineState {\n } \\\n } while (0)\n \n+extern GlobalProperty hw_compat_11_0[];\n+extern const size_t hw_compat_11_0_len;\n+\n extern GlobalProperty hw_compat_10_2[];\n extern const size_t hw_compat_10_2_len;\n \ndiff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h\nindex 22325324d094..85a74363b52e 100644\n--- a/include/hw/i386/pc.h\n+++ b/include/hw/i386/pc.h\n@@ -208,6 +208,9 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size);\n /* sgx.c */\n void pc_machine_init_sgx_epc(PCMachineState *pcms);\n \n+extern GlobalProperty pc_compat_11_0[];\n+extern const size_t pc_compat_11_0_len;\n+\n extern GlobalProperty pc_compat_10_2[];\n extern const size_t pc_compat_10_2_len;\n \n","prefixes":["PULL","08/11"]}