CVS commit: src/sys/arch/xen/xen

[Jean-Yves Migeon]

Module Name:    src
Committed By:   jym
Date:           Tue Jan 18 21:34:31 UTC 2011

Modified Files:
        src/sys/arch/xen/xen: xennetback_xenbus.c

Log Message:
Fix bad pasto cooking: xennet backend is not xbdback: use
aprint_error_ifnet() with the proper ifnet device for error messages.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/xen/xen/xennetback_xenbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/xen/xen/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.37 src/sys/arch/xen/xen/xennetback_xenbus.c:1.38
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.37	Tue Jan 11 23:22:19 2011
+++ src/sys/arch/xen/xen/xennetback_xenbus.c	Tue Jan 18 21:34:31 2011
@@ -1,4 +1,4 @@
-/*      $NetBSD: xennetback_xenbus.c,v 1.37 2011/01/11 23:22:19 jym Exp $      */
+/*      $NetBSD: xennetback_xenbus.c,v 1.38 2011/01/18 21:34:31 jym Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -319,40 +319,46 @@
 	do {
 		xbt = xenbus_transaction_start();
 		if (xbt == NULL) {
-			printf("xbdback %s: can't start transaction\n",
+			aprint_error_ifnet(ifp,
+			    "%s: can't start transaction\n",
 			    xbusd->xbusd_path);
 			goto fail;
 		}
 		err = xenbus_printf(xbt, xbusd->xbusd_path,
 		    "vifname", ifp->if_xname);
 		if (err) {
-			printf("xbdback: failed to write %s/vifname: "
-			    "%d\n", xbusd->xbusd_path, err);
+			aprint_error_ifnet(ifp,
+			    "failed to write %s/vifname: %d\n",
+			    xbusd->xbusd_path, err);
 			goto abort_xbt;
 		}
 		err = xenbus_printf(xbt, xbusd->xbusd_path,
 		    "feature-rx-copy", "%d", 1);
 		if (err) {
-			printf("xbdback: failed to write %s/feature-rx-copy: "
-			    "%d\n", xbusd->xbusd_path, err);
+			aprint_error_ifnet(ifp,
+			    "failed to write %s/feature-rx-copy: %d\n",
+			    xbusd->xbusd_path, err);
 			goto abort_xbt;
 		}
 		err = xenbus_printf(xbt, xbusd->xbusd_path,
 		    "feature-rx-flip", "%d", 1);
 		if (err) {
-			printf("xbdback: failed to write %s/feature-rx-flip: "
-			    "%d\n", xbusd->xbusd_path, err);
+			aprint_error_ifnet(ifp,
+			    "failed to write %s/feature-rx-flip: %d\n",
+			    xbusd->xbusd_path, err);
 			goto abort_xbt;
 		}
 	} while ((err = xenbus_transaction_end(xbt, 0)) == EAGAIN);
 	if (err) {
-		printf("xbdback %s: can't end transaction: %d\n",
+		aprint_error_ifnet(ifp,
+		    "%s: can't end transaction: %d\n",
 		    xbusd->xbusd_path, err);
 	}
 
 	err = xenbus_switch_state(xbusd, NULL, XenbusStateInitWait);
 	if (err) {
-		printf("failed to switch state on %s: %d\n",
+		aprint_error_ifnet(ifp,
+		    "failed to switch state on %s: %d\n",
 		    xbusd->xbusd_path, err);
 		goto fail;
 	}