Page MenuHomeFreeBSD
Files F168333622

D6919.id17755.diff
No OneTemporary
Actions

D6919.id17755.diff
View Options

Index: sys/dev/hyperv/vmbus/vmbus.c
===================================================================
--- sys/dev/hyperv/vmbus/vmbus.c
+++ sys/dev/hyperv/vmbus/vmbus.c
@@ -90,10 +90,9 @@
#define VMBUS_MSGHC_CTXF_DESTROY 0x0001
static int vmbus_init(struct vmbus_softc *);
-static int vmbus_init_contact(struct vmbus_softc *,
- uint32_t);
+static int vmbus_connect(struct vmbus_softc *, uint32_t);
static int vmbus_req_channels(struct vmbus_softc *sc);
-static void vmbus_uninit(struct vmbus_softc *);
+static void vmbus_disconnect(struct vmbus_softc *);
static int vmbus_scan(struct vmbus_softc *);
static void vmbus_scan_wait(struct vmbus_softc *);
static void vmbus_scan_newdev(struct vmbus_softc *);
@@ -373,20 +372,19 @@
}
static int
-vmbus_init_contact(struct vmbus_softc *sc, uint32_t version)
+vmbus_connect(struct vmbus_softc *sc, uint32_t version)
{
- struct vmbus_chanmsg_init_contact *req;
- const struct vmbus_chanmsg_version_resp *resp;
+ struct vmbus_chanmsg_connect *req;
const struct vmbus_message *msg;
struct vmbus_msghc *mh;
- int error, supp = 0;
+ int error, done = 0;
mh = vmbus_msghc_get(sc, sizeof(*req));
if (mh == NULL)
return ENXIO;
req = vmbus_msghc_dataptr(mh);
- req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_INIT_CONTACT;
+ req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_CONNECT;
req->chm_ver = version;
req->chm_evtflags = sc->vmbus_evtflags_dma.hv_paddr;
req->chm_mnf1 = sc->vmbus_mnf1_dma.hv_paddr;
@@ -399,12 +397,12 @@
}
msg = vmbus_msghc_wait_result(sc, mh);
- resp = (const struct vmbus_chanmsg_version_resp *)msg->msg_data;
- supp = resp->chm_supp;
+ done = ((const struct vmbus_chanmsg_connect_resp *)
+ msg->msg_data)->chm_done;
vmbus_msghc_put(sc, mh);
- return (supp ? 0 : EOPNOTSUPP);
+ return (done ? 0 : EOPNOTSUPP);
}
static int
@@ -415,7 +413,7 @@
for (i = 0; i < nitems(vmbus_version); ++i) {
int error;
- error = vmbus_init_contact(sc, vmbus_version[i]);
+ error = vmbus_connect(sc, vmbus_version[i]);
if (!error) {
hv_vmbus_protocal_version = vmbus_version[i];
device_printf(sc->vmbus_dev, "version %u.%u\n",
@@ -428,35 +426,35 @@
}
static void
-vmbus_uninit(struct vmbus_softc *sc)
+vmbus_disconnect(struct vmbus_softc *sc)
{
- struct vmbus_chanmsg_unload *req;
+ struct vmbus_chanmsg_disconnect *req;
struct vmbus_msghc *mh;
int error;
mh = vmbus_msghc_get(sc, sizeof(*req));
if (mh == NULL) {
device_printf(sc->vmbus_dev,
- "can not get msg hypercall for unload\n");
+ "can not get msg hypercall for disconnect\n");
return;
}
req = vmbus_msghc_dataptr(mh);
- req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_UNLOAD;
+ req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_DISCONNECT;
error = vmbus_msghc_exec_noresult(mh);
vmbus_msghc_put(sc, mh);
if (error) {
device_printf(sc->vmbus_dev,
- "unload msg hypercall failed\n");
+ "disconnect msg hypercall failed\n");
}
}
static int
vmbus_req_channels(struct vmbus_softc *sc)
{
- struct vmbus_chanmsg_channel_req *req;
+ struct vmbus_chanmsg_chrequest *req;
struct vmbus_msghc *mh;
int error;
@@ -465,7 +463,7 @@
return ENXIO;
req = vmbus_msghc_dataptr(mh);
- req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_CHANNEL_REQ;
+ req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_CHREQUEST;
error = vmbus_msghc_exec_noresult(mh);
vmbus_msghc_put(sc, mh);
@@ -1247,7 +1245,7 @@
hv_vmbus_release_unattached_channels();
- vmbus_uninit(sc);
+ vmbus_disconnect(sc);
hv_vmbus_disconnect();
if (sc->vmbus_flags & VMBUS_FLAG_SYNIC) {
Index: sys/dev/hyperv/vmbus/vmbus_reg.h
===================================================================
--- sys/dev/hyperv/vmbus/vmbus_reg.h
+++ sys/dev/hyperv/vmbus/vmbus_reg.h
@@ -93,7 +93,7 @@
* - Embedded in hypercall_postmsg_in.hc_data, e.g. request.
*/
-#define VMBUS_CHANMSG_TYPE_CHANNEL_REQ 3 /* REQ */
+#define VMBUS_CHANMSG_TYPE_CHREQUEST 3 /* REQ */
#define VMBUS_CHANMSG_TYPE_CHOPEN 5 /* REQ */
#define VMBUS_CHANMSG_TYPE_CHOPEN_RESP 6 /* RESP */
#define VMBUS_CHANMSG_TYPE_CHCLOSE 7 /* REQ */
@@ -102,17 +102,17 @@
#define VMBUS_CHANMSG_TYPE_GPADL_CONNRESP 10 /* RESP */
#define VMBUS_CHANMSG_TYPE_GPADL_DISCONN 11 /* REQ */
#define VMBUS_CHANMSG_TYPE_GPADL_DISCONNRESP 12 /* RESP */
-#define VMBUS_CHANMSG_TYPE_INIT_CONTACT 14 /* REQ */
-#define VMBUS_CHANMSG_TYPE_VERSION_RESP 15 /* RESP */
-#define VMBUS_CHANMSG_TYPE_UNLOAD 16 /* REQ */
+#define VMBUS_CHANMSG_TYPE_CONNECT 14 /* REQ */
+#define VMBUS_CHANMSG_TYPE_CONNECT_RESP 15 /* RESP */
+#define VMBUS_CHANMSG_TYPE_DISCONNECT 16 /* REQ */
struct vmbus_chanmsg_hdr {
uint32_t chm_type; /* VMBUS_CHANMSG_TYPE_ */
uint32_t chm_rsvd;
} __packed;
-/* VMBUS_CHANMSG_TYPE_INIT_CONTACT */
-struct vmbus_chanmsg_init_contact {
+/* VMBUS_CHANMSG_TYPE_CONNECT */
+struct vmbus_chanmsg_connect {
struct vmbus_chanmsg_hdr chm_hdr;
uint32_t chm_ver;
uint32_t chm_rsvd;
@@ -121,19 +121,19 @@
uint64_t chm_mnf2;
} __packed;
-/* VMBUS_CHANMSG_TYPE_VERSION_RESP */
-struct vmbus_chanmsg_version_resp {
+/* VMBUS_CHANMSG_TYPE_CONNECT_RESP */
+struct vmbus_chanmsg_connect_resp {
struct vmbus_chanmsg_hdr chm_hdr;
- uint8_t chm_supp;
+ uint8_t chm_done;
} __packed;
-/* VMBUS_CHANMSG_TYPE_CHANNEL_REQ */
-struct vmbus_chanmsg_channel_req {
+/* VMBUS_CHANMSG_TYPE_CHREQUEST */
+struct vmbus_chanmsg_chrequest {
struct vmbus_chanmsg_hdr chm_hdr;
} __packed;
-/* VMBUS_CHANMSG_TYPE_UNLOAD */
-struct vmbus_chanmsg_unload {
+/* VMBUS_CHANMSG_TYPE_DISCONNECT */
+struct vmbus_chanmsg_disconnect {
struct vmbus_chanmsg_hdr chm_hdr;
} __packed;

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 28, 4:12 PM (6 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37467049
Default Alt Text
D6919.id17755.diff (5 KB)

Event Timeline