From nobody Fri Oct 3 20:25:50 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 161ED23ABB2 for ; Wed, 11 Jun 2025 21:36:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749677767; cv=none; b=Jx5pSPx7Neqq6piMCc1rzyhr2ccawqOILfKE3H6COWCveW6LJ9Tin4NnNqGRBRjrUmRcB0uba507EgsRqijyaIygcK6cD9jvVwXlNGem5eNPGE+JZJmTQTPmHosRpNi0h3m0mnl/cStXWKgzqDXFEXCPsehjZ5x+GMcF8bO5ypw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749677767; c=relaxed/simple; bh=sQoc0mSFqSf4AmjsbAJoaKmVVcniW3l9UwXr/qlENo8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=D/+8bUqSM6NDbVVyV6dlYYYTCvY+cZeGZXth8DaBRT/DwCaQM1vSMTXfrd0fJ8zyM36Y1jiWMo8G2P0pDqy1c84LPOncd/p772/jcquZKNy6KP1FP51Be82Um3YhoqM4ZBJo2Z3q0QEZ/qqLO4ryE3pmR2QBIOpBAsXeUnuCvds= 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=umjqxFj8; arc=none smtp.client-ip=209.85.216.73 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="umjqxFj8" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-311a6b43ed7so270561a91.1 for ; Wed, 11 Jun 2025 14:36:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749677765; x=1750282565; 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=03EsK0XCZQ7bSC/xx33gLkDKNm/oHdhWEdLJr87/zMc=; b=umjqxFj8xH/5UrRhciOwT3OvmX5mXzyHuDuxd3TODhCkPS/1nZnMje8n7eznVwNea/ 3ZKtQsZPr/Dei7QY2uYn42wqI4pEsXEy2xUT38pL+jwFQwwweu8tffnhvUmRB3w+0kHH okXLoD7tLKio1Jf815r2oOyy0fAAxTzFejmyyddLOYsioCql/UPAxwrNrZuix6yWKZVD 2enH37jToKlTDVGv1WDGYjljX4i8CQWHM/5Szq2zlr0e+GP1fcxjosCH2cWOMKvIfdxw VZ8DLHmbWKvWI0uTXbz2S050zF0l2BB3ETgPcdsY57ZfMTpwqsRNI7GVuAlXV0cr0M/Z Ziew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749677765; x=1750282565; 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=03EsK0XCZQ7bSC/xx33gLkDKNm/oHdhWEdLJr87/zMc=; b=jvysINlf1kiN7LswOfpgbtHC/24KZ3ILJ2O5oNqQp54WJ99xTpM1aKHAMKdCgspYBm QI7mp2+mxT2U7cStdUs3jQ3eyt/lnYPHvfHsXFSvxtzYBuqH0DZpG3avolR3J4Atecv2 ldmtI10UVJGYJOGcuJXOKorPyU3QEywfxRpydMfM24JW3n1CUyBIp/iz+0GlxDlvqupv w/iuEXBm6Prrv4kmj5IQfkT1VCTxXu8/kq3agaOAZq1ZexiDfCZkQsNqQSLMJJHMNtXj wQKX9TAwMYWiANWeAoDmUZvQRiozoe456qzIl/CJLoB1o4ADfKK+vAS54LBdj+6tYvho MhjQ== X-Forwarded-Encrypted: i=1; AJvYcCUsdoxua5tXZLgUUkTndX6HSHKZxOnfes5EpT9cSSYv78hvEtKgvT60di3w4KIKiczpd/fNQqn3ferN9X4=@vger.kernel.org X-Gm-Message-State: AOJu0YwoZbTKn8PncJe/IrWMNUxTnDfdy77fxDzA/FPPbj0xG5yt6KNu IJe8rIhJdgUvGZyeu8VD+kDC6TLRgjrqvrDS4A5gcB+9DRmdEjpHIdWkej2GshAG0Bz3QMLq4Kg 6l8pe6A== X-Google-Smtp-Source: AGHT+IENVmaNV+oSCi8pwtRJAQTeKuH5EAR+8VPfi82j/imfQfOzPW98WiMDU7ChOjR3QLEwXXUc68+xHjA= X-Received: from pjbqi5.prod.google.com ([2002:a17:90b:2745:b0:30a:31eb:ec8e]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:e70d:b0:311:df4b:4b8a with SMTP id 98e67ed59e1d1-313c068ac96mr830545a91.3.1749677765181; Wed, 11 Jun 2025 14:36:05 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 11 Jun 2025 14:35:42 -0700 In-Reply-To: <20250611213557.294358-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: <20250611213557.294358-1-seanjc@google.com> X-Mailer: git-send-email 2.50.0.rc1.591.g9c95f17f64-goog Message-ID: <20250611213557.294358-4-seanjc@google.com> Subject: [PATCH v2 03/18] KVM: x86: Drop superfluous kvm_set_ioapic_irq() => kvm_ioapic_set_irq() wrapper From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Kai Huang Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Drop the superfluous and confusing kvm_set_ioapic_irq() and instead wire up ->set() directly to its final destination. No functional change intended. Acked-by: Kai Huang Signed-off-by: Sean Christopherson --- arch/x86/kvm/ioapic.c | 6 ++++-- arch/x86/kvm/ioapic.h | 5 +++-- arch/x86/kvm/irq_comm.c | 11 +---------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c index 45dae2d5d2f1..8c8a8062eb19 100644 --- a/arch/x86/kvm/ioapic.c +++ b/arch/x86/kvm/ioapic.c @@ -479,9 +479,11 @@ static int ioapic_service(struct kvm_ioapic *ioapic, i= nt irq, bool line_status) return ret; } =20 -int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int irq_source_= id, - int level, bool line_status) +int kvm_ioapic_set_irq(struct kvm_kernel_irq_routing_entry *e, struct kvm = *kvm, + int irq_source_id, int level, bool line_status) { + struct kvm_ioapic *ioapic =3D kvm->arch.vioapic; + int irq =3D e->irqchip.pin; int ret, irq_level; =20 BUG_ON(irq < 0 || irq >=3D IOAPIC_NUM_PINS); diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h index aa8cb4ac0479..a86f59bbea44 100644 --- a/arch/x86/kvm/ioapic.h +++ b/arch/x86/kvm/ioapic.h @@ -111,8 +111,9 @@ void kvm_ioapic_update_eoi(struct kvm_vcpu *vcpu, int v= ector, int trigger_mode); int kvm_ioapic_init(struct kvm *kvm); void kvm_ioapic_destroy(struct kvm *kvm); -int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int irq_source_= id, - int level, bool line_status); +int kvm_ioapic_set_irq(struct kvm_kernel_irq_routing_entry *e, struct kvm = *kvm, + int irq_source_id, int level, bool line_status); + void kvm_ioapic_clear_all(struct kvm_ioapic *ioapic, int irq_source_id); void kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state); void kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state); diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c index 64f352e7bcb0..8dcb6a555902 100644 --- a/arch/x86/kvm/irq_comm.c +++ b/arch/x86/kvm/irq_comm.c @@ -27,15 +27,6 @@ #include "x86.h" #include "xen.h" =20 -static int kvm_set_ioapic_irq(struct kvm_kernel_irq_routing_entry *e, - struct kvm *kvm, int irq_source_id, int level, - bool line_status) -{ - struct kvm_ioapic *ioapic =3D kvm->arch.vioapic; - return kvm_ioapic_set_irq(ioapic, e->irqchip.pin, irq_source_id, level, - line_status); -} - int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, struct kvm_lapic_irq *irq, struct dest_map *dest_map) { @@ -293,7 +284,7 @@ int kvm_set_routing_entry(struct kvm *kvm, case KVM_IRQCHIP_IOAPIC: if (ue->u.irqchip.pin >=3D KVM_IOAPIC_NUM_PINS) return -EINVAL; - e->set =3D kvm_set_ioapic_irq; + e->set =3D kvm_ioapic_set_irq; break; default: return -EINVAL; --=20 2.50.0.rc1.591.g9c95f17f64-goog