[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 04/34] hyperv: synic: only setup ack notifier if
From: |
Roman Kagan |
Subject: |
[Qemu-devel] [RFC PATCH 04/34] hyperv: synic: only setup ack notifier if there's a callback |
Date: |
Tue, 6 Feb 2018 23:30:18 +0300 |
There's no point setting up an sint ack notifier if no callback is
specified.
Signed-off-by: Roman Kagan <address@hidden>
---
target/i386/hyperv.c | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/target/i386/hyperv.c b/target/i386/hyperv.c
index e762eac79f..f3ffafa4e9 100644
--- a/target/i386/hyperv.c
+++ b/target/i386/hyperv.c
@@ -77,15 +77,14 @@ static void kvm_hv_sint_ack_handler(EventNotifier *notifier)
HvSintRoute *sint_route = container_of(notifier, HvSintRoute,
sint_ack_notifier);
event_notifier_test_and_clear(notifier);
- if (sint_route->sint_ack_clb) {
- sint_route->sint_ack_clb(sint_route);
- }
+ sint_route->sint_ack_clb(sint_route);
}
HvSintRoute *kvm_hv_sint_route_create(uint32_t vp_index, uint32_t sint,
HvSintAckClb sint_ack_clb)
{
HvSintRoute *sint_route;
+ EventNotifier *ack_notifier;
int r, gsi;
sint_route = g_new0(HvSintRoute, 1);
@@ -94,13 +93,15 @@ HvSintRoute *kvm_hv_sint_route_create(uint32_t vp_index,
uint32_t sint,
goto err;
}
- r = event_notifier_init(&sint_route->sint_ack_notifier, false);
- if (r) {
- goto err_sint_set_notifier;
- }
+ ack_notifier = sint_ack_clb ? &sint_route->sint_ack_notifier : NULL;
+ if (ack_notifier) {
+ r = event_notifier_init(ack_notifier, false);
+ if (r) {
+ goto err_sint_set_notifier;
+ }
- event_notifier_set_handler(&sint_route->sint_ack_notifier,
- kvm_hv_sint_ack_handler);
+ event_notifier_set_handler(ack_notifier, kvm_hv_sint_ack_handler);
+ }
gsi = kvm_irqchip_add_hv_sint_route(kvm_state, vp_index, sint);
if (gsi < 0) {
@@ -109,7 +110,7 @@ HvSintRoute *kvm_hv_sint_route_create(uint32_t vp_index,
uint32_t sint,
r = kvm_irqchip_add_irqfd_notifier_gsi(kvm_state,
&sint_route->sint_set_notifier,
- &sint_route->sint_ack_notifier,
gsi);
+ ack_notifier, gsi);
if (r) {
goto err_irqfd;
}
@@ -123,8 +124,10 @@ HvSintRoute *kvm_hv_sint_route_create(uint32_t vp_index,
uint32_t sint,
err_irqfd:
kvm_irqchip_release_virq(kvm_state, gsi);
err_gsi:
- event_notifier_set_handler(&sint_route->sint_ack_notifier, NULL);
- event_notifier_cleanup(&sint_route->sint_ack_notifier);
+ if (ack_notifier) {
+ event_notifier_set_handler(ack_notifier, NULL);
+ event_notifier_cleanup(ack_notifier);
+ }
err_sint_set_notifier:
event_notifier_cleanup(&sint_route->sint_set_notifier);
err:
@@ -139,8 +142,10 @@ void kvm_hv_sint_route_destroy(HvSintRoute *sint_route)
&sint_route->sint_set_notifier,
sint_route->gsi);
kvm_irqchip_release_virq(kvm_state, sint_route->gsi);
- event_notifier_set_handler(&sint_route->sint_ack_notifier, NULL);
- event_notifier_cleanup(&sint_route->sint_ack_notifier);
+ if (sint_route->sint_ack_clb) {
+ event_notifier_set_handler(&sint_route->sint_ack_notifier, NULL);
+ event_notifier_cleanup(&sint_route->sint_ack_notifier);
+ }
event_notifier_cleanup(&sint_route->sint_set_notifier);
g_free(sint_route);
}
--
2.14.3
- [Qemu-devel] [RFC PATCH 00/34] Hyper-V / VMBus, Roman Kagan, 2018/02/06
- [Qemu-devel] [RFC PATCH 01/34] hyperv: ensure VP index equal to QEMU cpu_index, Roman Kagan, 2018/02/06
- [Qemu-devel] [RFC PATCH 02/34] hyperv_testdev: refactor for readability, Roman Kagan, 2018/02/06
- [Qemu-devel] [RFC PATCH 03/34] hyperv: cosmetic: g_malloc -> g_new, Roman Kagan, 2018/02/06
- [Qemu-devel] [RFC PATCH 04/34] hyperv: synic: only setup ack notifier if there's a callback,
Roman Kagan <=
- [Qemu-devel] [RFC PATCH 05/34] hyperv: allow passing arbitrary data to sint ack callback, Roman Kagan, 2018/02/06
- [Qemu-devel] [RFC PATCH 06/34] hyperv: address HvSintRoute by X86CPU pointer, Roman Kagan, 2018/02/06
- [Qemu-devel] [RFC PATCH 07/34] hyperv: make HvSintRoute reference-counted, Roman Kagan, 2018/02/06
- [Qemu-devel] [RFC PATCH 08/34] hyperv: qom-ify SynIC, Roman Kagan, 2018/02/06
- [Qemu-devel] [RFC PATCH 10/34] hyperv: make overlay pages for SynIC, Roman Kagan, 2018/02/06
- [Qemu-devel] [RFC PATCH 09/34] hyperv: block SynIC use in QEMU in incompatible configurations, Roman Kagan, 2018/02/06