Module Name: src
Committed By: martin
Date: Sat Apr 1 10:31:06 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-10]: if_vioif.c virtio.c
Log Message:
Additionally pull up the following for ticket #128 to fix the build:
sys/dev/pci/if_vioif.c: revision 1.107
sys/dev/pci/virtio.c: revision 1.71
Use PRIuBUSSIZE to print bus_size_t variables.
To generate a diff of this commit:
cvs rdiff -u -r1.82.4.1 -r1.82.4.2 src/sys/dev/pci/if_vioif.c
cvs rdiff -u -r1.63.2.1 -r1.63.2.2 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.82.4.1 src/sys/dev/pci/if_vioif.c:1.82.4.2
--- src/sys/dev/pci/if_vioif.c:1.82.4.1 Thu Mar 30 11:36:26 2023
+++ src/sys/dev/pci/if_vioif.c Sat Apr 1 10:31:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.82.4.1 2023/03/30 11:36:26 martin Exp $ */
+/* $NetBSD: if_vioif.c,v 1.82.4.2 2023/04/01 10:31:06 martin 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.82.4.1 2023/03/30 11:36:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.82.4.2 2023/04/01 10:31:06 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1180,7 +1180,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.63.2.1 src/sys/dev/pci/virtio.c:1.63.2.2
--- src/sys/dev/pci/virtio.c:1.63.2.1 Fri Jan 13 19:11:31 2023
+++ src/sys/dev/pci/virtio.c Sat Apr 1 10:31:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.63.2.1 2023/01/13 19:11:31 martin Exp $ */
+/* $NetBSD: virtio.c,v 1.63.2.2 2023/04/01 10:31:06 martin Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.63.2.1 2023/01/13 19:11:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.63.2.2 2023/04/01 10:31:06 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -857,12 +857,12 @@ virtio_alloc_vq(struct virtio_softc *sc,
vq->vq_dmamap->dm_segs[0].ds_addr);
aprint_verbose_dev(sc->sc_dev,
- "allocated %u byte for virtqueue %d for %s, size %d\n",
- allocsize, index, name, vq_size);
+ "allocated %" PRIuBUSSIZE " byte for virtqueue %d for %s, "
+ "size %d\n", allocsize, index, name, vq_size);
if (allocsize3 > 0)
aprint_verbose_dev(sc->sc_dev,
- "using %d byte (%d entries) indirect descriptors\n",
- allocsize3, maxnsegs * vq_size);
+ "using %" PRIuBUSSIZE " byte (%d entries) indirect "
+ "descriptors\n", allocsize3, maxnsegs * vq_size);
sc->sc_nvqs++;
