From nobody Mon Feb 9 18:44:32 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 1499100177257471.6155501094985; Mon, 3 Jul 2017 09:42:57 -0700 (PDT) Received: from localhost ([::1]:36300 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dS4R3-0006ct-VD for importer@patchew.org; Mon, 03 Jul 2017 12:42:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dS4KL-0000oK-Hd for qemu-devel@nongnu.org; Mon, 03 Jul 2017 12:35:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dS4KK-00084y-OR for qemu-devel@nongnu.org; Mon, 03 Jul 2017 12:35:57 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:32801) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dS4KK-00084A-HZ for qemu-devel@nongnu.org; Mon, 03 Jul 2017 12:35:56 -0400 Received: by mail-wm0-x242.google.com with SMTP id j85so21514843wmj.0 for ; Mon, 03 Jul 2017 09:35:56 -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 r5sm4867459wmr.9.2017.07.03.09.35.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jul 2017 09:35:54 -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=kMS7WBjucsljnD/dbwvMIt+udsARuLnGkSsPYUZsHfc=; b=b6A9wkXpmFnHtZdrNe5dBQ8T14bXOcUPfz0Uk5APsi8F+PHXM6lB49zPsxmm3nTLC/ TSvg2a6eEAQrVW8XgnMUF+Pn0NIKe9AuH0i82SsuCdspKrYwsQ8Bo2tzWZv77Wl7Xrja jeazK0Vob22U7114cXl81J8Ch5aYyoTQ3DoPMaI0jUShon4XwDv6N60MlH0AOkJlocLP XhfG6+wyOncp3EOAxoJX12Jt0CpMwT9xvAYdOZgNrlQtzJfURPCKO5FF0SV8lZsjX9wJ RypAjyg0VD/y/yzPrIOzhrzDzvqSqmqis3z5zSJh/R5WyHNbKVcsMqcxvucIuq5f33Tr 1hVA== 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=kMS7WBjucsljnD/dbwvMIt+udsARuLnGkSsPYUZsHfc=; b=K/idb0IAbvUhvOw/MD39gUUWEk1MQ033ZqsOr6IGVEZYMWdJVlmyfxNzKvEDoFgX/e QUJ5B+HMiRmwEe/lrT5HnDQ2AcTNK0O3Qz/ZX4AOBe/JJbs9lE38EK444FOI2KilbZ6l jMUgMQd6r13O01edW1Wb4yFddY7BphCh8n+/EDzd7Iju4so4gmC+IFXMpOkGTJ8iC5P+ 577pUCS+zAmTT1kDA19YZyxphbAX8E9PII+ueVqPUNF2Jd6fgJ8QplvTG+58mXJTQ+fT 8sNUefL+wRgf5KBm23mqMMRAK0y0LxfExp2v34vKdqmh5UrIsCyMMZFAYmXguP+vhFs+ fakg== X-Gm-Message-State: AKS2vOw0SUJCoWeRqAY/OtbZnfIljYsbQLAZH/WwQgZ0y+l3QErP+N82 dwFYRfKpmC5aA8hfwv8= X-Received: by 10.28.203.79 with SMTP id b76mr15798222wmg.81.1499099755349; Mon, 03 Jul 2017 09:35:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 3 Jul 2017 18:34:41 +0200 Message-Id: <1499099693-22903-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1499099693-22903-1-git-send-email-pbonzini@redhat.com> References: <1499099693-22903-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:c09::242 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" Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- 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