Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2231725/?format=api
{ "id": 2231725, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2231725/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260501101505.3485916-19-peter.maydell@linaro.org/", "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": "<20260501101505.3485916-19-peter.maydell@linaro.org>", "date": "2026-05-01T10:14:55", "name": "[PULL,18/28] hw/arm, target/arm: nested virtualisation on HVF", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "6251d2995f2c6b4ce273abb436bd6947ab98391e", "submitter": { "id": 5111, "url": "http://patchwork.ozlabs.org/api/1.1/people/5111/?format=api", "name": "Peter Maydell", "email": "peter.maydell@linaro.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260501101505.3485916-19-peter.maydell@linaro.org/mbox/", "series": [ { "id": 502437, "url": "http://patchwork.ozlabs.org/api/1.1/series/502437/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502437", "date": "2026-05-01T10:14:41", "name": "[PULL,01/28] hw/arm/fsl-imx8mp: Do not create redundant unimplemented devices", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/502437/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2231725/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2231725/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=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=EHPjQVOX;\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 4g6Rn30CfTz1xqf\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 01 May 2026 20:17:43 +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 1wIkuO-000468-Ps; Fri, 01 May 2026 06:15:44 -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 <peter.maydell@linaro.org>)\n id 1wIkuF-000417-Cj\n for qemu-devel@nongnu.org; Fri, 01 May 2026 06:15:36 -0400", "from mail-wm1-x335.google.com ([2a00:1450:4864:20::335])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)\n id 1wIkuC-0000CM-C0\n for qemu-devel@nongnu.org; Fri, 01 May 2026 06:15:34 -0400", "by mail-wm1-x335.google.com with SMTP id\n 5b1f17b1804b1-48984d29fe3so26212475e9.0\n for <qemu-devel@nongnu.org>; Fri, 01 May 2026 03:15:31 -0700 (PDT)", "from lanath.. (wildly.archaic.org.uk. [81.2.115.145])\n by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-48a8fede418sm12863335e9.6.2026.05.01.03.15.30\n for <qemu-devel@nongnu.org>\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 01 May 2026 03:15:30 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1777630531; x=1778235331; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:from:to:cc:subject:date:message-id\n :reply-to; bh=Lb+Hv2gpBFCMBdugccmdMigUPrnD4ShbuSoaq16Of18=;\n b=EHPjQVOXc0lhVi//RRcY6I0UNkISzQxGzSAqhe55eeYiP5cwyv3PfgKj7IhMevkalG\n YT90vqAcHYq+OSc4j27+O+xe7v+IbICGHb1ZyeLE02QcKRCpqAoeTR/bAmh8kd7Dbans\n JYglRBJB+XeuJJOmCcowfUpEFnaKThiWj9EooEALvX8ozNKPWNB4cipBJvZzoKRGrL0u\n wvVABi9YnKx9Dnd2/wefHHYylTgxSm21L2tnaH+NES9R/3mz5ldbvsPWHbjhYHw6B1yV\n xvV+V6qX+94P9mrO1l7SJMwJwuzN/nA60UYr5E7XWWuPFgO7cDEwb2FPK5GkWhmTEg+O\n N9JQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777630531; x=1778235331;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=Lb+Hv2gpBFCMBdugccmdMigUPrnD4ShbuSoaq16Of18=;\n b=Nvftv1WGCbK3Y9OxxqWAo3OLK9whRvT3FqE8QA9bkUqJoTQjjvcjk4nvejrh+eTViE\n fcvjLdX4G4QVvLGoMlOjDkVxh2myJ4M6NAWkO/D1uU2C2nu7tutRarJJvOpw4bgaaJKS\n aGpKCpanUh2WXIpeEvcdWkRb4YsYjV89cxZx4Srmabs+2ROg6wElWDsIxb6L+tV7cFiX\n mqEKK7XBuvIf7yqX+bbVywFs176S5kfQLXhwIwqx8ctGQ2i4AW6XyEw6neVlgU344t3T\n P67KeqGad0Ke5EIOyytxkEbuDHirlUkoDeRG8hRmXmILJ+4HyPA0cy8ItHwvQHT69jDg\n 6TFg==", "X-Gm-Message-State": "AOJu0YxH7SAgUnkOPflqLT685jiCzQi0T+GxAag/HF41rmv59gh8Hv4I\n HrFECTZOIjmDQ8c56kFNDKXPn+vpPOvG+jTYcGDkgeRV+RwqAftKuM2BnEbsKMr/syfGU+9fDhP\n OPasU", "X-Gm-Gg": "AeBDietSLYH/HONXSf0tarajmYco1O7zik3bjDzEN/06juhmFuOahGbPdT/WjEf8ZSy\n ggxLHe3Xt2PzUhl6bWqy5UtZ0tkROPUv7U9O2vDwPJ+UvuNQy6H3QD0l8WacPJkUcuzNupddzBq\n MqctBUmvv+OTRUrf2BZ4akkSYL+ClK65Q+k22qDkrCCNvKGucfdoake1MduQmbZ+7d/mgW4k/x6\n x7EyWFhmLGi+9851YRb9jYRHaa2BG260NHUoj6yESdxRBz6WRD5xFyJd+uXgm6OyuoRPR/OmN7T\n Lz1PpBMprY6qCxyz8lRgziZYANvNjWcASkprCTpN+stk0Pr1Yv0YvcOjRfLdxvTFLSKP1rNczA0\n QrquEjTlVju1/FTtn5sfuqeydVZaTmu/Y5tw4Lq0BCdfju5LwTCJ/FwU19epcUoffOZmpX4ixJJ\n Fg41Hit1effc4vzlBqh7VS8JcYMoogUoa8lW6gQHSym0sstG4s/vPqMfZ3VDqOXjVRAXJchk1d+\n RRsC9HrhfPMWz88n7SStaTRSACOMiXiT/ZeRSTRyQ==", "X-Received": "by 2002:a05:600c:1907:b0:488:c683:be89 with SMTP id\n 5b1f17b1804b1-48a83d6ee9dmr110383975e9.9.1777630530969;\n Fri, 01 May 2026 03:15:30 -0700 (PDT)", "From": "Peter Maydell <peter.maydell@linaro.org>", "To": "qemu-devel@nongnu.org", "Subject": "[PULL 18/28] hw/arm, target/arm: nested virtualisation on HVF", "Date": "Fri, 1 May 2026 11:14:55 +0100", "Message-ID": "<20260501101505.3485916-19-peter.maydell@linaro.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20260501101505.3485916-1-peter.maydell@linaro.org>", "References": "<20260501101505.3485916-1-peter.maydell@linaro.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Received-SPF": "pass client-ip=2a00:1450:4864:20::335;\n envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.google.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, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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": "From: Mohamed Mediouni <mohamed@unpredictable.fr>\n\nAdd hvf_arm_el2_supported for querying EL2 availability.\nAn hvf_nested_virt_enable workaround is added as nested virt has\nto be enabled early on HVF.\n\nAnd adds hvf_nested_virt_enabled.\n\nSigned-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>\nReviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>\nMessage-id: 20260429190532.26538-6-mohamed@unpredictable.fr\nSigned-off-by: Peter Maydell <peter.maydell@linaro.org>\n---\n accel/hvf/hvf-all.c | 6 ++++++\n accel/stubs/hvf-stub.c | 11 +++++++++++\n hw/arm/virt.c | 5 +++++\n include/system/hvf.h | 5 +++++\n target/arm/hvf/hvf.c | 42 ++++++++++++++++++++++++++++++++++++++++--\n 5 files changed, 67 insertions(+), 2 deletions(-)", "diff": "diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c\nindex add265e0c8..da29aa3aa3 100644\n--- a/accel/hvf/hvf-all.c\n+++ b/accel/hvf/hvf-all.c\n@@ -24,6 +24,12 @@\n \n bool hvf_allowed;\n bool hvf_kernel_irqchip;\n+bool hvf_nested_virt;\n+\n+void hvf_nested_virt_enable(bool nested_virt)\n+{\n+ hvf_nested_virt = nested_virt;\n+}\n \n const char *hvf_return_string(hv_return_t ret)\n {\ndiff --git a/accel/stubs/hvf-stub.c b/accel/stubs/hvf-stub.c\nindex 6bd08759ba..7643e8c5f5 100644\n--- a/accel/stubs/hvf-stub.c\n+++ b/accel/stubs/hvf-stub.c\n@@ -11,3 +11,14 @@\n \n bool hvf_allowed;\n bool hvf_kernel_irqchip;\n+bool hvf_nested_virt;\n+\n+void hvf_nested_virt_enable(bool nested_virt)\n+{\n+ /*\n+ * This is called unconditionally from hw/arm/virt.c\n+ * because we don't know if HVF is going to be used\n+ * as that step of initialisation happens later.\n+ * As such, do nothing here instead of marking as unreachable.\n+ */\n+}\ndiff --git a/hw/arm/virt.c b/hw/arm/virt.c\nindex 47400214a2..ca50411020 100644\n--- a/hw/arm/virt.c\n+++ b/hw/arm/virt.c\n@@ -2987,6 +2987,11 @@ static void virt_set_virt(Object *obj, bool value, Error **errp)\n VirtMachineState *vms = VIRT_MACHINE(obj);\n \n vms->virt = value;\n+ /*\n+ * At this point, HVF is not initialised yet.\n+ * However, it needs to know if nested virt is enabled at init time.\n+ */\n+ hvf_nested_virt_enable(value);\n }\n \n static bool virt_get_highmem(Object *obj, Error **errp)\ndiff --git a/include/system/hvf.h b/include/system/hvf.h\nindex dc8da85979..a961df8b95 100644\n--- a/include/system/hvf.h\n+++ b/include/system/hvf.h\n@@ -28,11 +28,16 @@ extern bool hvf_allowed;\n #define hvf_enabled() (hvf_allowed)\n extern bool hvf_kernel_irqchip;\n #define hvf_irqchip_in_kernel() (hvf_kernel_irqchip)\n+extern bool hvf_nested_virt;\n+#define hvf_nested_virt_enabled() (hvf_nested_virt)\n #else /* !CONFIG_HVF_IS_POSSIBLE */\n #define hvf_enabled() 0\n #define hvf_irqchip_in_kernel() 0\n+#define hvf_nested_virt_enabled() 0\n #endif /* !CONFIG_HVF_IS_POSSIBLE */\n \n+void hvf_nested_virt_enable(bool nested_virt);\n+\n #define TYPE_HVF_ACCEL ACCEL_CLASS_NAME(\"hvf\")\n \n typedef struct HVFState HVFState;\ndiff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c\nindex a028c99e24..09f41094e5 100644\n--- a/target/arm/hvf/hvf.c\n+++ b/target/arm/hvf/hvf.c\n@@ -27,6 +27,7 @@\n #include \"system/memory.h\"\n #include \"hw/core/boards.h\"\n #include \"hw/core/irq.h\"\n+#include \"hw/arm/virt.h\"\n #include \"qemu/main-loop.h\"\n #include \"system/cpus.h\"\n #include \"arm-powerctl.h\"\n@@ -1103,6 +1104,10 @@ static bool hvf_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)\n (1ULL << ARM_FEATURE_PMU) |\n (1ULL << ARM_FEATURE_GENERIC_TIMER);\n \n+ if (hvf_nested_virt_enabled()) {\n+ ahcf->features |= 1ULL << ARM_FEATURE_EL2;\n+ }\n+\n for (i = 0; i < ARRAY_SIZE(regs); i++) {\n r |= hv_vcpu_config_get_feature_reg(config, regs[i].reg,\n &host_isar.idregs[regs[i].index]);\n@@ -1218,6 +1223,19 @@ void hvf_arch_vcpu_destroy(CPUState *cpu)\n assert_hvf_ok(ret);\n }\n \n+static bool hvf_arm_el2_supported(void)\n+{\n+ bool is_nested_virt_supported;\n+ if (__builtin_available(macOS 15.0, *)) {\n+ hv_return_t ret = hv_vm_config_get_el2_supported(&is_nested_virt_supported);\n+ assert_hvf_ok(ret);\n+ } else {\n+ return false;\n+ }\n+ return is_nested_virt_supported;\n+}\n+\n+\n hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range)\n {\n hv_return_t ret;\n@@ -1229,6 +1247,20 @@ hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range)\n }\n chosen_ipa_bit_size = pa_range;\n \n+ if (__builtin_available(macOS 15.0, *)) {\n+ if (hvf_nested_virt_enabled()) {\n+ if (!hvf_arm_el2_supported()) {\n+ error_report(\"Nested virtualization not supported on this system.\");\n+ goto cleanup;\n+ }\n+ ret = hv_vm_config_set_el2_enabled(config, true);\n+ if (ret != HV_SUCCESS) {\n+ error_report(\"Failed to enable nested virtualization.\");\n+ goto cleanup;\n+ }\n+ }\n+ }\n+\n ret = hv_vm_create(config);\n if (hvf_irqchip_in_kernel()) {\n if (__builtin_available(macOS 15.0, *)) {\n@@ -1420,6 +1452,13 @@ static void hvf_psci_cpu_off(ARMCPU *arm_cpu)\n assert(ret == QEMU_ARM_POWERCTL_RET_SUCCESS);\n }\n \n+static int hvf_psci_get_target_el(void)\n+{\n+ if (hvf_nested_virt_enabled()) {\n+ return 2;\n+ }\n+ return 1;\n+}\n /*\n * Handle a PSCI call.\n *\n@@ -1441,7 +1480,6 @@ static bool hvf_handle_psci_call(CPUState *cpu, int *excp_ret)\n CPUState *target_cpu_state;\n ARMCPU *target_cpu;\n uint64_t entry;\n- int target_el = 1;\n int32_t ret = 0;\n \n trace_arm_psci_call(param[0], param[1], param[2], param[3],\n@@ -1495,7 +1533,7 @@ static bool hvf_handle_psci_call(CPUState *cpu, int *excp_ret)\n entry = param[2];\n context_id = param[3];\n ret = arm_set_cpu_on(mpidr, entry, context_id,\n- target_el, target_aarch64);\n+ hvf_psci_get_target_el(), target_aarch64);\n break;\n case QEMU_PSCI_0_1_FN_CPU_OFF:\n case QEMU_PSCI_0_2_FN_CPU_OFF:\n", "prefixes": [ "PULL", "18/28" ] }