D29499.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D29499.id.diff
View Options

	diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c
	--- a/sys/x86/xen/xen_intr.c
	+++ b/sys/x86/xen/xen_intr.c
	@@ -316,7 +316,7 @@
	if (xen_intr_auto_vector_count > NR_EVENT_CHANNELS) {
	if (!warned) {
	warned = 1;
	- printf("xen_intr_alloc: Event channels exhausted.\n");
	+ printf("%s: Event channels exhausted.\n", __func__);
	}
	return (NULL);
	}
	@@ -406,8 +406,7 @@

	*isrcp = NULL;
	if (port_handlep == NULL) {
	- printf("%s: xen_intr_bind_isrc: Bad event handle\n",
	- intr_owner);
	+ printf("%s: %s: Bad event handle\n", intr_owner, __func__);
	return (EINVAL);
	}

	@@ -1217,7 +1216,7 @@
	struct xenisrc *isrc;

	KASSERT(port_handlep != NULL,
	- ("NULL xen_intr_handle_t passed to xen_intr_unbind"));
	+ ("NULL xen_intr_handle_t passed to %s", __func__));

	isrc = xen_intr_isrc_from_handle(*port_handlep);
	*port_handlep = NULL;
	@@ -1277,11 +1276,9 @@

	error = intr_add_handler(name, isrc->xi_vector,filter, handler, arg,
	flags\|INTR_EXCL, &isrc->xi_cookie, 0);
	- if (error != 0) {
	- printf(
	- "%s: xen_intr_add_handler: intr_add_handler failed: %d\n",
	- name, error);
	- }
	+ if (error != 0)
	+ printf("%s: %s: add handler failed: %d\n", name, __func__,
	+ error);

	return (error);
	}