D8563.id.diff
No OneTemporary
Actions

Size

1017 B

Referenced Files

None

Subscribers

None

D8563.id.diff
View Options

	Index: head/sys/dev/hyperv/vmbus/vmbus_chan.c
	===================================================================
	--- head/sys/dev/hyperv/vmbus/vmbus_chan.c
	+++ head/sys/dev/hyperv/vmbus/vmbus_chan.c
	@@ -453,7 +453,7 @@

	failed:
	vmbus_chan_clear_chmap(chan);
	- if (chan->ch_bufring_gpadl) {
	+ if (chan->ch_bufring_gpadl != 0) {
	vmbus_chan_gpadl_disconnect(chan, chan->ch_bufring_gpadl);
	chan->ch_bufring_gpadl = 0;
	}
	@@ -500,7 +500,6 @@
	* Allocate GPADL id.
	*/
	gpadl = vmbus_gpadl_alloc(sc);
	- *gpadl0 = gpadl;

	/*
	* Connect this GPADL to the target channel.
	@@ -579,11 +578,13 @@
	vmbus_chan_printf(chan, "gpadl_conn(chan%u) failed: %u\n",
	chan->ch_id, status);
	return EIO;
	- } else {
	- if (bootverbose) {
	- vmbus_chan_printf(chan,
	- "gpadl_conn(chan%u) succeeded\n", chan->ch_id);
	- }
	+ }
	+
	+ /* Done; commit the GPADL id. */
	+ *gpadl0 = gpadl;
	+ if (bootverbose) {
	+ vmbus_chan_printf(chan, "gpadl_conn(chan%u) succeeded\n",
	+ chan->ch_id);
	}
	return 0;
	}