From nobody Mon Feb 9 09:34:11 2026 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499167171556429.24504149138284; Tue, 4 Jul 2017 04:19:31 -0700 (PDT) Received: from localhost ([::1]:40490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSLrd-0003q7-5A for importer@patchew.org; Tue, 04 Jul 2017 07:19:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSLl5-0006gV-JW for qemu-devel@nongnu.org; Tue, 04 Jul 2017 07:12:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSLl4-0001u2-MF for qemu-devel@nongnu.org; Tue, 04 Jul 2017 07:12:43 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:34421) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSLl4-0001te-FB for qemu-devel@nongnu.org; Tue, 04 Jul 2017 07:12:42 -0400 Received: by mail-wr0-x241.google.com with SMTP id k67so46853034wrc.1 for ; Tue, 04 Jul 2017 04:12:42 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id y5sm13613870wrd.52.2017.07.04.04.12.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jul 2017 04:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Bsk1zHOy//fwJzlz/CdS8R5/02NWnPphgT9hZFloWcg=; b=mU7l1a2nu4My7MC9h/GuNOikShlMmN8J7G0eUdmS8qgxj8KYglrdilwiAl0aae8wfw LAUBNJdwGx3u+r6s96T2+/itJ0JozvUu3r4HOjBsUjiX7XMCQF/iS0VAoLf+M6P5zzCG Libd7nmhxPvXpqfEgiLzQj8dDzWl5bveLpx/5QFjTYxRXRld8sz4SlXceKiEku5Qn/Mn nkRpdRtCBJrWsoshXFwY8oY/XttStpbzeh6jyJsHoaqnegEpNIbJmOIQ24/lXhEBssdP ckPRR1GXdeZFuzCNaB/YOFNZt4sEz+ItKN42TY1HopbANXxazAZP8otJp3iArIUyrivY GHYg== 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:cc:subject:date:message-id :in-reply-to:references; bh=Bsk1zHOy//fwJzlz/CdS8R5/02NWnPphgT9hZFloWcg=; b=EyTu0sFzG6Dnv72i2dTJvGIA74ayrC8gR8rJTsfY0Erp1qC5UgLZK/YLrYbhlpVxdw i/QkgaNmHc58I0dMeRget5jID4PrNSANFD74VVbBF2UhJmFVQZ1Yp/8N0MnDotDzbycy +z3inAl1Uwpjn9nXZkBGxsqi3DpfAlBsK9WsedLExbrE2oBM77e0BYh91tGZJHhmTP4b SWCjC/xs92X1Px9PphZWVprcA3jrPyQ7rYnWxAbEaCFMeYXDE4KH8eI6R/KOxzucRmmM Ie6r7P/pX07Dj2JEeIBDHzW7UTSKf8awhgp+Zo6AinlZE8xzOp41IjUNNtDbIjyhVWsf v5mA== X-Gm-Message-State: AKS2vOyFFBYGrvdqbMsTptgD0KrSXxB15EPm27g/lgk11DEqQhGEzvSA YlQ6B1TDMT/2clhTFFs= X-Received: by 10.223.173.143 with SMTP id w15mr33335115wrc.113.1499166761299; Tue, 04 Jul 2017 04:12:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 4 Jul 2017 13:12:03 +0200 Message-Id: <1499166735-39360-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1499166735-39360-1-git-send-email-pbonzini@redhat.com> References: <1499166735-39360-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PATCH 10/22] vapic: use tcg_enabled 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: , Cc: yang.zhong@intel.com, thuth@redhat.com, a.rigo@virtualopensystems.com, anthony.xu@intel.com, rth@twiddle.net 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" Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- hw/i386/kvmvapic.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index 82a4955..0d9ef77 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -410,7 +410,8 @@ static void patch_instruction(VAPICROMState *s, X86CPU = *cpu, target_ulong ip) handlers =3D &s->rom_state.mp; } =20 - if (!kvm_enabled()) { + if (tcg_enabled()) { + cpu_restore_state(cs, cs->mem_io_pc); cpu_get_tb_cpu_state(env, ¤t_pc, ¤t_cs_base, ¤t_flags); /* Account this instruction, because we will exit the tb. @@ -456,7 +457,7 @@ static void patch_instruction(VAPICROMState *s, X86CPU = *cpu, target_ulong ip) =20 resume_all_vcpus(); =20 - if (!kvm_enabled()) { + if (tcg_enabled()) { /* Both tb_lock and iothread_mutex will be reset when * longjmps back into the cpu_exec loop. */ tb_lock(); --=20 1.8.3.1