From nobody Mon Feb 9 14:03:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562084467; cv=none; d=zoho.com; s=zohoarc; b=n3Uv4uQv8EiboX0sgKUIaIaXlsdHsmHHWfUBW+2anr7vptm0n+D1R9yqjFEPX1YPmwdi8GC3HVGWO/4i+ImrUGHButMIrOo6yG7m1dbr4zSwLaENmYBtNrioC/fFlOgkAKFfqmGy0zHRTrZ/nF02TV9eae8iVKh2t2xKN5YHUHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562084467; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=1fGnZP58faChoodaUUwBVkRLQ8leibeUhTL8OJr674k=; b=KP25DZ5CpZrQvOzkMaYHQo4KmH7V+6D25NcSHVWFdpFLUqKRQLFbc+4T21FBr3oux+Lb4RmPP8wyMxQzrg27QYlhedLc46C97gygFkGnCeiDn8R7Llke5LX2jnIsoudtdFCQXS4/6bEg4gfs5PgVpMqeyGFGJmbn0F+tiSBOSYU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562084467308459.34116268907644; Tue, 2 Jul 2019 09:21:07 -0700 (PDT) Received: from localhost ([::1]:54966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiLWf-00057y-0y for importer@patchew.org; Tue, 02 Jul 2019 12:21:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37703) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiKpl-0008Ad-Bn for qemu-devel@nongnu.org; Tue, 02 Jul 2019 11:36:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiKpY-0006BD-Dg for qemu-devel@nongnu.org; Tue, 02 Jul 2019 11:36:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39730) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hiKpX-000678-Ju for qemu-devel@nongnu.org; Tue, 02 Jul 2019 11:36:27 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7998834CF; Tue, 2 Jul 2019 15:36:23 +0000 (UTC) Received: from localhost (ovpn-116-30.gru2.redhat.com [10.97.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09EB019C6F; Tue, 2 Jul 2019 15:36:22 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , Paolo Bonzini , qemu-devel@nongnu.org, Marcel Apfelbaum , Richard Henderson Date: Tue, 2 Jul 2019 12:35:15 -0300 Message-Id: <20190702153535.9851-23-ehabkost@redhat.com> In-Reply-To: <20190702153535.9851-1-ehabkost@redhat.com> References: <20190702153535.9851-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 02 Jul 2019 15:36:23 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v3 22/42] i386: Don't print warning if phys-bits was set automatically X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Message-Id: <20190611205420.20286-1-ehabkost@redhat.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Eduardo Habkost --- 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 3a38fe3633..390f47adc5 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5293,15 +5293,6 @@ static void x86_cpu_realizefn(DeviceState *dev, Erro= r **errp) uint32_t host_phys_bits =3D x86_host_phys_bits(); static bool warned; =20 - if (cpu->host_phys_bits) { - /* The user asked for us to use the host physical bits */ - cpu->phys_bits =3D host_phys_bits; - if (cpu->host_phys_bits_limit && - cpu->phys_bits > cpu->host_phys_bits_limit) { - cpu->phys_bits =3D 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, Erro= r **errp) warned =3D true; } =20 + if (cpu->host_phys_bits) { + /* The user asked for us to use the host physical bits */ + cpu->phys_bits =3D host_phys_bits; + if (cpu->host_phys_bits_limit && + cpu->phys_bits > cpu->host_phys_bits_limit) { + cpu->phys_bits =3D cpu->host_phys_bits_limit; + } + } + if (cpu->phys_bits && (cpu->phys_bits > TARGET_PHYS_ADDR_SPACE_BITS || cpu->phys_bits < 32)) { --=20 2.18.0.rc1.1.g3f1ff2140