[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/8] hyperv: allow passing arbitrary data to sint
From: |
Roman Kagan |
Subject: |
[Qemu-devel] [PATCH v2 5/8] hyperv: allow passing arbitrary data to sint ack callback |
Date: |
Fri, 21 Sep 2018 11:18:33 +0300 |
Make sint ack callback accept an opaque pointer, that is stored on
sint_route at creation time.
This allows for more convenient interaction with the callback.
Besides, nothing outside hyperv.c should need to know the layout of
HvSintRoute fields any more so its declaration can be removed from the
header.
Signed-off-by: Roman Kagan <address@hidden>
---
target/i386/hyperv.h | 15 +++------------
hw/misc/hyperv_testdev.c | 2 +-
target/i386/hyperv.c | 16 ++++++++++++++--
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/target/i386/hyperv.h b/target/i386/hyperv.h
index 00c9b454bb..ab99047bf8 100644
--- a/target/i386/hyperv.h
+++ b/target/i386/hyperv.h
@@ -16,24 +16,15 @@
#include "cpu.h"
#include "sysemu/kvm.h"
-#include "qemu/event_notifier.h"
typedef struct HvSintRoute HvSintRoute;
-typedef void (*HvSintAckClb)(HvSintRoute *sint_route);
-
-struct HvSintRoute {
- uint32_t sint;
- uint32_t vp_index;
- int gsi;
- EventNotifier sint_set_notifier;
- EventNotifier sint_ack_notifier;
- HvSintAckClb sint_ack_clb;
-};
+typedef void (*HvSintAckClb)(void *data);
int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit);
HvSintRoute *kvm_hv_sint_route_create(uint32_t vp_index, uint32_t sint,
- HvSintAckClb sint_ack_clb);
+ HvSintAckClb sint_ack_clb,
+ void *sint_ack_clb_data);
void kvm_hv_sint_route_destroy(HvSintRoute *sint_route);
diff --git a/hw/misc/hyperv_testdev.c b/hw/misc/hyperv_testdev.c
index e1e9ad7dda..6f4fa2ab91 100644
--- a/hw/misc/hyperv_testdev.c
+++ b/hw/misc/hyperv_testdev.c
@@ -52,7 +52,7 @@ static void sint_route_create(HypervTestDev *dev,
sint_route->vp_index = vp_index;
sint_route->sint = sint;
- sint_route->sint_route = kvm_hv_sint_route_create(vp_index, sint, NULL);
+ sint_route->sint_route = kvm_hv_sint_route_create(vp_index, sint, NULL,
NULL);
assert(sint_route->sint_route);
QLIST_INSERT_HEAD(&dev->sint_routes, sint_route, le);
diff --git a/target/i386/hyperv.c b/target/i386/hyperv.c
index acdb0ca9df..11fd1add2c 100644
--- a/target/i386/hyperv.c
+++ b/target/i386/hyperv.c
@@ -16,6 +16,16 @@
#include "hyperv.h"
#include "hyperv-proto.h"
+struct HvSintRoute {
+ uint32_t sint;
+ uint32_t vp_index;
+ int gsi;
+ EventNotifier sint_set_notifier;
+ EventNotifier sint_ack_notifier;
+ HvSintAckClb sint_ack_clb;
+ void *sint_ack_clb_data;
+};
+
uint32_t hyperv_vp_index(X86CPU *cpu)
{
return CPU(cpu)->cpu_index;
@@ -77,11 +87,12 @@ 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);
- sint_route->sint_ack_clb(sint_route);
+ sint_route->sint_ack_clb(sint_route->sint_ack_clb_data);
}
HvSintRoute *kvm_hv_sint_route_create(uint32_t vp_index, uint32_t sint,
- HvSintAckClb sint_ack_clb)
+ HvSintAckClb sint_ack_clb,
+ void *sint_ack_clb_data)
{
HvSintRoute *sint_route;
EventNotifier *ack_notifier;
@@ -116,6 +127,7 @@ HvSintRoute *kvm_hv_sint_route_create(uint32_t vp_index,
uint32_t sint,
}
sint_route->gsi = gsi;
sint_route->sint_ack_clb = sint_ack_clb;
+ sint_route->sint_ack_clb_data = sint_ack_clb_data;
sint_route->vp_index = vp_index;
sint_route->sint = sint;
--
2.17.1
- [Qemu-devel] [PATCH v2 0/8] hyperv: refactor HvSintRoute management, Roman Kagan, 2018/09/21
- [Qemu-devel] [PATCH v2 2/8] hyperv_testdev: drop unnecessary includes, Roman Kagan, 2018/09/21
- [Qemu-devel] [PATCH v2 1/8] hyperv_testdev: refactor for better maintainability, Roman Kagan, 2018/09/21
- [Qemu-devel] [PATCH v2 3/8] hyperv: cosmetic: g_malloc -> g_new, Roman Kagan, 2018/09/21
- [Qemu-devel] [PATCH v2 4/8] hyperv: synic: only setup ack notifier if there's a callback, Roman Kagan, 2018/09/21
- [Qemu-devel] [PATCH v2 5/8] hyperv: allow passing arbitrary data to sint ack callback,
Roman Kagan <=
- [Qemu-devel] [PATCH v2 6/8] hyperv: address HvSintRoute by X86CPU pointer, Roman Kagan, 2018/09/21
- [Qemu-devel] [PATCH v2 8/8] hyperv: rename kvm_hv_sint_route_set_sint, Roman Kagan, 2018/09/21
- [Qemu-devel] [PATCH v2 7/8] hyperv: make HvSintRoute reference-counted, Roman Kagan, 2018/09/21