From nobody Mon Feb 9 23:03:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1562051500; cv=none; d=zoho.com; s=zohoarc; b=dTzJd3xPVvyo1b9I5XmugOPR77DR+J3MW9tBMfGlKNJ3zT2AvQlsvSroTfWgIrhMPjE+nZiHn7NwmGYDvsGtqqO5Yw9mJRZjMYIQf34BWlwXE0TBu0/cDkf8mHPI3a6cJe/NX+l5XCSUv5d6O7UbHlaCR07w2bED6VY/nU5PYDk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562051500; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=WZbxh7gmTFpWoRBb3fidoC3prns0GexafbLGg0tGR0o=; b=iY5xmNjpdmsf1UKrKbNHmNaPuI9kU2u+IlLY/4RMDeqTXSShzaqF88RLfbdDUyvDG0s0jhskST/2c0oErB5aY5XzIDWb6bQrsN6se3in6gDGgHHgCmBkhmoKHKSBMrLR1ZhI2PqJLoU8faf8vbor4E5eXgaKyCjDmf/BojjfUNk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562051487511374.9424848241864; Tue, 2 Jul 2019 00:11:27 -0700 (PDT) Received: from localhost ([::1]:49810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiCwo-0006Y1-Dy for importer@patchew.org; Tue, 02 Jul 2019 03:11:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58818) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiBzK-0005Ne-F5 for qemu-devel@nongnu.org; Tue, 02 Jul 2019 02:10:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiBzI-0003GO-KS for qemu-devel@nongnu.org; Tue, 02 Jul 2019 02:09:58 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:45211 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hiBzH-0002wS-Bo; Tue, 02 Jul 2019 02:09:55 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 45dDMk58rzz9sPv; Tue, 2 Jul 2019 16:09:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1562047746; bh=KvUuUxnqPIlSOE4K0wqSk8jUw/rVwZt3I6uPIyNI4mI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RguI+KUoGRilSmMghQW9NZ4l1iFCjIjdTfkYABoFe8hBY8gcQfvKjOZk8eVlY79+A +2LLV1a4seTffIItRYdwYjbjEMDeR4bShqu5p2bsf2FeI/+AMq2RXxxtkgG84CwELG v2weE3IH7OoTGuYnJ6qWIg/fYfFccsgRU1EfQvjo= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 2 Jul 2019 16:08:35 +1000 Message-Id: <20190702060857.3926-28-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190702060857.3926-1-david@gibson.dropbear.id.au> References: <20190702060857.3926-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 27/49] ppc: Introduce kvmppc_set_reg_tb_offset() helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson , rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Greg Kurz Introduce a KVM helper and its stub instead of guarding the code with CONFIG_KVM. Signed-off-by: Greg Kurz Message-Id: <156051055736.224162.11641594431517798715.stgit@bahia.lan> Signed-off-by: David Gibson --- hw/ppc/ppc.c | 5 +---- target/ppc/kvm.c | 9 +++++++++ target/ppc/kvm_ppc.h | 5 +++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 288196dfa6..a9e508c496 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -1034,10 +1034,7 @@ static void timebase_load(PPCTimebase *tb) CPU_FOREACH(cpu) { PowerPCCPU *pcpu =3D POWERPC_CPU(cpu); pcpu->env.tb_env->tb_offset =3D tb_off_adj; -#if defined(CONFIG_KVM) - kvm_set_one_reg(cpu, KVM_REG_PPC_TB_OFFSET, - &pcpu->env.tb_env->tb_offset); -#endif + kvmppc_set_reg_tb_offset(pcpu, pcpu->env.tb_env->tb_offset); } } =20 diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 9014ed029f..8a06d3171e 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2944,3 +2944,12 @@ void kvmppc_set_reg_ppc_online(PowerPCCPU *cpu, unsi= gned int online) kvm_set_one_reg(cs, KVM_REG_PPC_ONLINE, &online); } } + +void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_offset) +{ + CPUState *cs =3D CPU(cpu); + + if (kvm_enabled()) { + kvm_set_one_reg(cs, KVM_REG_PPC_TB_OFFSET, &tb_offset); + } +} diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 45776cad79..e642aaaf92 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -80,6 +80,7 @@ bool kvmppc_pvr_workaround_required(PowerPCCPU *cpu); bool kvmppc_hpt_needs_host_contiguous_pages(void); void kvm_check_mmu(PowerPCCPU *cpu, Error **errp); void kvmppc_set_reg_ppc_online(PowerPCCPU *cpu, unsigned int online); +void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_offset); =20 #else =20 @@ -206,6 +207,10 @@ static inline void kvmppc_set_reg_ppc_online(PowerPCCP= U *cpu, return; } =20 +static inline void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_of= fset) +{ +} + #ifndef CONFIG_USER_ONLY static inline bool kvmppc_spapr_use_multitce(void) { --=20 2.21.0