Re: [PATCH v4 4/8] target/i386: Drop physical address range checks

[Richard Henderson]

On 2/10/26 21:33, Anton Johansson wrote:

Since TARGET_PHYS_ADDR_SPACE_BITS is now fixed to 64 bits for all
targets we can remove range checks on cpu->phys_bits and
TCG_PHYS_ADDR_BITS.

Signed-off-by: Anton Johansson <a...@rev.ng>
---
  target/i386/tcg/helper-tcg.h | 2 --
  target/i386/cpu.c            | 9 +++------
  target/i386/kvm/kvm.c        | 3 +--
  3 files changed, 4 insertions(+), 10 deletions(-)

Reviewed-by: Richard Henderson <richard.hender...@linaro.org>

r~

diff --git a/target/i386/tcg/helper-tcg.h b/target/i386/tcg/helper-tcg.h
index e41cbda407..f4b2ff740d 100644
--- a/target/i386/tcg/helper-tcg.h
+++ b/target/i386/tcg/helper-tcg.h
@@ -31,8 +31,6 @@
  # define TCG_PHYS_ADDR_BITS 36
  #endif

-QEMU_BUILD_BUG_ON(TCG_PHYS_ADDR_BITS > TARGET_PHYS_ADDR_SPACE_BITS);

-
  /**
   * x86_cpu_do_interrupt:
   * @cpu: vCPU the interrupt is to be handled by.
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 0a7b884528..11755a5a7e 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -9943,12 +9943,9 @@ static void x86_cpu_realizefn(DeviceState *dev, Error 
**errp)
       * accel-specific code in cpu_exec_realizefn.
       */
      if (env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM) {
-        if (cpu->phys_bits &&
-            (cpu->phys_bits > TARGET_PHYS_ADDR_SPACE_BITS ||
-            cpu->phys_bits < 32)) {
-            error_setg(errp, "phys-bits should be between 32 and %u "
-                             " (but is %u)",
-                             TARGET_PHYS_ADDR_SPACE_BITS, cpu->phys_bits);
+        if (cpu->phys_bits && cpu->phys_bits < 32) {
+            error_setg(errp, "phys-bits should be at least 32"
+                             " (but is %u)", cpu->phys_bits);
              return;
          }
          /*
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 0c940d4b64..a48be342fe 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -4765,8 +4765,7 @@ static int kvm_get_msrs(X86CPU *cpu)
       */

if (cpu->fill_mtrr_mask) {

-        QEMU_BUILD_BUG_ON(TARGET_PHYS_ADDR_SPACE_BITS > 52);
-        assert(cpu->phys_bits <= TARGET_PHYS_ADDR_SPACE_BITS);
+        assert(cpu->phys_bits <= 52);
          mtrr_top_bits = MAKE_64BIT_MASK(cpu->phys_bits, 52 - cpu->phys_bits);
      } else {
          mtrr_top_bits = 0;