From 29d86b3f013e27d9dbf7dd8891a083e10a689bc7 Mon Sep 17 00:00:00 2001
From: taca <taca@NetBSD.org>
Date: Tue, 13 Jan 2009 03:28:54 +0000
Subject: [PATCH] Fix compile error: one more sys/arch/xen/xen/xbd.c and
 xbdback.c.

---
 sys/arch/xen/xen/xbd.c     |  8 ++++----
 sys/arch/xen/xen/xbdback.c | 12 +++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/sys/arch/xen/xen/xbd.c b/sys/arch/xen/xen/xbd.c
index 3afcb119368d..a933eeb21b7c 100644
--- a/sys/arch/xen/xen/xbd.c
+++ b/sys/arch/xen/xen/xbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xbd.c,v 1.48 2009/01/12 16:16:18 christos Exp $ */
+/* $NetBSD: xbd.c,v 1.49 2009/01/13 03:28:54 taca Exp $ */
 
 /*
  *
@@ -33,7 +33,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbd.c,v 1.48 2009/01/12 16:16:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd.c,v 1.49 2009/01/13 03:28:54 taca Exp $");
 
 #include "xbd_hypervisor.h"
 #include "rnd.h"
@@ -499,8 +499,8 @@ getxbd_softc(dev_t dev)
 {
 	int	unit = XBDUNIT(dev);
 
-	DPRINTF_FOLLOW(("getxbd_softc(0x%x): major = %d unit = %d\n", dev,
-	    major(dev), unit));
+	DPRINTF_FOLLOW(("getxbd_softc(0x%" PRIu64 "): major = %" PRIu64
+	    "unit = %d\n", dev, major(dev), unit));
 #if NXBD_HYPERVISOR > 0
 	if (major(dev) == xbd_major)
 		return device_lookup_private(&xbd_cd, unit);
diff --git a/sys/arch/xen/xen/xbdback.c b/sys/arch/xen/xen/xbdback.c
index 171d3a88875f..43f548a1bd9f 100644
--- a/sys/arch/xen/xen/xbdback.c
+++ b/sys/arch/xen/xen/xbdback.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: xbdback.c,v 1.35 2008/11/17 16:32:04 cegger Exp $      */
+/*      $NetBSD: xbdback.c,v 1.36 2009/01/13 03:28:54 taca Exp $      */
 
 /*
  * Copyright (c) 2005 Manuel Bouyer.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbdback.c,v 1.35 2008/11/17 16:32:04 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback.c,v 1.36 2009/01/13 03:28:54 taca Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -493,7 +493,8 @@ xbdback_ctrlif_rx(ctrl_msg_t *msg, unsigned long id)
 			goto end;
 		}
 		if (vbd->size) {
-			printf("xbd backend: detach device %s%d%c "
+			printf("xbd backend: detach device %s%" PRIu64
+			       "%" PRIu64 " "
 			    "for domain %d\n", devsw_blk2name(major(vbd->dev)),
 			    DISKUNIT(vbd->dev), DISKPART(vbd->dev) + 'a',
 			    xbdi->domid);
@@ -590,7 +591,8 @@ xbdback_ctrlif_rx(ctrl_msg_t *msg, unsigned long id)
 		vbd->size = req->extent.sector_length * (512 / DEV_BSIZE);
 		if (vbd->size == 0 || vbd->size > dpart.part->p_size);
 			vbd->size = dpart.part->p_size;
-		printf("xbd backend: attach device %s%d%c (size %d) "
+		printf("xbd backend: attach device %s%" PRIu64 "%" PRIu64
+		       " (size %d) "
 		    "for domain %d\n", devname, DISKUNIT(vbd->dev),
 		    DISKPART(vbd->dev) + 'a', vbd->size, xbdi->domid);
 		req->status = BLKIF_BE_STATUS_OKAY;
@@ -616,7 +618,7 @@ xbdback_ctrlif_rx(ctrl_msg_t *msg, unsigned long id)
 			req->status = BLKIF_BE_STATUS_VBD_NOT_FOUND;
 			goto end;
 		}
-		printf("xbd backend: detach device %s%d%c "
+		printf("xbd backend: detach device %s%" PRIu64 "%" PRIu64 " "
 		    "for domain %d\n", devsw_blk2name(major(vbd->dev)),
 		    DISKUNIT(vbd->dev), DISKPART(vbd->dev) + 'a',
 		    xbdi->domid);