From nobody Wed Nov 5 08:16:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15330244448636.332757560126538; Tue, 31 Jul 2018 01:07:24 -0700 (PDT) Received: from localhost ([::1]:57464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fkPgh-0001uj-NQ for importer@patchew.org; Tue, 31 Jul 2018 04:07:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fkPcd-0007cC-AA for qemu-devel@nongnu.org; Tue, 31 Jul 2018 04:03:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fkPcX-00019V-Kk for qemu-devel@nongnu.org; Tue, 31 Jul 2018 04:03:11 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:33696) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fkPcX-00019D-D5 for qemu-devel@nongnu.org; Tue, 31 Jul 2018 04:03:05 -0400 Received: by mail-wr1-x42c.google.com with SMTP id g6-v6so15594490wrp.0 for ; Tue, 31 Jul 2018 01:03:05 -0700 (PDT) Received: from donizetti.redhat.com (94-36-184-250.adsl-ull.clienti.tiscali.it. [94.36.184.250]) by smtp.gmail.com with ESMTPSA id j8-v6sm21748565wru.41.2018.07.31.01.03.02 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Jul 2018 01:03:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=I+9ILmMR/ptg1vAzv/BykOqK0I1LWmEI3RGZyfR5olI=; b=qkvaBFibVIAE4TVw/jDxrclhM5r3DfsQcukrAN9GLMClXmGh1CRXPa+xMFVG2eqB9J dRfICbBbHx/2dCsggTLxAmOl6fBUtR5nP6IBc7yH8ALtY5aPDtGP4f5BFy/cIV2eLE1w 2g6GJkav3rU+dPsrc1Nv26Scng+o/QpvdVxBfPNAMr19SfShrs7OP1A72ujjptAwk5KO oCoD84c4n7+qjY9ic5LoiAOOUjzLsjAPzjsLQLz8ZSP6DOOAWvbD9ueR8aqObR8knLY3 lGPfJkqK9cMAIHxUxjI/z66ThULMnTeOvCCcOT2VpQ8mSv5i/KHLQrphs6FkRK5qwsqN vCoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=I+9ILmMR/ptg1vAzv/BykOqK0I1LWmEI3RGZyfR5olI=; b=J/EAo1AXMpBqgVtwrMJ4s1iK+soUwKzyELlydSpD/yKzi5uLLMv1j/nW2IgtBBwEeC aY1Mx2inG98s6JNAkCC6ADeH16E+vzPp805B6L1XJf1Rhz09N7kLE7AUC9z9Ht/rjY7I PGJQBCi96ixs4++s/trvCwOJumj3UQwKQTSHbH5kMMlegg+qV1rckqpndSOi8sQGHTlq o3ySzYkN29RGjGVkYmV+yQD6OZf4ZrdXB613o6fdrQQs7RzWH4csqrA6FLG8xAdAs+qC Wtk9huqqlUFk7LnpmQzUVPB3lKjkG0hGoyxfAKaiux85BOR4r2jmiD24iL2slRAC+wFX ZljA== X-Gm-Message-State: AOUpUlGCNn3YkZUfmjczr/70gCG2YkKEow+YD5HlWZN/mh1YEnco3CPe xgopoWVXpLu7ijmVhANumUvLuZxs X-Google-Smtp-Source: AAOMgpfgUnXLVDvMiJpM6VBdD+hzU0KDjfjT9be0dss9dnN33L1zrz0V+UyPkQoEFVUqxQVFxZTP/Q== X-Received: by 2002:adf:e3c5:: with SMTP id k5-v6mr20690188wrm.94.1533024184099; Tue, 31 Jul 2018 01:03:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 31 Jul 2018 10:02:57 +0200 Message-Id: <20180731080259.15934-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180731080259.15934-1-pbonzini@redhat.com> References: <20180731080259.15934-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c Subject: [Qemu-devel] [PULL 2/4] i386: implement MSR_SMI_COUNT for TCG X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is trivial, so just do it. Signed-off-by: Paolo Bonzini --- target/i386/misc_helper.c | 3 +++ target/i386/smm_helper.c | 1 + 2 files changed, 4 insertions(+) diff --git a/target/i386/misc_helper.c b/target/i386/misc_helper.c index 628f64a..78f2020 100644 --- a/target/i386/misc_helper.c +++ b/target/i386/misc_helper.c @@ -447,6 +447,9 @@ void helper_rdmsr(CPUX86State *env) val =3D env->tsc_aux; break; #endif + case MSR_SMI_COUNT: + val =3D env->msr_smi_count; + break; case MSR_MTRRphysBase(0): case MSR_MTRRphysBase(1): case MSR_MTRRphysBase(2): diff --git a/target/i386/smm_helper.c b/target/i386/smm_helper.c index 90621e5..c1c34a7 100644 --- a/target/i386/smm_helper.c +++ b/target/i386/smm_helper.c @@ -54,6 +54,7 @@ void do_smm_enter(X86CPU *cpu) qemu_log_mask(CPU_LOG_INT, "SMM: enter\n"); log_cpu_state_mask(CPU_LOG_INT, CPU(cpu), CPU_DUMP_CCOP); =20 + env->msr_smi_count++; env->hflags |=3D HF_SMM_MASK; if (env->hflags2 & HF2_NMI_MASK) { env->hflags2 |=3D HF2_SMM_INSIDE_NMI_MASK; --=20 1.8.3.1