i386: Don't print warning if phys-bits was set automatically
PATCH 1/1 i386: Don't print warning if phys-bits was set automatically
If cpu->host_phys_bits_limit is set, QEMU will make cpu->phys_bits be lower than host_phys_bits on some cases. This triggers a warning that was supposed to be printed only if phys-bits was explicitly set in the command-line.
Reorder the code so the value of cpu->phys_bits is validated before the cpu->host_phys_bits handling. This will avoid unexpected warnings when cpu->host_phys_bits_limit is set.
--- target/i386/cpu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
target/i386/cpu.c +9 -9
@@ -5269,15 +5269,6 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)uint32_t host_phys_bits =x86_host_phys_bits ();static bool warned; -if (cpu->host_phys_bits) { -/* The user asked for us to use the host physical bits */ - cpu->phys_bits = host_phys_bits; -if (cpu->host_phys_bits_limit && - cpu->phys_bits > cpu->host_phys_bits_limit) { - cpu->phys_bits = cpu->host_phys_bits_limit; - } - } -/* Print a warning if the user set it to a value that's not the * host value. */
@@ -5289,6 +5280,15 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) warned = true; } +if (cpu->host_phys_bits) { +/* The user asked for us to use the host physical bits */ + cpu->phys_bits = host_phys_bits; +if (cpu->host_phys_bits_limit && + cpu->phys_bits > cpu->host_phys_bits_limit) { + cpu->phys_bits = cpu->host_phys_bits_limit; + } + } +if (cpu->phys_bits && (cpu->phys_bits >TARGET_PHYS_ADDR_SPACE_BITS || cpu->phys_bits <32 )) {
Signature · 1 line
2.18.0.rc1.1.g3f1ff2140
Quoted 10 lines · * Eduardo Habkost ([email protected]) wrote:
If
cpu->host_phys_bits_limitis set, QEMU will makecpu->phys_bitsbe lower thanhost_phys_bitson some cases. This triggers a warning that was supposed to be printed only if phys-bits was explicitly set in the command-line.Reorder the code so the value of
cpu->phys_bitsis validated before thecpu->host_phys_bitshandling. This will avoid unexpected warnings whencpu->host_phys_bits_limitis set.Signed-off-by Eduardo Habkost <[email protected]>
I think that's OK; note I think that means you can trigger an erroneous warning in the case where the user does something odd like:
phys_bits=50,host_phys_bits=true
so you print the warning and *then* set phys_bits = host_phys_bits.
Quoted 43 lines
--- target/i386/cpu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)target/i386/cpu.c +9
-9@@ -5269,15 +5269,6 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)uint32_t host_phys_bits =x86_host_phys_bits ();static bool warned; -if (cpu->host_phys_bits) { -/* The user asked for us to use the host physical bits */ - cpu->phys_bits = host_phys_bits; -if (cpu->host_phys_bits_limit && - cpu->phys_bits > cpu->host_phys_bits_limit) { - cpu->phys_bits = cpu->host_phys_bits_limit; - } - } -/* Print a warning if the user set it to a value that's not the * host value. */ @@ -5289,6 +5280,15 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) warned = true; } +if (cpu->host_phys_bits) { +/* The user asked for us to use the host physical bits */ + cpu->phys_bits = host_phys_bits; +if (cpu->host_phys_bits_limit && + cpu->phys_bits > cpu->host_phys_bits_limit) { + cpu->phys_bits = cpu->host_phys_bits_limit; + } + } +if (cpu->phys_bits && (cpu->phys_bits >TARGET_PHYS_ADDR_SPACE_BITS || cpu->phys_bits <32 )) {Signature · 1 line
2.18.0.rc1.1.g3f1ff2140
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK