{"id":2224842,"url":"http://patchwork.ozlabs.org/api/patches/2224842/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260418223320.51330-28-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":"<20260418223320.51330-28-mohamed@unpredictable.fr>","list_archive_url":null,"date":"2026-04-18T22:33:09","name":"[27/38] target/i386: emulate: use exception_payload for fault address","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"35ca09c6fe504fd6dc71f9bd9ab8a88d4ad0769d","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/20260418223320.51330-28-mohamed@unpredictable.fr/mbox/","series":[{"id":500475,"url":"http://patchwork.ozlabs.org/api/series/500475/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500475","date":"2026-04-18T22:32:54","name":"WHPX x86 updates for QEMU 11.1","version":1,"mbox":"http://patchwork.ozlabs.org/series/500475/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2224842/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2224842/checks/","tags":{},"related":[],"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 (2048-bit key;\n unprotected) header.d=unpredictable.fr header.i=@unpredictable.fr\n header.a=rsa-sha256 header.s=sig1 header.b=NI3VEmUv;\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 4fympV71zhz1yDF\n\tfor ; Sun, 19 Apr 2026 08:37:22 +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 1wEEFE-0007IL-7K; Sat, 18 Apr 2026 18:34:32 -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 )\n id 1wEEF3-0006TR-Ro\n for qemu-devel@nongnu.org; Sat, 18 Apr 2026 18:34:24 -0400","from p-east2-cluster1-host6-snip4-3.eps.apple.com ([57.103.76.96]\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 )\n id 1wEEF1-00051A-0I\n for qemu-devel@nongnu.org; Sat, 18 Apr 2026 18:34:21 -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 C0AB61800233; Sat, 18 Apr 2026 22:34:14 +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 A40DF18000DE; Sat, 18 Apr 2026 22:34:12 +0000 (UTC)"],"Dkim-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1776551656; x=1779143656;\n bh=MoioDyw9WNCdgAnpil2qVwmsqi0G9SAnV0FrCmNrGIk=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=NI3VEmUvUz7djUiMd3cwYD9n27bLbVeMX/F9UgneXD2E50UZzCAcH518vEdcGSyg9otViAW3SM5A8YnD1y1KbYruC1l8ihX0QkjrNNWqZ3pHOQN/oE5KqS+2vcbS/DMz7Y7yfh6i3ak8qQ3eBocIvZW1smN1Gjw1Ho5JJ1QJHPwBDyQUAyj2KVhXNSysTUMPiSXicqhggRd4lGShFj+fOXEY5FURPHLqxRidz58rDPxOZSHD4XQb6xP9aotSUqpCL567CO1cI6eq2W4BiUogj/wfshS5rHVmHJJ0k3YC6IHSUeRcq8zypfzzlHHEJlSrMaaexeSJs0/AkRbEkKgqvg==","mail-alias-created-date":"1752046281608","From":"Mohamed Mediouni ","To":"qemu-devel@nongnu.org","Cc":"Mohamed Mediouni ,\n \"Michael S. Tsirkin\" , Paolo Bonzini ,\n Zhao Liu , Pedro Barbuda ,\n Roman Bolshakov , qemu-arm@nongnu.org,\n Pierrick Bouvier ,\n Peter Maydell , Wei Liu ,\n Phil Dennis-Jordan ","Subject":"[PATCH 27/38] target/i386: emulate: use exception_payload for fault\n address","Date":"Sun, 19 Apr 2026 00:33:09 +0200","Message-ID":"<20260418223320.51330-28-mohamed@unpredictable.fr>","X-Mailer":"git-send-email 2.50.1","In-Reply-To":"<20260418223320.51330-1-mohamed@unpredictable.fr>","References":"<20260418223320.51330-1-mohamed@unpredictable.fr>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDE4MDIyOCBTYWx0ZWRfX6SKf308iUoHL\n ouXAclk8csGVPRazCJTzJ2zWH4Ezh0Zss4aulB7G0dZLV9I/6KLf3sJKchLLJ4+TmGWmU5W+ZBs\n 6vtyw9EMFAn3QL/BheU+suf96pq3nObohT6GYvALQG9Yiw7RGoGT0XQb0KCwCKUyDK42OK8X1/W\n m+y6+kz2ATfLW/a3k9xD7a628chvKs/qfd1RxqK4t1s2lcQGF99sZIijrX0rPqKPbdTTmqnMPY3\n ASi7bf7rrsgohoEX2IQNyrQvHs+DfwwTTQLitjPizzYJ60vtFPZnFo7RsyO43uVs1WCYab1Rxvg\n rHAkKIZhR792Hrw1RgndvFDpsRI9kTA3VPF5O9gzpPJKpF1AuIDCyZ2IULx7Ww=","X-Proofpoint-GUID":"8ht7CBbAtdti2zpb7UEFxVqnfWlYzRJ2","X-Proofpoint-ORIG-GUID":"8ht7CBbAtdti2zpb7UEFxVqnfWlYzRJ2","X-Authority-Info-Out":"v=2.4 cv=JN42csKb c=1 sm=1 tr=0 ts=69e406e7\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=YcyI-53RcdBlrF1VUN8A:9","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-04-18_06,2026-04-17_04,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=notspam policy=default score=0 phishscore=0\n mlxscore=0 bulkscore=0 suspectscore=0 clxscore=1030 mlxlogscore=791\n malwarescore=0 lowpriorityscore=0 adultscore=0 spamscore=0 classifier=spam\n authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000\n definitions=main-2604180228","Received-SPF":"pass client-ip=57.103.76.96;\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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,\n RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 ","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":"Instead of directly putting it in cr[2], put it in exception_payload.\n\nSigned-off-by: Mohamed Mediouni \n---\n target/i386/emulate/x86_mmu.c | 3 ++-\n target/i386/whpx/whpx-all.c | 6 +++---\n 2 files changed, 5 insertions(+), 4 deletions(-)","diff":"diff --git a/target/i386/emulate/x86_mmu.c b/target/i386/emulate/x86_mmu.c\nindex 007de582de..8d4371467f 100644\n--- a/target/i386/emulate/x86_mmu.c\n+++ b/target/i386/emulate/x86_mmu.c\n@@ -277,7 +277,8 @@ static MMUTranslateResult x86_write_mem_ex(CPUState *cpu, void *data, target_ulo\n translate_res = mmu_gva_to_gpa(cpu, gva, &gpa, translate_flags);\n if (translate_res) {\n int error_code = translate_res_to_error_code(translate_res, true, is_user(cpu));\n- env->cr[2] = gva;\n+ env->exception_has_payload = 1;\n+ env->exception_payload = gva;\n x86_emul_raise_exception(env, EXCP0E_PAGE, error_code);\n return translate_res;\n }\ndiff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c\nindex dee2a203b2..02235d5391 100644\n--- a/target/i386/whpx/whpx-all.c\n+++ b/target/i386/whpx/whpx-all.c\n@@ -1818,11 +1818,11 @@ static void whpx_inject_exceptions(CPUState* cpu)\n WHV_REGISTER_VALUE reg = {};\n reg.ExceptionEvent.EventPending = 1;\n reg.ExceptionEvent.EventType = WHvX64PendingEventException;\n- reg.ExceptionEvent.DeliverErrorCode = 1;\n+ reg.ExceptionEvent.DeliverErrorCode = env->has_error_code;\n reg.ExceptionEvent.Vector = env->exception_nr;\n reg.ExceptionEvent.ErrorCode = env->error_code;\n- if (env->exception_nr == EXCP0E_PAGE) {\n- reg.ExceptionEvent.ExceptionParameter = env->cr[2];\n+ if (env->exception_has_payload) {\n+ reg.ExceptionEvent.ExceptionParameter = env->exception_payload;\n }\n whpx_set_reg(cpu, WHvRegisterPendingEvent, reg);\n }\n","prefixes":["27/38"]}