[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 10/12] x86/irq: drop return value from hvm_ioapic_assert
- To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
- Date: Tue, 20 Apr 2021 16:07:21 +0200
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/8G6ZphiMwjkLCnh/B+N1lg5s23KSmnn5KG1LwIN6mo=; b=oOpWZDQ5Txt/jQ6LUxPL1ulf/uUzALQKZkkrvtmnj/cfgjHMhGvr4J0V/Kf3LzWuOMplwxqP3+0HJ1FfRIP2eoOxiWmhbFmzc73BSRDTrfKRg6sgl5cpTZ+CJt1NJqFjDF/BUuNUL52ulIi93BWZZAiF2HdHwEmRtQFlB74tm/ZFkQDa2QjRHqwD6BvhElER3QvZ1OYSfPouY+IT4531m9B2hLpiL8HkBPA77QiWTZDvFTBFdske28+W0WuB+AuKwAy1Xe7mhThv1zPvY6d0W7xW/yhO+G++IOYP1GvPTbqkQgvYrl4prIxHcHtP9qFljJpfqBNZ0FU5smowNs2pQg==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=njg1+i2ZTvkXEpkBMEL9xAtNWk3HTTXOh7kGvvpPWR3jT1rk+AsTeZfrCvyMWh/Eb2dhgP5XD5nJXCdbCo7NuDK1X8gpnrO0AahVnpkNLeOGBLH2SWGjLnCuBFrZp3DmZgXsyrRRuzHsVtDINz9BydBgK37CN4+SjotINOwZf5zumGADZzOJbrT36d4dkG8J1DDitgW1XE4WiImwLi9q+sGeaj8yq6MD9TMeEIHWU5ef0nDf/0QLmPMDNfNkMU47nr3ejBbDnKexXhzWNUKLnc2eMh4ltNOVpy0O8TVmJu8UN405gN3WnCBMduH3Bwm4pbbxfQGC+jwSLTC/pjXcNg==
- Authentication-results: esa2.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com
- Cc: Roger Pau Monne <roger.pau@xxxxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Tue, 20 Apr 2021 14:14:54 +0000
- Ironport-hdrordr: A9a23:/yCU7q2NXLufcIbxjpmRQwqjBWhyeYIsi2QD101hICF9WtCEls yogfQQ3QL1jjFUY307hdWcIsC7LE/035hz/IUXIPOeTBDr0VHYSb1KwKnD53nbGyP4/vNAzq sIScJDIfD5EFQSt6nHySaiFdJI+re62YSJocub8Ht3VwFtbMhbnmVEIyKWCFd/SgUDJbdRLv qhz/FKrTahZngbB/7TbhU4dtPOusHRk9beaQMGbiRN1CC1kTiq5LTmeiLovSs2bjUn+9Yf2F mAqSPVzOGJs/a3yhjTvlWjlah+qZ/a5fZoQOCJgsgRAD3whgivf5QJYcz+gBkF5NuBxXxvvN 7QowoxH8kb0QKsQkiF5SHD9iOl8DEy52TswVWV6EGT3vDRdXYBJOdqwad6GyGpj3YIjZVH/4 9gm1+9jd5xCyjNmSzsjuK4Ly1Cpw6PjlcJ1dIIg2c3a/p4VJZh6bYx0WlyC5k6ECfz+OkcYZ JTJfCZ3vpQfF+ABkqp2FVH8ZipVnQ3KB+MXlIPjMyTyyRXh3B01SIjtbUioks=
- Ironport-sdr: Wpx9aLvW0BGxBvCyrN1RMQg0zwqNHwOZN+CS7E4WCV3wl+ZIqT6SExzetTAnrXVVTAxaUrXIN2 jRsA7Znf3E6DIy2Lk1u9jkyt7R4xe/ZfQnFCpjbxmJp1Ev9ITkqpL5vrz6lDqoBgfVbVcapUdQ jjf7dkZMEf0lwwcY0aB+ztX/WSeK1kv7iS7/aJuvLDBZMF7NzKFDf6uKTFYxj+dI24j7MpKeY5 XcdMHxsk5EqVgEOCrKf6sXFUOzmzyI+lA5nj6LTcADBRqe9dwsamNfVnjNf6m1eP2FxfcGTprl x00=
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
There's no caller anymore that cares about the injected vector, so
drop the returned vector from the function.
No functional change indented.
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
Changes since v3:
- New in this version.
---
xen/arch/x86/hvm/irq.c | 8 ++------
xen/include/asm-x86/hvm/irq.h | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c
index c3d8f2a786a..1c588e212f9 100644
--- a/xen/arch/x86/hvm/irq.c
+++ b/xen/arch/x86/hvm/irq.c
@@ -47,24 +47,20 @@ static void assert_gsi(struct domain *d, unsigned
ioapic_gsi)
vioapic_irq_positive_edge(d, ioapic_gsi);
}
-int hvm_ioapic_assert(struct domain *d, unsigned int gsi, bool level)
+void hvm_ioapic_assert(struct domain *d, unsigned int gsi, bool level)
{
struct hvm_irq *hvm_irq = hvm_domain_irq(d);
- int vector;
if ( gsi >= hvm_irq->nr_gsis )
{
ASSERT_UNREACHABLE();
- return -1;
+ return;
}
spin_lock(&d->arch.hvm.irq_lock);
if ( !level || hvm_irq->gsi_assert_count[gsi]++ == 0 )
assert_gsi(d, gsi);
- vector = vioapic_get_vector(d, gsi);
spin_unlock(&d->arch.hvm.irq_lock);
-
- return vector;
}
void hvm_ioapic_deassert(struct domain *d, unsigned int gsi)
diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h
index 4e3534d4eb4..fda2f8e8ebf 100644
--- a/xen/include/asm-x86/hvm/irq.h
+++ b/xen/include/asm-x86/hvm/irq.h
@@ -226,7 +226,7 @@ int hvm_set_pci_link_route(struct domain *d, u8 link, u8
isa_irq);
int hvm_inject_msi(struct domain *d, uint64_t addr, uint32_t data);
/* Assert/deassert an IO APIC pin. */
-int hvm_ioapic_assert(struct domain *d, unsigned int gsi, bool level);
+void hvm_ioapic_assert(struct domain *d, unsigned int gsi, bool level);
void hvm_ioapic_deassert(struct domain *d, unsigned int gsi);
void hvm_maybe_deassert_evtchn_irq(void);
--
2.30.1
|
