openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target/i386: fix host_cpu_adjust_phys_bits error handling 

move the check for phys_bits outside of host_cpu_adjust_phys_bits,
because otherwise it is impossible to return an error condition
explicitly.

Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210322132800.7470-8-cfontana@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Claudio Fontana 2021-03-22 14:27:43 +01:00 committed by Paolo Bonzini
parent bb883fd677
commit ce21726525
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
target/i386/host-cpu.c
View File

@ -50,7 +50,7 @@ static void host_cpu_enable_cpu_pm(X86CPU *cpu)
env->features[FEAT_1_ECX] |= CPUID_EXT_MONITOR; env->features[FEAT_1_ECX] |= CPUID_EXT_MONITOR;
} }
static uint32_t host_cpu_adjust_phys_bits(X86CPU *cpu, Error **errp) static uint32_t host_cpu_adjust_phys_bits(X86CPU *cpu)
{ {
uint32_t host_phys_bits = host_cpu_phys_bits(); uint32_t host_phys_bits = host_cpu_phys_bits();
uint32_t phys_bits = cpu->phys_bits; uint32_t phys_bits = cpu->phys_bits;
@ -77,14 +77,6 @@ static uint32_t host_cpu_adjust_phys_bits(X86CPU *cpu, Error **errp)
} }
} }
if (phys_bits &&
(phys_bits > TARGET_PHYS_ADDR_SPACE_BITS ||
phys_bits < 32)) {
error_setg(errp, "phys-bits should be between 32 and %u "
" (but is %u)",
TARGET_PHYS_ADDR_SPACE_BITS, phys_bits);
}
return phys_bits; return phys_bits;
} }
@ -97,7 +89,17 @@ void host_cpu_realizefn(CPUState *cs, Error **errp)
host_cpu_enable_cpu_pm(cpu); host_cpu_enable_cpu_pm(cpu);
} }
if (env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM) { if (env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM) {
cpu->phys_bits = host_cpu_adjust_phys_bits(cpu, errp); uint32_t phys_bits = host_cpu_adjust_phys_bits(cpu);
if (phys_bits &&
(phys_bits > TARGET_PHYS_ADDR_SPACE_BITS ||
phys_bits < 32)) {
error_setg(errp, "phys-bits should be between 32 and %u "
" (but is %u)",
TARGET_PHYS_ADDR_SPACE_BITS, phys_bits);
return;
}
cpu->phys_bits = phys_bits;
} }
} }