From nobody Sat Feb 7 06:55:23 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710336495; cv=none; d=zohomail.com; s=zohoarc; b=JxW9lhIInpd/ls76dtr3HyiigiaKCFqUIrGt9D9jsxMHOwOshpc/mYghlvVXl1GZfHJGyifwepBmDmZGw4g1E8itHZf6CE2Gi8n9ocbMVoLMVVoVEA+ckuFB5Hq4/oSEFgDbSoYQfZ1IgSXqccCMQLWWbk9vGc0WPqPnfJj6K08= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710336495; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=igcS/L5aoSdp/RqRXlSQ8qbrsN0mnzGNEZrfapLAc0g=; b=jkm48Q2YMKhQt4BS6ieU4ZmFwDfgw7dVrTQn+EPkItVl20RrYdp0hs95VvaB5QDY6VOKuUjU9EwETKaECsNn8waKcAzrg59PjhI9xx6xJAzgWKIQlWEPX5OAbx/F3JCHmZiAUW3cHfHnrk6eKYEzphrmzskvzJlREGFGpJ41D1Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171033649518111.551568921966009; Wed, 13 Mar 2024 06:28:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkOdr-0005Bo-Il; Wed, 13 Mar 2024 09:27:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkOdm-000587-5m for qemu-devel@nongnu.org; Wed, 13 Mar 2024 09:27:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkOdk-000462-Hx for qemu-devel@nongnu.org; Wed, 13 Mar 2024 09:27:29 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-91-n-x4ZdetNKW0BlS1svFm4A-1; Wed, 13 Mar 2024 09:27:23 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3B65118003A1; Wed, 13 Mar 2024 13:27:23 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.160]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5020737F4; Wed, 13 Mar 2024 13:27:22 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id AA0851801A91; Wed, 13 Mar 2024 14:27:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710336447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=igcS/L5aoSdp/RqRXlSQ8qbrsN0mnzGNEZrfapLAc0g=; b=NlzWGRLwOPt88gEGYuEM1Kv4UF9UKb4NTmZwWDO8Pvgq3IflPJXw0HSKQRsC/XQRKXNpgF kpq0zNz43w83M7ETJYlAOX7u7mGVvgqIXBBjKnPviMj+0H18DuyoQpFGAmv4LRwe5UlkNs sU/4cg6735APz5Xo1/7yjPHLAb2/ctE= X-MC-Unique: n-x4ZdetNKW0BlS1svFm4A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Tom Lendacky , Marcelo Tosatti , Paolo Bonzini , kvm@vger.kernel.org, Gerd Hoffmann Subject: [PATCH v3 3/3] target/i386: add guest-phys-bits cpu property Date: Wed, 13 Mar 2024 14:27:19 +0100 Message-ID: <20240313132719.939417-4-kraxel@redhat.com> In-Reply-To: <20240313132719.939417-1-kraxel@redhat.com> References: <20240313132719.939417-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.971, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710336496530100005 Content-Type: text/plain; charset="utf-8" Allows to set guest-phys-bits (cpuid leaf 80000008, eax[23:16]) via -cpu $model,guest-phys-bits=3D$nr. Signed-off-by: Gerd Hoffmann --- target/i386/cpu.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c88c895a5b3e..e0d73b6ec654 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -7380,6 +7380,14 @@ static void x86_cpu_realizefn(DeviceState *dev, Erro= r **errp) if (cpu->phys_bits =3D=3D 0) { cpu->phys_bits =3D TCG_PHYS_ADDR_BITS; } + if (cpu->guest_phys_bits && + (cpu->guest_phys_bits > cpu->phys_bits || + cpu->guest_phys_bits < 32)) { + error_setg(errp, "guest-phys-bits should be between 32 and %u " + " (but is %u)", + cpu->phys_bits, cpu->guest_phys_bits); + return; + } } else { /* For 32 bit systems don't use the user set value, but keep * phys_bits consistent with what we tell the guest. @@ -7388,6 +7396,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Erro= r **errp) error_setg(errp, "phys-bits is not user-configurable in 32 bit= "); return; } + if (cpu->guest_phys_bits !=3D 0) { + error_setg(errp, "guest-phys-bits is not user-configurable in = 32 bit"); + return; + } =20 if (env->features[FEAT_1_EDX] & (CPUID_PSE36 | CPUID_PAE)) { cpu->phys_bits =3D 36; @@ -7888,6 +7900,7 @@ static Property x86_cpu_properties[] =3D { DEFINE_PROP_BOOL("x-force-features", X86CPU, force_features, false), DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true), DEFINE_PROP_UINT32("phys-bits", X86CPU, phys_bits, 0), + DEFINE_PROP_UINT32("guest-phys-bits", X86CPU, guest_phys_bits, 0), DEFINE_PROP_BOOL("host-phys-bits", X86CPU, host_phys_bits, false), DEFINE_PROP_UINT8("host-phys-bits-limit", X86CPU, host_phys_bits_limit= , 0), DEFINE_PROP_BOOL("fill-mtrr-mask", X86CPU, fill_mtrr_mask, true), --=20 2.44.0