From patchwork Fri Jul 21 07:37:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: JianChunfu X-Patchwork-Id: 1810897 X-Patchwork-Delegate: clg@kaod.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6qw03cVzz1yYc for ; Fri, 21 Jul 2023 23:21:50 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qMq4Q-0004XO-O0; Fri, 21 Jul 2023 09:21:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qMklO-0002F6-1C; Fri, 21 Jul 2023 03:41:22 -0400 Received: from smtpbg150.qq.com ([18.132.163.193]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qMklE-0004B5-BJ; Fri, 21 Jul 2023 03:41:21 -0400 X-QQ-mid: bizesmtp72t1689925100t40s55wu Received: from localhost.localdomain ( [183.211.218.24]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 21 Jul 2023 15:38:09 +0800 (CST) X-QQ-SSF: 01400000000000307000000A0000000 X-QQ-FEAT: XxEUBkUQ637FQkaMIf0yuIdnFjpC+Qyu8h77Ct/tw+Tgnc45dLsqHW2wfCvQ0 0Mao8ZLaKhhfoS0G8N9+3fKeC45CfQNsIg3je2Du3vYc12df1waC9lturnVZ5dnZDLC4Mmv v4YII90yoLxJNrYGQXEn1JdneYTelkQwiFg77iNCPhA80FFywVeJ+cqdXTfzN8zdOwDxxNg BV5lgb3MJqzv+AZafps31XFPHhbV22P8gOoawa1JJDipoWeVOqhcm1jx1NknCNT5mcKGRcR Ub3cuvTXynoKp3hIPa5hRArxyc8h38uqG6c13rFvL3FnD64F2J6auZVsJgnjuG0GTOABDQV 3Z+cQN7dui9W8GqMkzsuFopoVsNNazjqISFy6gaOUIXkyhF4PS6PBBD+fC5EA== X-QQ-GoodBg: 2 X-BIZMAIL-ID: 18072465582763847322 From: jianchunfu To: danielhb413@gmail.com, clg@kaod.org, david@gibson.dropbear.id.au, groug@kaod.org, npiggin@gmail.com, pbonzini@redhat.com Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, jianchunfu Subject: [PATCH] target/ppc: Fix the order of kvm_enable judgment about kvmppc_set_interrupt() Date: Fri, 21 Jul 2023 15:37:34 +0800 Message-Id: <20230721073734.219027-1-chunfu.jian@shingroup.cn> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:shingroup.cn:qybglogicsvrgz:qybglogicsvrgz5a-1 Received-SPF: pass client-ip=18.132.163.193; envelope-from=chunfu.jian@shingroup.cn; helo=smtpbg150.qq.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 21 Jul 2023 09:21:18 -0400 X-BeenThere: qemu-ppc@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org It's unnecessary for non-KVM accelerators(TCG, for example), to call this function, so change the order of kvm_enable() judgment. The static inline function that returns -1 directly does not work in TCG's situation. Signed-off-by: jianchunfu Tested-by: Gautam Menghani --- hw/ppc/ppc.c | 8 ++++++-- target/ppc/kvm.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 0e0a3d93c3..3e96b24487 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -58,7 +58,9 @@ void ppc_set_irq(PowerPCCPU *cpu, int irq, int level) if (old_pending != env->pending_interrupts) { ppc_maybe_interrupt(env); - kvmppc_set_interrupt(cpu, irq, level); + if (kvm_enabled()) { + kvmppc_set_interrupt(cpu, irq, level); + } } trace_ppc_irq_set_exit(env, irq, level, env->pending_interrupts, @@ -1465,5 +1467,7 @@ void ppc_irq_reset(PowerPCCPU *cpu) CPUPPCState *env = &cpu->env; env->irq_input_state = 0; - kvmppc_set_interrupt(cpu, PPC_INTERRUPT_EXT, 0); + if (kvm_enabled()) { + kvmppc_set_interrupt(cpu, PPC_INTERRUPT_EXT, 0); + } } diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index a8a935e267..11a1fbc244 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -1315,7 +1315,7 @@ int kvmppc_set_interrupt(PowerPCCPU *cpu, int irq, int level) return 0; } - if (!kvm_enabled() || !cap_interrupt_unset) { + if (!cap_interrupt_unset) { return 0; }