{"id":2231021,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2231021/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430093810.2762539-20-peter.maydell@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/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":""},"msgid":"<20260430093810.2762539-20-peter.maydell@linaro.org>","date":"2026-04-30T09:38:04","name":"[v2,19/25] hw/i386/vapic.c: Use cpu_translate_for_debug()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"434e76d3ec46822a41010443c0255877c744e5fd","submitter":{"id":5111,"url":"http://patchwork.ozlabs.org/api/1.1/people/5111/?format=json","name":"Peter Maydell","email":"peter.maydell@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430093810.2762539-20-peter.maydell@linaro.org/mbox/","series":[{"id":502257,"url":"http://patchwork.ozlabs.org/api/1.1/series/502257/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502257","date":"2026-04-30T09:37:47","name":"Handle sub-page granularity in cpu_memory_rw_debug()","version":2,"mbox":"http://patchwork.ozlabs.org/series/502257/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2231021/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2231021/checks/","tags":{},"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=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=kLCoc72u;\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 4g5q2y5nv2z1yGq\n\tfor ; Thu, 30 Apr 2026 19:42:34 +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 1wINrG-0005OJ-W1; Thu, 30 Apr 2026 05:38:59 -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 1wINrA-000587-Qc\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 05:38:52 -0400","from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1wINqy-0002lx-7w\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 05:38:52 -0400","by mail-wr1-x42a.google.com with SMTP id\n ffacd0b85a97d-43d73422431so625125f8f.2\n for ; Thu, 30 Apr 2026 02:38:37 -0700 (PDT)","from lanath.. (wildly.archaic.org.uk. [81.2.115.145])\n by smtp.gmail.com with ESMTPSA id\n ffacd0b85a97d-447b421721fsm10816795f8f.15.2026.04.30.02.38.35\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 30 Apr 2026 02:38:36 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1777541917; x=1778146717; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=R4M1+8MaNJJPZqDo1tunWUHC1iAqc51w+I18EtZXKXs=;\n b=kLCoc72uPLbYaNNZNYJN/9cIVYu0BYkw4FcdmysF1s6fTH4ufhczaAzLP8BJLvae5b\n GBUYpXA3ODqy353LtujKBjOXIZT1Pxcb0O8QcDxcpsE64pN2Iwuigr5Mv5cFFWglTk3S\n dR3W2e/rb1mUUzVAgKfooNX9/43pC0rrwLDd5F5qjgDY0FFhlW7Qm6IkPHtu3HZLkM4T\n 4+gnY8yCdl1am7oYBvjTkROhJ40qh4m77FCqCFqaC6wN49Q7p0v73DEip2OxpW0b4uBO\n ah/uqTYTKqwbMfXXkXkPBMoBEvuB0GeOwibYw4Sb4js0ofukj0PX68HLQWnqUMg6Ajgx\n XkiQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777541917; x=1778146717;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=R4M1+8MaNJJPZqDo1tunWUHC1iAqc51w+I18EtZXKXs=;\n b=tDKBdjskbEQtPMEDR5U1icQv4xMRxF8+d2DeyoN7CtKYIiBpoLyi5AQxCDTfGzf8Cr\n 0o8jt/OwHOLHN6D33o8KLrqzrvQx3J5vh2KZoEMS/lBKNKQDMC4nA3cSZySW0YkKYI/e\n IllazV3d8KPjca6v4sNrQ0SiP/HOdiyXE+jqBHEcRQ0QnSxGmx9DF6VcVf+iTD2ks4sN\n oG0qzlA2cFz3ocHnx/7jzxzQTGTr+z/VsdIwdPar7R/4M0AWoZxty04HY6KMtcrjZLwd\n itulzeHJXOCAOLdqhj/AGHabWPfBFUucOmrMYcDicAPQufmbMqLo1+OmzUAPxi3wrbtR\n 7YEA==","X-Gm-Message-State":"AOJu0YxXGm7ZMzmd7PeBX609QS9Pr5Zdy1h4lcqiUzEBb/xXaQxDguUz\n 7yoWVY6z+D0FMA22ZJ2RCxSGKOaC4iTpjlR9Ogum58c1Q6mxZqjyD5bxE61Oj0gpX4qeFhuXckU\n U5Fmo","X-Gm-Gg":"AeBDieso/heGWuRPzbpumoEGm1FDjeqn4f+e760UWMDbmgKT0GnMfQFU4nIKSNS4ZG4\n flHul5sewzVgEiBKYacNJhKotLgnrr5IZYQElr70AzHqH9i320XJI2v6SY89a/5HpB+t+lwszqP\n iTEczDCSHzEDIdm4t9dJk+gMVVrFd0cVLJZSNgxWWeKcga6po1GxNIuWRUiT7EbwPz1i8c7kSlZ\n 3hQRv4lEJ1IQq+0kvKfJHOyU61hD6dBf2g+uwD/J7lvJkRPZLXEqUb3YnTr/aGjAvfg4LdpLtvW\n 374e8Ua+kQNc3FbmzzX0GMqCAfJyxHNEqAI4vNDg3DJoHxt1xKAaQ4CCOJx6apK9sMuG+C7Yqo4\n SuINZUu8xfXZTEtuBdDqnKpoYu/jBd2xtCaqHYMz0PuIPssh0/SLJYOkQLrk8Kz/4iENoFEJuWm\n fAqjBvMUnhmmJPAq6GdXBDkFmW+qQKO+NTwnh9jOw4M9F/VMtNj6meXJksKF4zr+XGgz8kHS3sw\n sLXVgVEmTUUgSXy94GbXe1fOttFLdSJddWLf6zb9g==","X-Received":"by 2002:a5d:5f44:0:b0:43c:ff58:35c3 with SMTP id\n ffacd0b85a97d-4493d02aaa6mr3458793f8f.10.1777541916662;\n Thu, 30 Apr 2026 02:38:36 -0700 (PDT)","From":"Peter Maydell ","To":"qemu-devel@nongnu.org","Cc":"qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org,\n qemu-s390x@nongnu.org,\n =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ,\n Marcel Apfelbaum ,\n Yanan Wang , Zhao Liu ,\n Paolo Bonzini ,\n Richard Henderson ,\n \"Dr. David Alan Gilbert\" ,\n =?utf-8?q?Alex_Benn=C3=A9e?= ,\n Alexandre Iooss , Mahmoud Mandour ,\n Peter Xu , \"Edgar E. Iglesias\" ,\n Jiaxun Yang , Nicholas Piggin ,\n Chinmay Rath , Glenn Miles ,\n Palmer Dabbelt ,\n Alistair Francis , Weiwei Li ,\n Daniel Henrique Barboza ,\n Liu Zhiwei ,\n Chao Liu , Ilya Leoshkevich ,\n David Hildenbrand ,\n Mark Cave-Ayland ,\n Artyom Tarasenko , Max Filippov ","Subject":"[PATCH v2 19/25] hw/i386/vapic.c: Use cpu_translate_for_debug()","Date":"Thu, 30 Apr 2026 10:38:04 +0100","Message-ID":"<20260430093810.2762539-20-peter.maydell@linaro.org>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260430093810.2762539-1-peter.maydell@linaro.org>","References":"<20260430093810.2762539-1-peter.maydell@linaro.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::42a;\n envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42a.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=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":"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":"We would like to remove the cpu_get_phys_addr_debug() function, by\nmoving all callers to cpu_translate_for_debug(). Update the callsites\nin vapic.c.\n\nIn the process we can drop the old \"OR the page offset back in\"\nworkaround that we had for when cpu_get_phys_page_addr() returned\nthe physaddr of the page base rather than the exact physaddr of\nthe input virtual address.\n\nSigned-off-by: Peter Maydell \n---\n hw/i386/vapic.c | 13 +++++++------\n 1 file changed, 7 insertions(+), 6 deletions(-)","diff":"diff --git a/hw/i386/vapic.c b/hw/i386/vapic.c\nindex 225f19a75c..781bf2a7fa 100644\n--- a/hw/i386/vapic.c\n+++ b/hw/i386/vapic.c\n@@ -161,7 +161,6 @@ static void update_guest_rom_state(VAPICROMState *s)\n static int find_real_tpr_addr(VAPICROMState *s, CPUX86State *env)\n {\n CPUState *cs = env_cpu(env);\n- hwaddr paddr;\n target_ulong addr;\n \n if (s->state == VAPIC_ACTIVE) {\n@@ -173,8 +172,10 @@ static int find_real_tpr_addr(VAPICROMState *s, CPUX86State *env)\n * virtual address space for the APIC mapping.\n */\n for (addr = 0xfffff000; addr >= 0x80000000; addr -= TARGET_PAGE_SIZE) {\n- paddr = cpu_get_phys_addr_debug(cs, addr);\n- if (paddr != APIC_DEFAULT_ADDRESS) {\n+ TranslateForDebugResult tres;\n+\n+ if (!cpu_translate_for_debug(cs, addr, &tres) ||\n+ tres.physaddr != APIC_DEFAULT_ADDRESS) {\n continue;\n }\n s->real_tpr_addr = addr + 0x80;\n@@ -292,6 +293,7 @@ static int update_rom_mapping(VAPICROMState *s, CPUX86State *env, target_ulong i\n hwaddr paddr;\n uint32_t rom_state_vaddr;\n uint32_t pos, patch, offset;\n+ TranslateForDebugResult tres;\n \n /* nothing to do if already activated */\n if (s->state == VAPIC_ACTIVE) {\n@@ -305,11 +307,10 @@ static int update_rom_mapping(VAPICROMState *s, CPUX86State *env, target_ulong i\n \n /* find out virtual address of the ROM */\n rom_state_vaddr = s->rom_state_paddr + (ip & 0xf0000000);\n- paddr = cpu_get_phys_addr_debug(cs, rom_state_vaddr);\n- if (paddr == -1) {\n+ if (!cpu_translate_for_debug(cs, rom_state_vaddr, &tres)) {\n return -1;\n }\n- paddr |= rom_state_vaddr & ~TARGET_PAGE_MASK;\n+ paddr = tres.physaddr;\n if (paddr != s->rom_state_paddr) {\n return -1;\n }\n","prefixes":["v2","19/25"]}