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. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20190611205420.20286-1-ehabkost@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
cb79224b7e
commit
fea306520e
|
@ -5293,15 +5293,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.
|
||||
*/
|
||||
|
@ -5313,6 +5304,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)) {
|
||||
|
|
Loading…
Reference in a new issue