Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2230479/?format=api
{ "id": 2230479, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2230479/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260429190532.26538-3-mohamed@unpredictable.fr/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.1/projects/14/?format=api", "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": "<20260429190532.26538-3-mohamed@unpredictable.fr>", "date": "2026-04-29T19:05:19", "name": "[v21,02/15] hw/intc: arm_gicv3_hvf: save/restore Apple GIC state", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "a92293649653464a18802c2c769924e614e11a38", "submitter": { "id": 91318, "url": "http://patchwork.ozlabs.org/api/1.1/people/91318/?format=api", "name": "Mohamed Mediouni", "email": "mohamed@unpredictable.fr" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260429190532.26538-3-mohamed@unpredictable.fr/mbox/", "series": [ { "id": 502138, "url": "http://patchwork.ozlabs.org/api/1.1/series/502138/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502138", "date": "2026-04-29T19:05:29", "name": "HVF: Add support for platform vGIC and nested virtualisation", "version": 21, "mbox": "http://patchwork.ozlabs.org/series/502138/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2230479/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2230479/checks/", "tags": {}, "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=unpredictable.fr header.i=@unpredictable.fr\n header.a=rsa-sha256 header.s=sig1 header.b=XqTHwzCz;\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 4g5Rcz0Bpfz1xqf\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 30 Apr 2026 05:07:15 +1000 (AEST)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wIAEJ-0001Zg-39; Wed, 29 Apr 2026 15:05:51 -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 <mohamed@unpredictable.fr>)\n id 1wIAEH-0001ZS-Uf\n for qemu-devel@nongnu.org; Wed, 29 Apr 2026 15:05:49 -0400", "from ms-2001b-snip4-3.eps.apple.com ([57.103.73.144]\n helo=outbound.ms.icloud.com)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <mohamed@unpredictable.fr>)\n id 1wIAEF-0000Hs-Ej\n for qemu-devel@nongnu.org; Wed, 29 Apr 2026 15:05:49 -0400", "from outbound.ms.icloud.com (unknown [127.0.0.2])\n by p00-icloudmta-asmtp-us-west-3a-60-percent-6 (Postfix) with ESMTPS id\n D13D218005C4; Wed, 29 Apr 2026 19:05:44 +0000 (UTC)", "from localhost.localdomain (unknown [17.57.154.37])\n by p00-icloudmta-asmtp-us-west-3a-60-percent-6 (Postfix) with ESMTPSA id\n CBFA918000F6; Wed, 29 Apr 2026 19:05:41 +0000 (UTC)" ], "X-ICL-Out-Info": "\n HUtFAUMHWwJACUgBTUQeDx5WFlZNRAJCTQFIHV8DWRxBAUkdXw9LVxQEFVwFVgZXFHkNXR1FDlYZWgxSD1sOHBZLWFUJCgZdGFgVVgl3HlwASx1XBFQfUxJVHR0LRUtAEwRJB01fDl4fBBdGGVUERx5dVl4eGQJRHFYNV0NUBF9QSQxBUGxaAEcXSB1dGVlvUF0cDhhZG0AVXRFQGVYJXhUXHkFNWgJWTQVKA18BWwZCAEkKXQJYAF4LTgZeD0YBXVQXWwxaDlYwTBZDH1IPWxNNGVEBUkVUAgdYRxRHDg8TTAtHAlo0Vh9UGVoD", "Dkim-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1777489546; x=1780081546;\n bh=2plkI8G/xtaBqtwyh6xOVg+3IVt0va4ZwnudgPTYjC8=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme;\n b=XqTHwzCzIoZ47Z3/Rn2YOiDGTc61rqJ1rchUAOxhAHwk8nLUsXAl8sqpw8e8t4g5bNxQ7HVw23LAvgh4O6H2YYsOncwE/g/G5YzvEgdjIS2ojsN6WQh18upg90Ha8ANvWjh+8TR+JS2XhvfR+S56qkxa2ezr2bpYH2wepBZeG6Y+bpELOknRQ3TAQYRajZpfx/NvvZyTrP8AvbdGpvLa66Y5JkFPpaj5k661xaCqZgf1lFdWl6EIaVOFp3etATgIKx+IaGeymsDQ0okwsqr7uAINa1avgruuEW+HkMQK2IsF4D7mfgB1uS4zMiAn7DcTpcdVz3h8XbfepCSUjHwBTg==", "mail-alias-created-date": "1752046281608", "From": "Mohamed Mediouni <mohamed@unpredictable.fr>", "To": "qemu-devel@nongnu.org", "Cc": "Phil Dennis-Jordan <phil@philjordan.eu>,\n Yanan Wang <wangyanan55@huawei.com>, Paolo Bonzini <pbonzini@redhat.com>,\n Roman Bolshakov <rbolshakov@ddn.com>,\n =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>,\n qemu-arm@nongnu.org, Zhao Liu <zhao1.liu@intel.com>,\n Alexander Graf <agraf@csgraf.de>, Eduardo Habkost <eduardo@habkost.net>,\n Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,\n Peter Maydell <peter.maydell@linaro.org>,\n Mohamed Mediouni <mohamed@unpredictable.fr>,\n Manos Pitsidianakis <manos.pitsidianakis@linaro.org>", "Subject": "[PATCH v21 02/15] hw/intc: arm_gicv3_hvf: save/restore Apple GIC\n state", "Date": "Wed, 29 Apr 2026 21:05:19 +0200", "Message-ID": "<20260429190532.26538-3-mohamed@unpredictable.fr>", "X-Mailer": "git-send-email 2.50.1", "In-Reply-To": "<20260429190532.26538-1-mohamed@unpredictable.fr>", "References": "<20260429190532.26538-1-mohamed@unpredictable.fr>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-Proofpoint-Spam-Details-Enc": "AW1haW4tMjYwNDI5MDE5MCBTYWx0ZWRfXxS/RbWKnmguq\n GkHbWTwc3iiwREbPI6zbv/F3JAhKE6ELPtSl+70J6mHbpAtPTr0JZQcyHYKhCvTNoDjTgft6rK1\n qFbMSDGbfb8/EFdmdLGzeHO6nM+wNSdhMdx9nP2xcSIRSGhs0hhuZ9DXKzHQ+KT7ZedpY3Og6Bw\n HQO94dwMHz1TRlxqvwAnw6e1pl7M7ZIeT7tBisfptgrMWpwdhMrw9tEoTkq/tnJhfnpCsFWhiBi\n VWmPjUOZrukQE/Is4Sk5Wv6vsPcN1GFxyL7s8KF23LkHiahb/XvwNRMKc2fg+/Iz6vGa3MYHkhx\n HtYnPrHaKLoRFUYnxWaCSIgBvPfu9IMmshUeACIn+wNISFHzpsBD43l1BFCaRY=", "X-Proofpoint-GUID": "cp22U5CM6eTCRlqNTmnbr1fyGUJJSHO-", "X-Proofpoint-ORIG-GUID": "cp22U5CM6eTCRlqNTmnbr1fyGUJJSHO-", "X-Authority-Info-Out": "v=2.4 cv=aIv9aL9m c=1 sm=1 tr=0 ts=69f25689\n cx=c_apl:c_pps:t_out a=qkKslKyYc0ctBTeLUVfTFg==:117 a=IkcTkHD0fZMA:10\n a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8\n a=kNOF8fv34t_zTB2Y_VIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10\n a=cvBusfyB2V15izCimMoJ:22", "Received-SPF": "pass client-ip=57.103.73.144;\n envelope-from=mohamed@unpredictable.fr; helo=outbound.ms.icloud.com", "X-Spam_score_int": "-27", "X-Spam_score": "-2.8", "X-Spam_bar": "--", "X-Spam_report": "(-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001,\n 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": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "On HVF, some of the GIC state is in an opaque Apple-provided structure.\n\nSave/restore that state to be able to save/restore VMs that use the hardware GIC.\n\nSigned-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>\nReviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>\nReviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>\n---\n hw/intc/arm_gicv3_common.c | 1 +\n hw/intc/arm_gicv3_hvf.c | 94 ++++++++++++++++++++++++++++--\n hw/intc/arm_gicv3_hvf_stub.c | 25 ++++++++\n hw/intc/meson.build | 1 +\n include/hw/intc/arm_gicv3_common.h | 3 +\n 5 files changed, 120 insertions(+), 4 deletions(-)\n create mode 100644 hw/intc/arm_gicv3_hvf_stub.c", "diff": "diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c\nindex 9200671c7a..9c3fb2f4bf 100644\n--- a/hw/intc/arm_gicv3_common.c\n+++ b/hw/intc/arm_gicv3_common.c\n@@ -305,6 +305,7 @@ static const VMStateDescription vmstate_gicv3 = {\n .subsections = (const VMStateDescription * const []) {\n &vmstate_gicv3_gicd_no_migration_shift_bug,\n &vmstate_gicv3_gicd_nmi,\n+ &vmstate_gicv3_hvf,\n NULL\n }\n };\ndiff --git a/hw/intc/arm_gicv3_hvf.c b/hw/intc/arm_gicv3_hvf.c\nindex 7935846bc7..a0f32acb82 100644\n--- a/hw/intc/arm_gicv3_hvf.c\n+++ b/hw/intc/arm_gicv3_hvf.c\n@@ -13,6 +13,7 @@\n #include \"qemu/error-report.h\"\n #include \"qemu/module.h\"\n #include \"system/runstate.h\"\n+#include \"migration/vmstate.h\"\n #include \"system/hvf.h\"\n #include \"system/hvf_int.h\"\n #include \"hvf_arm.h\"\n@@ -34,8 +35,13 @@ struct HVFARMGICv3Class {\n \n typedef struct HVFARMGICv3Class HVFARMGICv3Class;\n \n-/* This is reusing the GICv3State typedef from ARM_GICV3_ITS_COMMON */\n-DECLARE_OBJ_CHECKERS(GICv3State, HVFARMGICv3Class,\n+typedef struct HVFGICv3State {\n+ GICv3State parent_obj;\n+ uint32_t size;\n+ void *state;\n+} HVFGICv3State;\n+\n+DECLARE_OBJ_CHECKERS(HVFGICv3State, HVFARMGICv3Class,\n HVF_GICV3, TYPE_HVF_GICV3);\n \n /*\n@@ -659,7 +665,7 @@ static const ARMCPRegInfo gicv3_cpuif_reginfo[] = {\n static void hvf_gicv3_realize(DeviceState *dev, Error **errp)\n {\n ERRP_GUARD();\n- GICv3State *s = HVF_GICV3(dev);\n+ GICv3State *s = (GICv3State *)HVF_GICV3(dev);\n HVFARMGICv3Class *kgc = HVF_GICV3_GET_CLASS(s);\n int i;\n \n@@ -706,6 +712,86 @@ static void hvf_gicv3_realize(DeviceState *dev, Error **errp)\n }\n }\n \n+/*\n+ * HVF doesn't have a way to save the RDIST pending tables\n+ * to guest memory, only to an opaque data structure.\n+ */\n+static bool gicv3_is_hvf(void *opaque)\n+{\n+ return hvf_enabled() && hvf_irqchip_in_kernel();\n+}\n+\n+static int hvf_gic_opaque_state_save(void *opaque)\n+{\n+ HVFGICv3State *gic = opaque;\n+ hv_gic_state_t gic_state;\n+ hv_return_t err;\n+ size_t size;\n+\n+ gic_state = hv_gic_state_create();\n+ if (gic_state == NULL) {\n+ error_report(\"hvf: vgic: failed to create hv_gic_state_create.\");\n+ return 1;\n+ }\n+ err = hv_gic_state_get_size(gic_state, &size);\n+ gic->size = size;\n+ if (err != HV_SUCCESS) {\n+ error_report(\"hvf: vgic: failed to get GIC state size.\");\n+ os_release(gic_state);\n+ return 1;\n+ }\n+ gic->state = g_malloc0(gic->size);\n+ err = hv_gic_state_get_data(gic_state, gic->state);\n+ if (err != HV_SUCCESS) {\n+ error_report(\"hvf: vgic: failed to get GIC state.\");\n+ os_release(gic_state);\n+ return 1;\n+ }\n+\n+ os_release(gic_state);\n+ return 0;\n+}\n+\n+static void hvf_gic_opaque_state_free(void *opaque)\n+{\n+ HVFGICv3State *gic = opaque;\n+ free(gic->state);\n+}\n+\n+static int hvf_gic_opaque_state_restore(void *opaque, int version_id)\n+{\n+ HVFGICv3State *gic = opaque;\n+ hv_return_t err;\n+ if (!gic->size) {\n+ return 0;\n+ }\n+ err = hv_gic_set_state(gic->state, gic->size);\n+ if (err != HV_SUCCESS) {\n+ error_report(\"hvf: vgic: failed to restore GIC state.\");\n+ return 1;\n+ }\n+ return 0;\n+}\n+\n+const VMStateDescription vmstate_gicv3_hvf = {\n+ .name = \"arm_gicv3/hvf_gic_state\",\n+ .version_id = 1,\n+ .minimum_version_id = 1,\n+ .needed = gicv3_is_hvf,\n+ .pre_save = hvf_gic_opaque_state_save,\n+ .post_save = hvf_gic_opaque_state_free,\n+ .post_load = hvf_gic_opaque_state_restore,\n+ .version_id = 1,\n+ .minimum_version_id = 1,\n+ .fields = (const VMStateField[]) {\n+ VMSTATE_UINT32(size, HVFGICv3State),\n+ VMSTATE_VBUFFER_ALLOC_UINT32(state,\n+ HVFGICv3State, 0, 0,\n+ size),\n+ VMSTATE_END_OF_LIST()\n+ },\n+};\n+\n static void hvf_gicv3_class_init(ObjectClass *klass, const void *data)\n {\n DeviceClass *dc = DEVICE_CLASS(klass);\n@@ -725,7 +811,7 @@ static void hvf_gicv3_class_init(ObjectClass *klass, const void *data)\n static const TypeInfo hvf_arm_gicv3_info = {\n .name = TYPE_HVF_GICV3,\n .parent = TYPE_ARM_GICV3_COMMON,\n- .instance_size = sizeof(GICv3State),\n+ .instance_size = sizeof(HVFGICv3State),\n .class_init = hvf_gicv3_class_init,\n .class_size = sizeof(HVFARMGICv3Class),\n };\ndiff --git a/hw/intc/arm_gicv3_hvf_stub.c b/hw/intc/arm_gicv3_hvf_stub.c\nnew file mode 100644\nindex 0000000000..a587332c7c\n--- /dev/null\n+++ b/hw/intc/arm_gicv3_hvf_stub.c\n@@ -0,0 +1,25 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * ARM Generic Interrupt Controller using HVF platform support stub\n+ *\n+ * Copyright (c) 2026 Mohamed Mediouni\n+ *\n+ */\n+#include \"qemu/osdep.h\"\n+#include \"hw/intc/arm_gicv3_common.h\"\n+#include \"migration/vmstate.h\"\n+#include \"qemu/typedefs.h\"\n+\n+static bool needed_never(void *opaque)\n+{\n+ return false;\n+}\n+\n+const VMStateDescription vmstate_gicv3_hvf = {\n+ .name = \"arm_gicv3/hvf_gic_state\",\n+ .version_id = 1,\n+ .minimum_version_id = 1,\n+ .needed = needed_never,\n+ .version_id = 1,\n+ .minimum_version_id = 1,\n+};\ndiff --git a/hw/intc/meson.build b/hw/intc/meson.build\nindex b7baf8a0f6..c6de2d9d00 100644\n--- a/hw/intc/meson.build\n+++ b/hw/intc/meson.build\n@@ -43,6 +43,7 @@ arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.c'))\n specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c'))\n specific_ss.add(when: ['CONFIG_WHPX', 'TARGET_AARCH64'], if_true: files('arm_gicv3_whpx.c'))\n specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_true: files('arm_gicv3_hvf.c'))\n+specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_false: files('arm_gicv3_hvf_stub.c'))\n specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c'))\n arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c'))\n specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c'))\ndiff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3_common.h\nindex 9adcab0a0c..03ab3e8f2f 100644\n--- a/include/hw/intc/arm_gicv3_common.h\n+++ b/include/hw/intc/arm_gicv3_common.h\n@@ -339,4 +339,7 @@ void gicv3_init_irqs_and_mmio(GICv3State *s, qemu_irq_handler handler,\n */\n const char *gicv3_class_name(void);\n \n+/* HVF vGIC-specific state: stubbed out on a build with HVF disabled */\n+extern const VMStateDescription vmstate_gicv3_hvf;\n+\n #endif\n", "prefixes": [ "v21", "02/15" ] }