From nobody Mon Feb 9 17:24:07 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.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149923990769580.13471308203907; Wed, 5 Jul 2017 00:31:47 -0700 (PDT) Received: from localhost ([::1]:44560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSemn-0003SE-9H for importer@patchew.org; Wed, 05 Jul 2017 03:31:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46808) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSeX4-0004xj-C0 for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:15:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSeX1-0007pM-K6 for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:15:30 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:35906) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSeX1-0007p2-EU for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:15:27 -0400 Received: by mail-wr0-x243.google.com with SMTP id 77so49088179wrb.3 for ; Wed, 05 Jul 2017 00:15:27 -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 y35sm22202793wrc.51.2017.07.05.00.15.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 00:15:25 -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=kMS7WBjucsljnD/dbwvMIt+udsARuLnGkSsPYUZsHfc=; b=H/7mGg67b5ZPEbVm32xlzDGjo+LSyK9r1PJTKBUnIx/Cc0SnsrX9U0u5i2eFf2KvKj ZXCF0BEz/SNyL9O1m7RrVWnFNYYdD5/IB+2mZ331lI2ox0BDulnLdZ436kqrVuXqpfBv NVFlKxvG4Lig9bAPTkQkTiMNZ5qXpg4avy+TltowtXPeUpC4hfkoAn4VKoMXrbDXD2+p LjMkCzlIzCaTuOznpimeOkb2iNFmVjHNQDm75D549PLtyLZT1IgnU4cNLPDjvALCJdPx 1HjRTprXu1YwxsYt/+IhmnWjAeC0MC/Q33n5HbUw4dH71tK3+2s6iCUBRbgQ05zBzcHf QrGA== 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=kMS7WBjucsljnD/dbwvMIt+udsARuLnGkSsPYUZsHfc=; b=I8HmnM3BL7y1BXz7h5SF34ku7Ffia2QpHP7kXU9Lmv/D6MDzmyw8MLjlD7lt6DasN1 FvlT9c86k7bjWxegyyJ9yVVPzZxZtRDkzjRza+Ud9Sf0q/W0UjKyhCE1x++E9sw21COd tqTh9ezfT+hiNtntAzxjjCEGJdJnQ7PZhQPHiq9/QODUYhOMX7EVANEO2YIwiTNH6Jm7 dY36DRMg3WRvuiJCqyGnsnVKpwkj1oKO27mz/qIqVvt4YXRGUvRY5wC8z/gRJXrY9i8z jC0X9zAsx0CJ/V7LhQ7q0J8OHgYcSAEVY7/V6ojoX4BBFxemSNnK7pU3j7cjD260zRtV 0Yvg== X-Gm-Message-State: AKS2vOyJPsvRTnU3sxqob0sCRKucH9z3h+Hlnt49j8ijSGj4l3XBRtMr uoeZuOohMzMHpA4NCMU= X-Received: by 10.223.133.211 with SMTP id 19mr43538491wru.27.1499238926313; Wed, 05 Jul 2017 00:15:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 5 Jul 2017 09:14:34 +0200 Message-Id: <1499238885-26161-32-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1499238885-26161-1-git-send-email-pbonzini@redhat.com> References: <1499238885-26161-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::243 Subject: [Qemu-devel] [PULL 31/42] 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: , 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 --- 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