Page MenuHomeFreeBSD

D6976.diff
No OneTemporary

D6976.diff

Index: head/sys/dev/hyperv/vmbus/hv_channel.c
===================================================================
--- head/sys/dev/hyperv/vmbus/hv_channel.c
+++ head/sys/dev/hyperv/vmbus/hv_channel.c
@@ -423,6 +423,11 @@
device_printf(sc->vmbus_dev, "gpadl->chan%u failed: "
"status %u\n", channel->offer_msg.child_rel_id, status);
return EIO;
+ } else {
+ if (bootverbose) {
+ device_printf(sc->vmbus_dev, "gpadl->chan%u "
+ "succeeded\n", channel->offer_msg.child_rel_id);
+ }
}
return 0;
}
Index: head/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
===================================================================
--- head/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
+++ head/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
@@ -142,6 +142,19 @@
}
mtx_unlock(&sc->vmbus_chlist_lock);
+ if (bootverbose) {
+ char logstr[64];
+
+ logstr[0] = '\0';
+ if (channel != NULL) {
+ snprintf(logstr, sizeof(logstr), ", primary chan%u",
+ channel->offer_msg.child_rel_id);
+ }
+ device_printf(sc->vmbus_dev, "chan%u subchanid%u offer%s\n",
+ new_channel->offer_msg.child_rel_id,
+ new_channel->offer_msg.offer.sub_channel_index, logstr);
+ }
+
if (channel != NULL) {
/*
* Check if this is a sub channel.
@@ -157,13 +170,6 @@
new_channel, sc_list_entry);
mtx_unlock(&channel->sc_lock);
- if (bootverbose) {
- printf("VMBUS get multi-channel offer, "
- "rel=%u, sub=%u\n",
- new_channel->offer_msg.child_rel_id,
- new_channel->offer_msg.offer.sub_channel_index);
- }
-
/*
* Insert the new channel to the end of the global
* channel list.
@@ -178,11 +184,6 @@
ch_link);
mtx_unlock(&sc->vmbus_chlist_lock);
- if(bootverbose)
- printf("VMBUS: new multi-channel offer <%p>, "
- "its primary channel is <%p>.\n",
- new_channel, new_channel->primary_channel);
-
new_channel->state = HV_CHANNEL_OPEN_STATE;
/*
@@ -345,6 +346,10 @@
hv_vmbus_channel* channel;
rescind = (const hv_vmbus_channel_rescind_offer *)msg->msg_data;
+ if (bootverbose) {
+ device_printf(sc->vmbus_dev, "chan%u rescind\n",
+ rescind->child_rel_id);
+ }
channel = hv_vmbus_g_connection.channels[rescind->child_rel_id];
if (channel == NULL)

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 5, 2:03 PM (20 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16993967
Default Alt Text
D6976.diff (2 KB)

Event Timeline