From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D354D2F25F5 for ; Sat, 13 Jun 2026 00:04:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781309050; cv=none; b=F9Tv7WCfhigXRLhopPwDo4gF+M+04pccDEWOU+M8hPPWh6AKn3HwYBlFE2GLdsD9JioTMlzGLsbuU4PRP+YDZmJrViq8EV8PFAQOnc4qtUcVQW+OTWmPYZ0aX3ULkHORsl6cRb27TmoCblutApP/ICjeVMBKBf2FsFzPFDWpfd4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781309050; c=relaxed/simple; bh=mT9EwItzZ02BMef+DvbbUG/noR3Wy+QzQNQXEWD/4J8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ndI9bf3Z3ruXKsLE28dL1ARPmNsGIXmSUZ3XTqLexmf4ECLoyimZ+9vr9M8i2hswwcgWMr6mS+CnYnKxNyJ56CtqM/9wn+MZgTVg+tKB/Ea03vAeGAthDM9vmFKqM2l7N4HRcFT3illVmxvmYVAza2BpBnZnKFFXiJgAN+25yjc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=M70TAM8N; arc=none smtp.client-ip=209.85.215.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="M70TAM8N" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c857ebbb0easo1434950a12.1 for ; Fri, 12 Jun 2026 17:04:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781309047; x=1781913847; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=mpjRMGry4hwZ4DyBtZXDEvXArio0cItc7zSoJ7iJP1Q=; b=M70TAM8NoCLLAbtw8ub8PBbm3d/Np0HHbuXaQ6dzNeAVyto0LH63le3VZK85JxNEI2 u9BNg7B/hFEeBMYZnw6a8HsR6wg3xj9Fzw+NJ4L9857SotitEw0vqnFA6krlzqbsFqZs desbTD9W729rutsuJVG7ZdYF0acCJpbOl1Mx1UpJsb+Ft6qW61oJ+WCAyGE5aS33kLW7 vbXqkOqVIj3mQaZ7+2Nqh52Ve4H4mCLa7O4EJfmzANTO0TVTPeH5sglzLg/F1cN4164i TLiOeZBMNdxUh/Rb/eTeAJbyJavVdDvP7uqnBX7IFiOiedA77oW19Azblljfj9c051Bf t85A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781309047; x=1781913847; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=mpjRMGry4hwZ4DyBtZXDEvXArio0cItc7zSoJ7iJP1Q=; b=aczeyGSFd33CAipxHYSE4roQ+ynji/oViHPdB/J6FnldyZjYHFsW7aUVJv6bKgT+I/ mH90tyXJfUY6frRzh0zJ2edi3Ktp7CEd4LIS61QVWt+y360pTXoXxd1/rEkM1+iQIxk0 X2/omtfiaNtRuEq52IupvX4+I5d64LriL3ov+G6Ql7OncP+IeJjyECJzUgzpz3b9m3t4 kJieY9EzJPUhjnUlkQWkbR9Ir46o4F7/RgL5Jj3ewxZmKeTnHGMOkLF6sLa9EJlmbG2g uGy7+BR+UrZgSudH0KJuYLyIMxPWzfKWGC6BdsUOboo4T4+dccv4WkimVczef3fqzweE JnhA== X-Forwarded-Encrypted: i=1; AFNElJ/eQ7O+3cNCVTf1Mg59cONdd7JWCTmzEjOy0dPPc/Cthu6KBAy2TpAzP6RVOZtn+tcn+vBDWdzRYqD7xSw=@vger.kernel.org X-Gm-Message-State: AOJu0Yz7K5amscd0EGJpt0s9u5qzu3qVT5I/1LRBMFj/PF6ftiYYX3VL 5tpNxgzRv7ScqPcnBKLgdJ1U6ZfnAnsCU553ndnPU509YvRbcsjit1Mo36vAGxg3eihQdJNWmFd r69iaZQ== X-Received: from pfbkm55.prod.google.com ([2002:a05:6a00:3c77:b0:842:3c77:598c]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:4321:b0:3b3:23b4:6950 with SMTP id adf61e73a8af0-3b78583188fmr4591909637.18.1781309046836; Fri, 12 Jun 2026 17:04:06 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 Jun 2026 17:03:22 -0700 In-Reply-To: <20260613000329.732085-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260613000329.732085-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260613000329.732085-24-seanjc@google.com> Subject: [PATCH v4 23/30] KVM: x86: Move __kvm_irq_line_state() from kvm_host.h => ioapic.h From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed , Kai Huang Content-Type: text/plain; charset="UTF-8" Bury __kvm_irq_line_state() in CONFIG_KVM_IOAPIC=y code, as it's only used by PIC and I/O APIC code. No functional change intended. Reviewed-by: Yosry Ahmed Reviewed-by: Kai Huang Signed-off-by: Sean Christopherson --- arch/x86/include/asm/kvm_host.h | 12 ------------ arch/x86/kvm/ioapic.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 72f8f8933ab7..2b96ab0f46f9 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2253,18 +2253,6 @@ static inline void kvm_inject_emulated_page_fault(struct kvm_vcpu *vcpu, bool kvm_require_dr(struct kvm_vcpu *vcpu, int dr); -static inline int __kvm_irq_line_state(unsigned long *irq_state, - int irq_source_id, int level) -{ - /* Logical OR for level trig interrupt */ - if (level) - __set_bit(irq_source_id, irq_state); - else - __clear_bit(irq_source_id, irq_state); - - return !!(*irq_state); -} - void kvm_inject_nmi(struct kvm_vcpu *vcpu); int kvm_get_nr_pending_nmis(struct kvm_vcpu *vcpu); diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h index 3dadae093690..81b576513116 100644 --- a/arch/x86/kvm/ioapic.h +++ b/arch/x86/kvm/ioapic.h @@ -113,6 +113,18 @@ void kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state); void kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state); void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, ulong *ioapic_handled_vectors); + +static inline int __kvm_irq_line_state(unsigned long *irq_state, + int irq_source_id, int level) +{ + /* Logical OR for level trig interrupt */ + if (level) + __set_bit(irq_source_id, irq_state); + else + __clear_bit(irq_source_id, irq_state); + + return !!(*irq_state); +} #endif /* CONFIG_KVM_IOAPIC */ static inline int ioapic_in_kernel(struct kvm *kvm) -- 2.54.0.1136.gdb2ca164c4-goog