From nobody Thu Jan 8 13:17:09 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1767053570; cv=none; d=zohomail.com; s=zohoarc; b=agQ/x3dwiZjrhL5ka2BjB6KORwWuudhUY7+D74CO7vBVPwnu9ZGU+PLINHhhnymz0eq5PiKtClXFMmWYeRFg5xfVHBkWNMj3I+SFPV4s9B1ceI4gIsPxU4EFh4WnJTBETpXXSOYzpWe3+EX9c//YemQwnT4sKztnpOLxniVObPc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767053570; 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=ikn0HzDDxg3hSGfBkyUa/ql2C2gbLWDqs4VNlGZIV7w=; b=lWSGRJDufpBhH2d5btdOu1UdzRguKKvCf1VusCO2vCNyw/YuwFR5idKDdjkwEgVz1C1nbJlIhpuL11ZlxqquAPNZc6uqxfk4xxYOmudG7uxY0kki67gPTWQbc9qu+XpRn0bqYZZ48d3D+AsgU1uNqt/n+rPjN66SFbz9eJfwWNQ= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767053570047794.8957758766486; Mon, 29 Dec 2025 16:12:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vaNLf-0005GA-NN; Mon, 29 Dec 2025 19:12:28 -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 1vaNFr-0007rP-2N for qemu-devel@nongnu.org; Mon, 29 Dec 2025 19:06:30 -0500 Received: from p-east2-cluster1-host9-snip4-10.eps.apple.com ([57.103.76.113] helo=outbound.st.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vaNFo-00046Q-PB for qemu-devel@nongnu.org; Mon, 29 Dec 2025 19:06:26 -0500 Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-60-percent-9 (Postfix) with ESMTPS id 1CFD718010C9; Tue, 30 Dec 2025 00:06:18 +0000 (UTC) Received: from localhost.localdomain (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-60-percent-9 (Postfix) with ESMTPSA id BECEE1800479; Tue, 30 Dec 2025 00:06:13 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=ikn0HzDDxg3hSGfBkyUa/ql2C2gbLWDqs4VNlGZIV7w=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=g+9XCp/U55N+eWCp+HNwSET7HOO74/r+cqf9a6GUSZaIrHmYf4HYHGEUGOv6Ny2dCuCzSBOgCOrJgS0ktM6HPucaDC9+r+NyA810luDBZldtvDqyhqsRKXYAqC0zXjQviuCIQd5jjAnyJL0vhoIBUtEbqvzqk6wTz+np+uMR3FJXC6f5lFjEM7eXThS6kz4NiAIdhuxszEsOIl9s4Z6jiENNtiaebUZ/9AGN6N+KXdqJ1h9pHzH+C2dmBVpRAYOwTVoNzqi/OhjTvKaZi/UiDJjM1VwENa2eElg62ie8xp4YUWzqYYu13nM64qCEAuu8JvgnVZzhqGZiL2eJSfW/Jg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: mohamed@unpredictable.fr, qemu-devel@nongnu.org Cc: Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Michael S. Tsirkin" , Akihiko Odaki , Eduardo Habkost , Mads Ynddal , Roman Bolshakov , Peter Xu , Shannon Zhao , Pedro Barbuda , Peter Maydell , Cameron Esfahani , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Igor Mammedov , Zhao Liu , Phil Dennis-Jordan , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ani Sinha , Paolo Bonzini , Alexander Graf , Marcel Apfelbaum , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Pierrick Bouvier Subject: [PATCH v13 25/28] whpx: apic: use non-deprecated APIs to control interrupt controller state Date: Tue, 30 Dec 2025 01:03:57 +0100 Message-ID: <20251230000401.72124-26-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251230000401.72124-1-mohamed@unpredictable.fr> References: <20251230000401.72124-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: vmpQQAt2xnlk7uMwHFjNfF6-GSBNQiIM X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjI5MDIyMiBTYWx0ZWRfX7ITmP0IOYR3t RLB332kjU6IVeHbZT/OEcoVN4I8wxXwLEH+mMxjG00ogKx57huTAWixIDPkpS+jrGdjGk1rChJ6 Qku7N48CosZ05i5wjJndORGYIkH3XQbP5lVyb0n5cw/girFxNRlZ5uzoa4Hsm4LDUuubqnjtOmn SRgJfK+4aWDXk/LlTmmi7o8vvtwjcAck5e1pDPTj/+Qk5Rkayg703N1gAP80EfjR0jDPlGyPstJ Ccyjm3lMWQYsUoLOeBOWOPgjI67enGoq28Wi78/SCm/yZSrGt1MRzSFYe00xf9a/EUTbtNY9Xpc S/BjzzRmshPQZ71UGBL X-Authority-Info: v=2.4 cv=EJ0LElZC c=1 sm=1 tr=0 ts=6953177b cx=c_apl:c_pps a=YrL12D//S6tul8v/L+6tKg==:117 a=YrL12D//S6tul8v/L+6tKg==:17 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=Zj7cAsCNdc2pAJP8fGYA:9 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: vmpQQAt2xnlk7uMwHFjNfF6-GSBNQiIM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-29_07,2025-12-29_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=873 mlxscore=0 suspectscore=0 adultscore=0 spamscore=0 malwarescore=0 phishscore=0 clxscore=1030 bulkscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512290222 X-JNJ: AAAAAAABR1RI/lv0++ynqMnDJEKbJWNKA9hGNl/lQrnPymcjstDxZnzPyULmLVVBfFO0Q69qiiCPhYo6S2PD/ocVqnfigzPM/gNHTt5WEZvw14S3d+jjCZAw96afZM3Y97ojU+qla8relHA1m6gJ5mHbyGT8eAV9HHVltGBO89mIwkUSIzjO5Hbs8v5nBXxXpHbQG2kESsCxWVY+mUIVU8Hb1OU28SUYtPwzcZiY8re1jHecSL6A9+IGQBzKSXmI0WYjRQYz14Du8bJUxUlW+7gCITagyRz1yKz2kf/E1dW32mHLLfYQqOypZKQXcqTr41dap4EZYvqb0JoRrkh/ptTl0q2hQeDnuKfFCvI5A5D10wXaivefBAKnFaBWDUouMDB1vdDIZSqqcbRFHtocwWhUZg4IuUi/eHcBVgZ5lFFEwfIlhFLUDa0TMLUk1qpFbYiZS6kQOjlgOPEeIrWRKVEwYFOmxqvTQxXXdCrYHvs/suUS4LLl9VRDymqvyPjG/pN+3CIJk0lVytq0uR47VmHg6Ax9+DilIduVG5jNB6Hc4jGWvoVKqULB0xiKAHNgRbTrsxlSoMUv7XoJMCiVHDe3UBCFuCwWuYY9VJ9wKe8Uwn5tzgavlU+kPpHDZTUl6KfnQ3cIXzUQrgxME/XSC6/yB+VPR6EfxsC6Y6qvu1oYyklkrqxyR0eD6pEYrJKx3TTJdH3EU56OQpvYGud+jZhbwxbbwkx1XO3/aDghwNvKyqyr7vpfiz2F7hH7lXrmO8NgXAo1vZesTP2qE+b5mShzsUALg6qhbDn8P0YbVk3lG9IVpZxlCWAszSV+f93xta0tM4R62jCm0UUSakwwMIuxMRXKgYD/WUan3t0hu4w3XkpChQqtiOLtwoSxEO7vBDADFJEwl5LRZfoUxGOI8itJcOaEJLt2n4YiELxjU2p2uYxYRF/Jm/qjU4SOhuj2OqXFPW3hH1O2pg== 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=57.103.76.113; 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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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=unavailable 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 @unpredictable.fr) X-ZM-MESSAGEID: 1767053570399158500 Content-Type: text/plain; charset="utf-8" WHvGetVirtualProcessorInterruptControllerState2 and WHvSetVirtualProcessorInterruptControllerState2 are deprecated since Windows 10 version 2004. Use the non-deprecated WHvGetVirtualProcessorState and WHvSetVirtualProcessorState when available. Signed-off-by: Mohamed Mediouni Reviewed-by: Pierrick Bouvier --- include/system/whpx-internal.h | 9 +++++++ target/i386/whpx/whpx-apic.c | 46 +++++++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/include/system/whpx-internal.h b/include/system/whpx-internal.h index 8ded54a39b..9e872e5f56 100644 --- a/include/system/whpx-internal.h +++ b/include/system/whpx-internal.h @@ -86,6 +86,15 @@ void whpx_apic_get(APICCommonState *s); X(HRESULT, WHvSetVirtualProcessorInterruptControllerState2, \ (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, PVOID State, \ UINT32 StateSize)) \ + X(HRESULT, WHvGetVirtualProcessorState, \ + (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, \ + WHV_VIRTUAL_PROCESSOR_STATE_TYPE StateType, PVOID Buffer, \ + UINT32 BufferSizeInBytes, UINT32 *BytesWritten)) \ + X(HRESULT, WHvSetVirtualProcessorState, \ + (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, \ + WHV_VIRTUAL_PROCESSOR_STATE_TYPE StateType, PVOID Buffer, \ + UINT32 BufferSizeInBytes)) \ + =20 #define LIST_WINHVEMULATION_FUNCTIONS(X) \ X(HRESULT, WHvEmulatorCreateEmulator, (const WHV_EMULATOR_CALLBACKS* Cal= lbacks, WHV_EMULATOR_HANDLE* Emulator)) \ diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c index b934fdcbe1..fa45a64b21 100644 --- a/target/i386/whpx/whpx-apic.c +++ b/target/i386/whpx/whpx-apic.c @@ -137,11 +137,21 @@ static void whpx_apic_put(CPUState *cs, run_on_cpu_da= ta data) whpx_put_apic_base(CPU(s->cpu), s->apicbase); whpx_put_apic_state(s, &kapic); =20 - hr =3D whp_dispatch.WHvSetVirtualProcessorInterruptControllerState2( - whpx_global.partition, - cs->cpu_index, - &kapic, - sizeof(kapic)); + if (whp_dispatch.WHvSetVirtualProcessorState) { + hr =3D whp_dispatch.WHvSetVirtualProcessorState( + whpx_global.partition, + cs->cpu_index, + WHvVirtualProcessorStateTypeInterruptControllerState2, + &kapic, + sizeof(kapic)); + } else { + hr =3D whp_dispatch.WHvSetVirtualProcessorInterruptControllerState= 2( + whpx_global.partition, + cs->cpu_index, + &kapic, + sizeof(kapic)); + } + if (FAILED(hr)) { fprintf(stderr, "WHvSetVirtualProcessorInterruptControllerState failed: %08lx\= n", @@ -155,16 +165,28 @@ void whpx_apic_get(APICCommonState *s) { CPUState *cpu =3D CPU(s->cpu); struct whpx_lapic_state kapic; + HRESULT hr; + + if (whp_dispatch.WHvGetVirtualProcessorState) { + hr =3D whp_dispatch.WHvGetVirtualProcessorState( + whpx_global.partition, + cpu->cpu_index, + WHvVirtualProcessorStateTypeInterruptControllerState2, + &kapic, + sizeof(kapic), + NULL); + } else { + hr =3D whp_dispatch.WHvGetVirtualProcessorInterruptControllerState= 2( + whpx_global.partition, + cpu->cpu_index, + &kapic, + sizeof(kapic), + NULL); + } =20 - HRESULT hr =3D whp_dispatch.WHvGetVirtualProcessorInterruptControllerS= tate2( - whpx_global.partition, - cpu->cpu_index, - &kapic, - sizeof(kapic), - NULL); if (FAILED(hr)) { fprintf(stderr, - "WHvSetVirtualProcessorInterruptControllerState failed: %08lx\= n", + "WHvGetVirtualProcessorInterruptControllerState failed: %08lx\= n", hr); =20 abort(); --=20 2.50.1 (Apple Git-155)