Page MenuHomeFreeBSD
Files F132973624

D7129.id18175.diff
No OneTemporary
Actions

D7129.id18175.diff
View Options

Index: sys/dev/hyperv/vmbus/hv_channel.c
===================================================================
--- sys/dev/hyperv/vmbus/hv_channel.c
+++ sys/dev/hyperv/vmbus/hv_channel.c
@@ -1233,7 +1233,7 @@
* Error is ignored here; don't have much to do if error
* really happens.
*/
- hv_vmbus_child_device_register(chan);
+ vmbus_add_child(chan);
}
}
@@ -1274,7 +1274,7 @@
if (VMBUS_CHAN_ISPRIMARY(chan)) {
/* Only primary channel owns the device */
- hv_vmbus_child_device_unregister(chan);
+ vmbus_delete_child(chan);
/* NOTE: DO NOT free primary channel for now */
} else {
struct vmbus_softc *sc = chan->vmbus_sc;
@@ -1336,7 +1336,7 @@
TAILQ_REMOVE(&sc->vmbus_prichans, chan, ch_prilink);
mtx_unlock(&sc->vmbus_prichan_lock);
- hv_vmbus_child_device_unregister(chan);
+ vmbus_delete_child(chan);
vmbus_chan_free(chan);
mtx_lock(&sc->vmbus_prichan_lock);
Index: sys/dev/hyperv/vmbus/hv_vmbus_priv.h
===================================================================
--- sys/dev/hyperv/vmbus/hv_vmbus_priv.h
+++ sys/dev/hyperv/vmbus/hv_vmbus_priv.h
@@ -123,9 +123,4 @@
uint32_t hv_ring_buffer_read_end(
hv_vmbus_ring_buffer_info *ring_info);
-int hv_vmbus_child_device_register(
- struct hv_vmbus_channel *chan);
-int hv_vmbus_child_device_unregister(
- struct hv_vmbus_channel *chan);
-
#endif /* __HYPERV_PRIV_H__ */
Index: sys/dev/hyperv/vmbus/vmbus.c
===================================================================
--- sys/dev/hyperv/vmbus/vmbus.c
+++ sys/dev/hyperv/vmbus/vmbus.c
@@ -1021,7 +1021,7 @@
}
int
-hv_vmbus_child_device_register(struct hv_vmbus_channel *chan)
+vmbus_add_child(struct hv_vmbus_channel *chan)
{
struct vmbus_softc *sc = chan->vmbus_sc;
device_t parent = sc->vmbus_dev;
@@ -1046,7 +1046,7 @@
}
int
-hv_vmbus_child_device_unregister(struct hv_vmbus_channel *chan)
+vmbus_delete_child(struct hv_vmbus_channel *chan)
{
int error;
Index: sys/dev/hyperv/vmbus/vmbus_var.h
===================================================================
--- sys/dev/hyperv/vmbus/vmbus_var.h
+++ sys/dev/hyperv/vmbus/vmbus_var.h
@@ -146,6 +146,8 @@
void vmbus_event_proc(struct vmbus_softc *, int);
void vmbus_event_proc_compat(struct vmbus_softc *, int);
void vmbus_handle_intr(struct trapframe *);
+int vmbus_add_child(struct hv_vmbus_channel *);
+int vmbus_delete_child(struct hv_vmbus_channel *);
void vmbus_et_intr(struct trapframe *);

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 22, 5:29 PM (5 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24061582
Default Alt Text
D7129.id18175.diff (2 KB)

Event Timeline