{"id":2226937,"url":"http://patchwork.ozlabs.org/api/patches/2226937/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260422214225.2242-36-mohamed@unpredictable.fr/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260422214225.2242-36-mohamed@unpredictable.fr>","list_archive_url":null,"date":"2026-04-22T21:42:23","name":"[v3,35/37] whpx: i386: nested virt settings","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5cae6c848afa7c7731ab676592d754d3bb8fe3fa","submitter":{"id":91318,"url":"http://patchwork.ozlabs.org/api/people/91318/?format=json","name":"Mohamed Mediouni","email":"mohamed@unpredictable.fr"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260422214225.2242-36-mohamed@unpredictable.fr/mbox/","series":[{"id":501116,"url":"http://patchwork.ozlabs.org/api/series/501116/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501116","date":"2026-04-22T21:41:48","name":"[v3,01/37] target/i386: emulate: include name of unhandled instruction","version":3,"mbox":"http://patchwork.ozlabs.org/series/501116/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2226937/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2226937/checks/","tags":{},"related":[],"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=YunTlq9U;\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 4g1CVJ49JFz1yHy\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 23 Apr 2026 07:46:48 +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 1wFfML-0000Ik-2l; Wed, 22 Apr 2026 17:43:49 -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 1wFfMG-0000BY-Ee\n for qemu-devel@nongnu.org; Wed, 22 Apr 2026 17:43:45 -0400","from p-east2-cluster5-host5-snip4-1.eps.apple.com ([57.103.79.84]\n helo=outbound.st.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 1wFfMD-0007mr-Mq\n for qemu-devel@nongnu.org; Wed, 22 Apr 2026 17:43:44 -0400","from outbound.st.icloud.com (unknown [127.0.0.2])\n by p00-icloudmta-asmtp-us-east-1a-100-percent-1 (Postfix) with ESMTPS id\n EC9AC1800219; Wed, 22 Apr 2026 21:43:35 +0000 (UTC)","from localhost.localdomain (unknown [17.42.251.67])\n by p00-icloudmta-asmtp-us-east-1a-100-percent-1 (Postfix) with ESMTPSA id\n 3EC57180020A; Wed, 22 Apr 2026 21:43:33 +0000 (UTC)"],"X-ICL-Out-Info":"\n HUtFAUMHWwJACUgBTUQeDx5WFlZNRAJCTQFIHV8DWRxBAUkdXw9LVxQEFVwFVgZXFHkNXR1FDlYZWgxSD1sOHBZLWFUJCgZdGFgVVgl3HlwASx1XBFQfUxJVHR0LRUtAEwRJAU1fDl4fBBdGGVUERx5dVkAZGQJRHFYNV0NUBF9QSQxBUGxaAEcXSB1dGVlvUF0cDhhZG0AVXRFQGVYJXhUXHkFNWgJWTQVKA18BWwZCC0oCWQVZB14LSgdfGlgEXVQXWwxaDlYwTBZDH1IPWxNNGVEBUkVUAgdYRxRHDg8TTAtHAlo0Vh9UGVoD","Dkim-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1776894220; x=1779486220;\n bh=fW1u47ze30rJgld8zY70vRzg5SwPNuoMbTd0WP/7YIY=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=YunTlq9UNMraO+3ivVWkrPMsgaQZEwdRkNREaLdyOxO4TleB45gNTxfLdgmftlzuq8Y17YZA/PWQw2OngXqFn9+A3UAVcA85hZrFoaXCSsaTfavMxIqxTWQOeK1yRWBQMBoBV2MEjQmlZmSAuxTGCJMMwBlM+Pyxkv+JhQHlmWdT1vHTSmO/W1X12N294Xnzs0Z8ADEA94GzOhr3pfYTZdt4gd98niNi84ha3iHO/OhYnGO/nwXfSqf8m/1lW2vF7ALYnOlkI2DDdOe8CTauN3Lkjj3xpJ0gdVnHLGLNeXIRKvZg3WT7ycrXvK6MBXk0PcKpJtcn7Sl1du0If+UFaA==","mail-alias-created-date":"1752046281608","From":"Mohamed Mediouni <mohamed@unpredictable.fr>","To":"qemu-devel@nongnu.org","Cc":"Pedro Barbuda <pbarbuda@microsoft.com>, qemu-arm@nongnu.org,\n Pierrick Bouvier <pierrick.bouvier@linaro.org>,\n Mohamed Mediouni <mohamed@unpredictable.fr>,\n Roman Bolshakov <rbolshakov@ddn.com>,\n \"Michael S. Tsirkin\" <mst@redhat.com>, Wei Liu <wei.liu@kernel.org>,\n Phil Dennis-Jordan <phil@philjordan.eu>,\n Peter Maydell <peter.maydell@linaro.org>, Zhao Liu <zhao1.liu@intel.com>,\n Paolo Bonzini <pbonzini@redhat.com>","Subject":"[PATCH v3 35/37] whpx: i386: nested virt settings","Date":"Wed, 22 Apr 2026 23:42:23 +0200","Message-ID":"<20260422214225.2242-36-mohamed@unpredictable.fr>","X-Mailer":"git-send-email 2.50.1","In-Reply-To":"<20260422214225.2242-1-mohamed@unpredictable.fr>","References":"<20260422214225.2242-1-mohamed@unpredictable.fr>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Authority-Info-Out":"v=2.4 cv=a4U9NESF c=1 sm=1 tr=0 ts=69e9410a\n cx=c_apl:c_pps:t_out a=YrL12D//S6tul8v/L+6tKg==:117\n a=YrL12D//S6tul8v/L+6tKg==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22\n a=20kCj1oTBhCq6H0YB64A:9","X-Proofpoint-ORIG-GUID":"RGN4i7LvkEGStE27k1_LBWOjRKbi_5r_","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDIyMDIxMiBTYWx0ZWRfXznMUZpcdKttZ\n vizU05v6cQ0mxtZXjSxqOTrD6xCX/gngajIsw5+a3HoFtgdUQ4SVsaT5Ft31a+DBlF6XTdQFemc\n y8NjpZ0YIQbHKZgpB+IuUU8mdprcMK9CCQ/0CxqFVc+bod0kkQlMD572MnWZ6U7pGU9KQcXl7p7\n wCowXB8nZcAxJiTnOhOpoiKx52zQSsb1wNoDk3n8C3F45/GD01howYrmpePX1W5j0HA7ovTjiFn\n R2pO66pvE0llJSahP7WbV871Qs12c3/6bymhldsDf6LL++bj3ZbeGKazfsxZ+SvuRNt1PT0kARy\n xSsDm8hWY3015WPUOzVKpzJKxC3Q/uz6cSg/QZNKpZW89SVBEXlZ2DtySBMkhg=","X-Proofpoint-GUID":"RGN4i7LvkEGStE27k1_LBWOjRKbi_5r_","Received-SPF":"pass client-ip=57.103.79.84;\n envelope-from=mohamed@unpredictable.fr; helo=outbound.st.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":"Signed-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>\n---\n accel/whpx/whpx-common.c       |  1 +\n include/system/whpx-internal.h |  2 +\n target/i386/whpx/whpx-all.c    | 68 +++++++++++++++++++++++++++++++---\n 3 files changed, 66 insertions(+), 5 deletions(-)","diff":"diff --git a/accel/whpx/whpx-common.c b/accel/whpx/whpx-common.c\nindex d846e08714..305b2ae1d0 100644\n--- a/accel/whpx/whpx-common.c\n+++ b/accel/whpx/whpx-common.c\n@@ -556,6 +556,7 @@ static void whpx_accel_instance_init(Object *obj)\n     whpx->hyperv_enlightenments_enabled = false;\n     whpx->ignore_unknown_msr = true;\n     whpx->intercept_msr_gp = false;\n+    whpx->nested_virt_enabled = true;\n }\n \n static const TypeInfo whpx_accel_type = {\ndiff --git a/include/system/whpx-internal.h b/include/system/whpx-internal.h\nindex 15027a7d52..4436cfe6ba 100644\n--- a/include/system/whpx-internal.h\n+++ b/include/system/whpx-internal.h\n@@ -47,6 +47,8 @@ struct whpx_state {\n     bool hyperv_enlightenments_required;\n     bool hyperv_enlightenments_enabled;\n \n+    bool nested_virt_enabled;\n+\n     bool ignore_unknown_msr;\n     bool intercept_msr_gp;\n };\ndiff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c\nindex ea5d1e535c..d17db73cff 100644\n--- a/target/i386/whpx/whpx-all.c\n+++ b/target/i386/whpx/whpx-all.c\n@@ -2974,6 +2974,39 @@ static void whpx_set_intercept_msr_gp(Object *obj, Visitor *v,\n     }\n }\n \n+static void whpx_set_nested_virt(Object *obj, Visitor *v,\n+                                   const char *name, void *opaque,\n+                                   Error **errp)\n+{\n+    struct whpx_state *whpx = &whpx_global;\n+    OnOffAuto mode;\n+\n+    if (!visit_type_OnOffAuto(v, name, &mode, errp)) {\n+        return;\n+    }\n+\n+    switch (mode) {\n+    case ON_OFF_AUTO_ON:\n+        whpx->nested_virt_enabled = true;\n+        break;\n+\n+    case ON_OFF_AUTO_OFF:\n+        whpx->nested_virt_enabled = false;\n+        break;\n+\n+    case ON_OFF_AUTO_AUTO:\n+        whpx->nested_virt_enabled = true;\n+        break;\n+    default:\n+        /*\n+         * The value was checked in visit_type_OnOffAuto() above. If\n+         * we get here, then something is wrong in QEMU.\n+         */\n+        abort();\n+    }\n+}\n+\n+\n void whpx_arch_accel_class_init(ObjectClass *oc)\n {\n     object_class_property_add(oc, \"ignore-unknown-msr\", \"OnOffAuto\",\n@@ -2986,6 +3019,11 @@ void whpx_arch_accel_class_init(ObjectClass *oc)\n         NULL, NULL);\n     object_class_property_set_description(oc, \"intercept-msr-gp\",\n         \"Intercept #GP to log erroring MSR accesses.\");\n+    object_class_property_add(oc, \"nested\", \"OnOffAuto\",\n+        NULL, whpx_set_nested_virt,\n+        NULL, NULL);\n+    object_class_property_set_description(oc, \"intercept-msr-gp\",\n+        \"Toggle nested virtualization off/on.\");\n }\n \n int whpx_accel_init(AccelState *as, MachineState *ms)\n@@ -3166,7 +3204,8 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n     whpx_rdtsc_cap = processor_features.Bank0.RdtscpSupport;\n     whpx_invpcid_cap = processor_features.Bank0.InvpcidSupport;\n \n-    if (whpx_irqchip_in_kernel() && processor_features.Bank1.NestedVirtSupport) {\n+    if (whpx_irqchip_in_kernel() && whpx->nested_virt_enabled\n+        && processor_features.Bank1.NestedVirtSupport) {\n         memset(&prop, 0, sizeof(WHV_PARTITION_PROPERTY));\n         prop.NestedVirtualization = 1;\n         hr = whp_dispatch.WHvSetPartitionProperty(\n@@ -3174,11 +3213,14 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n             WHvPartitionPropertyCodeNestedVirtualization,\n             &prop,\n             sizeof(WHV_PARTITION_PROPERTY));\n-            if (FAILED(hr)) {\n-                error_report(\"WHPX: Failed to enable nested virtualization, hr=%08lx\", hr);\n-                ret = -EINVAL;\n-                goto error;\n+        if (FAILED(hr)) {\n+            error_report(\"WHPX: Failed to enable nested virtualization, hr=%08lx\", hr);\n+            ret = -EINVAL;\n+            goto error;\n         }\n+    } else if (whpx->nested_virt_enabled) {\n+        whpx->nested_virt_enabled = 0;\n+        info_report(\"WHPX: nested virtualisation not available\");\n     }\n \n     hr = whp_dispatch.WHvSetPartitionProperty(\n@@ -3222,6 +3264,22 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n         synthetic_features.Bank0.EnableExtendedGvaRangesForFlushVirtualAddressList = 1;\n     }\n \n+    if (whpx->nested_virt_enabled) {\n+        /* enlightened VMCS is an Intel-specific enlightenment. */\n+        hr = whp_dispatch.WHvGetCapability(\n+            WHvCapabilityCodeProcessorVendor, &whpx_cap,\n+            sizeof(whpx_cap), &whpx_cap_size);\n+        if (FAILED(hr)) {\n+            error_report(\"WHPX: Failed to query processor vendor, hr=%08lx\", hr);\n+            ret = -ENOSPC;\n+            goto error;\n+        }\n+        if (whpx_cap.ProcessorVendor == WHvProcessorVendorIntel) {\n+            synthetic_features.Bank0.EnlightenedVmcs = 1;\n+            synthetic_features.Bank0.NestedDebugCtl = 1;\n+        }\n+    }\n+\n     if (is_modern_os && whpx->hyperv_enlightenments_allowed) {\n         whpx->hyperv_enlightenments_enabled = true;\n         hr = whp_dispatch.WHvSetPartitionProperty(\n","prefixes":["v3","35/37"]}