accel: remove unnecessary #ifdefs
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Paolo Bonzini committed
Jun 25, 2026 at 19:35 UTC
ee318718853ee2134457b1b42cd3f5e0cd350622
2 files changed
+1
-14
accel/accel-irq.c
-14
@@ -19,11 +19,9 @@
19
20
int accel_irqchip_add_msi_route(AccelRouteChange *c, int vector, PCIDevice *dev)
21
{
22
-#ifdef CONFIG_MSHV_IS_POSSIBLE
22
if (mshv_msi_via_irqfd_enabled()) {
23
return mshv_irqchip_add_msi_route(c, vector, dev);
24
}
26
-#endif
25
if (kvm_enabled()) {
26
return kvm_irqchip_add_msi_route(c, vector, dev);
27
}
@@ -32,11 +30,9 @@ int accel_irqchip_add_msi_route(AccelRouteChange *c, int vector, PCIDevice *dev)
30
31
int accel_irqchip_update_msi_route(int vector, MSIMessage msg, PCIDevice *dev)
32
{
35
-#ifdef CONFIG_MSHV_IS_POSSIBLE
33
if (mshv_msi_via_irqfd_enabled()) {
34
return mshv_irqchip_update_msi_route(vector, msg, dev);
35
}
39
-#endif
36
if (kvm_enabled()) {
37
return kvm_irqchip_update_msi_route(kvm_state, vector, msg, dev);
38
}
@@ -53,11 +49,9 @@ void accel_irqchip_commit_route_changes(AccelRouteChange *c)
49
50
void accel_irqchip_commit_routes(void)
51
{
56
-#ifdef CONFIG_MSHV_IS_POSSIBLE
52
if (mshv_msi_via_irqfd_enabled()) {
53
mshv_irqchip_commit_routes(mshv_state);
54
}
60
-#endif
55
if (kvm_enabled()) {
56
kvm_irqchip_commit_routes(kvm_state);
57
}
@@ -65,11 +59,9 @@ void accel_irqchip_commit_routes(void)
59
60
void accel_irqchip_release_virq(int virq)
61
{
68
-#ifdef CONFIG_MSHV_IS_POSSIBLE
62
if (mshv_msi_via_irqfd_enabled()) {
63
mshv_irqchip_release_virq(mshv_state, virq);
64
}
72
-#endif
65
if (kvm_enabled()) {
66
kvm_irqchip_release_virq(kvm_state, virq);
67
}
@@ -78,11 +70,9 @@ void accel_irqchip_release_virq(int virq)
70
int accel_irqchip_add_irqfd_notifier_gsi(EventNotifier *n, EventNotifier *rn,
71
int virq)
72
{
81
-#ifdef CONFIG_MSHV_IS_POSSIBLE
73
if (mshv_msi_via_irqfd_enabled()) {
74
return mshv_irqchip_add_irqfd_notifier_gsi(n, rn, virq);
75
}
85
-#endif
76
if (kvm_enabled()) {
77
return kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, n, rn, virq);
78
}
@@ -91,11 +81,9 @@ int accel_irqchip_add_irqfd_notifier_gsi(EventNotifier *n, EventNotifier *rn,
81
82
int accel_irqchip_remove_irqfd_notifier_gsi(EventNotifier *n, int virq)
83
{
94
-#ifdef CONFIG_MSHV_IS_POSSIBLE
84
if (mshv_msi_via_irqfd_enabled()) {
85
return mshv_irqchip_remove_irqfd_notifier_gsi(n, virq);
86
}
98
-#endif
87
if (kvm_enabled()) {
88
return kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, n, virq);
89
}
@@ -104,14 +92,12 @@ int accel_irqchip_remove_irqfd_notifier_gsi(EventNotifier *n, int virq)
92
93
inline AccelRouteChange accel_irqchip_begin_route_changes(void)
94
{
107
-#ifdef CONFIG_MSHV_IS_POSSIBLE
95
if (mshv_msi_via_irqfd_enabled()) {
96
return (AccelRouteChange) {
97
.accel = ACCEL(mshv_state),
98
.changes = 0,
99
};
100
}
114
-#endif
101
if (kvm_enabled()) {
102
return (AccelRouteChange) {
103
.accel = ACCEL(kvm_state),
accel/stubs/mshv-stub.c
+1
@@ -13,6 +13,7 @@
13
#include "system/mshv.h"
14
15
bool mshv_allowed;
16
+MshvState *mshv_state;
17
18
int mshv_irqchip_add_msi_route(AccelRouteChange *c, int vector, PCIDevice *dev)
19
{