CVS commit: src/sys/dev/pci

[Takeshi Nakayama]

Module Name:    src
Committed By:   nakayama
Date:           Mon Mar 27 14:56:40 UTC 2023

Modified Files:
        src/sys/dev/pci: if_vioif.c virtio.c

Log Message:
Use PRIuBUSSIZE to print bus_size_t variables.


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/pci/if_vioif.c
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/virtio.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/dev/pci/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.106 src/sys/dev/pci/if_vioif.c:1.107
--- src/sys/dev/pci/if_vioif.c:1.106	Fri Mar 24 13:16:15 2023
+++ src/sys/dev/pci/if_vioif.c	Mon Mar 27 14:56:40 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vioif.c,v 1.106 2023/03/24 13:16:15 yamaguchi Exp $	*/
+/*	$NetBSD: if_vioif.c,v 1.107 2023/03/27 14:56:40 nakayama Exp $	*/
 
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.106 2023/03/24 13:16:15 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.107 2023/03/27 14:56:40 nakayama Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -1185,7 +1185,7 @@ vioif_alloc_mems(struct vioif_softc *sc)
 	    &sc->sc_segs[0], 1, &rsegs, BUS_DMA_NOWAIT);
 	if (r != 0) {
 		aprint_error_dev(sc->sc_dev,
-		    "DMA memory allocation failed, size %zu, "
+		    "DMA memory allocation failed, size %" PRIuBUSSIZE ", "
 		    "error code %d\n", dmamemsize, r);
 		goto err_none;
 	}

Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.70 src/sys/dev/pci/virtio.c:1.71
--- src/sys/dev/pci/virtio.c:1.70	Mon Mar 27 10:48:46 2023
+++ src/sys/dev/pci/virtio.c	Mon Mar 27 14:56:40 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: virtio.c,v 1.70 2023/03/27 10:48:46 riastradh Exp $	*/
+/*	$NetBSD: virtio.c,v 1.71 2023/03/27 14:56:40 nakayama Exp $	*/
 
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.70 2023/03/27 10:48:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.71 2023/03/27 14:56:40 nakayama Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -866,12 +866,12 @@ virtio_alloc_vq(struct virtio_softc *sc,
 	virtio_reset_vq(sc, vq);
 
 	aprint_verbose_dev(sc->sc_dev,
-	    "allocated %zu byte for virtqueue %d for %s, size %d\n",
-	    allocsize, vq->vq_index, name, vq_num);
+	    "allocated %" PRIuBUSSIZE " byte for virtqueue %d for %s, "
+	    "size %d\n", allocsize, vq->vq_index, name, vq_num);
 	if (size_indirect > 0)
 		aprint_verbose_dev(sc->sc_dev,
-		    "using %zu byte (%d entries) indirect descriptors\n",
-		    size_indirect, maxnsegs * vq_num);
+		    "using %" PRIuBUSSIZE " byte (%d entries) indirect "
+		    "descriptors\n", size_indirect, maxnsegs * vq_num);
 
 	return 0;