Page MenuHomeFreeBSD
Files F167707624

D7424.id19113.diff
No OneTemporary
Actions

D7424.id19113.diff
View Options

Index: head/sys/dev/hyperv/utilities/hv_heartbeat.c
===================================================================
--- head/sys/dev/hyperv/utilities/hv_heartbeat.c
+++ head/sys/dev/hyperv/utilities/hv_heartbeat.c
@@ -109,11 +109,7 @@
static int
hv_heartbeat_attach(device_t dev)
{
- hv_util_sc *softc = (hv_util_sc*)device_get_softc(dev);
-
- softc->callback = hv_heartbeat_cb;
-
- return hv_util_attach(dev);
+ return hv_util_attach(dev, hv_heartbeat_cb);
}
static device_method_t heartbeat_methods[] = {
Index: head/sys/dev/hyperv/utilities/hv_kvp.c
===================================================================
--- head/sys/dev/hyperv/utilities/hv_kvp.c
+++ head/sys/dev/hyperv/utilities/hv_kvp.c
@@ -892,7 +892,6 @@
hv_kvp_sc *sc = (hv_kvp_sc*)device_get_softc(dev);
- sc->util_sc.callback = hv_kvp_callback;
sc->dev = dev;
sema_init(&sc->dev_sema, 0, "hv_kvp device semaphore");
mtx_init(&sc->pending_mutex, "hv-kvp pending mutex",
@@ -920,7 +919,7 @@
return (error);
sc->hv_kvp_dev->si_drv1 = sc;
- return hv_util_attach(dev);
+ return hv_util_attach(dev, hv_kvp_callback);
}
static int
Index: head/sys/dev/hyperv/utilities/hv_shutdown.c
===================================================================
--- head/sys/dev/hyperv/utilities/hv_shutdown.c
+++ head/sys/dev/hyperv/utilities/hv_shutdown.c
@@ -131,11 +131,7 @@
static int
hv_shutdown_attach(device_t dev)
{
- hv_util_sc *softc = (hv_util_sc*)device_get_softc(dev);
-
- softc->callback = hv_shutdown_cb;
-
- return hv_util_attach(dev);
+ return hv_util_attach(dev, hv_shutdown_cb);
}
static device_method_t shutdown_methods[] = {
Index: head/sys/dev/hyperv/utilities/hv_timesync.c
===================================================================
--- head/sys/dev/hyperv/utilities/hv_timesync.c
+++ head/sys/dev/hyperv/utilities/hv_timesync.c
@@ -189,18 +189,16 @@
{
hv_timesync_sc *softc = device_get_softc(dev);
- softc->util_sc.callback = hv_timesync_cb;
TASK_INIT(&softc->task, 1, hv_set_host_time, softc);
-
- return hv_util_attach(dev);
+ return hv_util_attach(dev, hv_timesync_cb);
}
static int
hv_timesync_detach(device_t dev)
{
hv_timesync_sc *softc = device_get_softc(dev);
- taskqueue_drain(taskqueue_thread, &softc->task);
+ taskqueue_drain(taskqueue_thread, &softc->task);
return hv_util_detach(dev);
}
Index: head/sys/dev/hyperv/utilities/hv_util.h
===================================================================
--- head/sys/dev/hyperv/utilities/hv_util.h
+++ head/sys/dev/hyperv/utilities/hv_util.h
@@ -31,22 +31,20 @@
#ifndef _HVUTIL_H_
#define _HVUTIL_H_
+#include <dev/hyperv/include/vmbus.h>
+
/**
* hv_util related structures
*
*/
typedef struct hv_util_sc {
- /*
- * function to process Hyper-V messages
- */
- void (*callback)(struct vmbus_channel *, void *);
uint8_t *receive_buffer;
int ic_buflen;
} hv_util_sc;
void hv_negotiate_version(struct hv_vmbus_icmsg_hdr *icmsghdrp, uint8_t *buf);
-int hv_util_attach(device_t dev);
+int hv_util_attach(device_t dev, vmbus_chan_callback_t cb);
int hv_util_detach(device_t dev);
#endif
Index: head/sys/dev/hyperv/utilities/hv_util.c
===================================================================
--- head/sys/dev/hyperv/utilities/hv_util.c
+++ head/sys/dev/hyperv/utilities/hv_util.c
@@ -75,7 +75,7 @@
}
int
-hv_util_attach(device_t dev)
+hv_util_attach(device_t dev, vmbus_chan_callback_t cb)
{
struct hv_util_sc *sc = device_get_softc(dev);
struct vmbus_channel *chan = vmbus_get_channel(dev);
@@ -95,7 +95,7 @@
vmbus_chan_set_readbatch(chan, false);
error = vmbus_chan_open(chan, VMBUS_IC_BRSIZE, VMBUS_IC_BRSIZE, NULL, 0,
- sc->callback, sc);
+ cb, sc);
if (error) {
free(sc->receive_buffer, M_DEVBUF);
return (error);

File Metadata

Mime Type
text/plain
Expires
Mon, Aug 24, 9:38 PM (15 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37210124
Default Alt Text
D7424.id19113.diff (3 KB)

Event Timeline