From 7e78c8e8b5a9cab9ef4604dc29eab4b4323e9b9b Mon Sep 17 00:00:00 2001

From: Eduardo Habkost <ehabkost@redhat.com>

Date: Tue, 13 Aug 2019 01:53:55 +0100

Subject: [PATCH 01/21] i386: Don't print warning if phys-bits was set

 automatically

RH-Author: Eduardo Habkost <ehabkost@redhat.com>

Message-id: <20190813015355.17556-1-ehabkost@redhat.com>

Patchwork-id: 89946

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH] i386: Don't print warning if phys-bits was set automatically

Bugzilla: 1719127

RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

RH-Acked-by: Igor Mammedov <imammedo@redhat.com>

RH-Acked-by: John Snow <jsnow@redhat.com>

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1719127

BRANCH: rhel-8.1.0

UPSTREAM: fea306520ea4b2f189dd23c70a6afd2fc4ffafdc

BREW: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=23026463

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>

(cherry picked from commit fea306520ea4b2f189dd23c70a6afd2fc4ffafdc)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 target/i386/cpu.c | 18 +++++++++---------

 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/target/i386/cpu.c b/target/i386/cpu.c

index c8f50a7..c69116c 100644

--- a/target/i386/cpu.c

+++ b/target/i386/cpu.c

@@ -5116,15 +5116,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.

              */

@@ -5136,6 +5127,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)) {

-- 

1.8.3.1