Module Name: src
Committed By: uwe
Date: Wed Apr 13 10:42:12 UTC 2022
Modified Files:
src/sys/dev/pci: if_vioif.c ld_virtio.c viomb.c virtioreg.h
Log Message:
virtio: use the new syntax for snprintb(3) format strings.
The old syntax is limited to 32 bits only (and has 1-based bit numbers
which is rather incovenient too).
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pci/if_vioif.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/ld_virtio.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/viomb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/virtioreg.h
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.78 src/sys/dev/pci/if_vioif.c:1.79
--- src/sys/dev/pci/if_vioif.c:1.78 Wed Apr 13 02:28:01 2022
+++ src/sys/dev/pci/if_vioif.c Wed Apr 13 10:42:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.78 2022/04/13 02:28:01 yamaguchi Exp $ */
+/* $NetBSD: if_vioif.c,v 1.79 2022/04/13 10:42:12 uwe 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.78 2022/04/13 02:28:01 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.79 2022/04/13 10:42:12 uwe Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -101,29 +101,29 @@ __KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v
#define VIRTIO_NET_F_MQ __BIT(22)
#define VIRTIO_NET_F_CTRL_MAC_ADDR __BIT(23)
-#define VIRTIO_NET_FLAG_BITS \
- VIRTIO_COMMON_FLAG_BITS \
- "\x18""CTRL_MAC" \
- "\x17""MQ" \
- "\x16""GUEST_ANNOUNCE" \
- "\x15""CTRL_RX_EXTRA" \
- "\x14""CTRL_VLAN" \
- "\x13""CTRL_RX" \
- "\x12""CTRL_VQ" \
- "\x11""STATUS" \
- "\x10""MRG_RXBUF" \
- "\x0f""HOST_UFO" \
- "\x0e""HOST_ECN" \
- "\x0d""HOST_TSO6" \
- "\x0c""HOST_TSO4" \
- "\x0b""GUEST_UFO" \
- "\x0a""GUEST_ECN" \
- "\x09""GUEST_TSO6" \
- "\x08""GUEST_TSO4" \
- "\x07""GSO" \
- "\x06""MAC" \
- "\x02""GUEST_CSUM" \
- "\x01""CSUM"
+#define VIRTIO_NET_FLAG_BITS \
+ VIRTIO_COMMON_FLAG_BITS \
+ "b\x17" "CTRL_MAC\0" \
+ "b\x16" "MQ\0" \
+ "b\x15" "GUEST_ANNOUNCE\0" \
+ "b\x14" "CTRL_RX_EXTRA\0" \
+ "b\x13" "CTRL_VLAN\0" \
+ "b\x12" "CTRL_RX\0" \
+ "b\x11" "CTRL_VQ\0" \
+ "b\x10" "STATUS\0" \
+ "b\x0f" "MRG_RXBUF\0" \
+ "b\x0e" "HOST_UFO\0" \
+ "b\x0d" "HOST_ECN\0" \
+ "b\x0c" "HOST_TSO6\0" \
+ "b\x0b" "HOST_TSO4\0" \
+ "b\x0a" "GUEST_UFO\0" \
+ "b\x09" "GUEST_ECN\0" \
+ "b\x08" "GUEST_TSO6\0" \
+ "b\x07" "GUEST_TSO4\0" \
+ "b\x06" "GSO\0" \
+ "b\x05" "MAC\0" \
+ "b\x01" "GUEST_CSUM\0" \
+ "b\x00" "CSUM\0"
/* Status */
#define VIRTIO_NET_S_LINK_UP 1
Index: src/sys/dev/pci/ld_virtio.c
diff -u src/sys/dev/pci/ld_virtio.c:1.29 src/sys/dev/pci/ld_virtio.c:1.30
--- src/sys/dev/pci/ld_virtio.c:1.29 Wed Jan 20 19:46:48 2021
+++ src/sys/dev/pci/ld_virtio.c Wed Apr 13 10:42:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_virtio.c,v 1.29 2021/01/20 19:46:48 reinoud Exp $ */
+/* $NetBSD: ld_virtio.c,v 1.30 2022/04/13 10:42:12 uwe Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.29 2021/01/20 19:46:48 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.30 2022/04/13 10:42:12 uwe Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,18 +76,18 @@ __KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,
*/
#define VIRTIO_BLK_MIN_SEGMENTS 2
-#define VIRTIO_BLK_FLAG_BITS \
- VIRTIO_COMMON_FLAG_BITS \
- "\x0c""CONFIG_WCE" \
- "\x0b""TOPOLOGY" \
- "\x0a""FLUSH" \
- "\x08""SCSI" \
- "\x07""BLK_SIZE" \
- "\x06""RO" \
- "\x05""GEOMETRY" \
- "\x03""SEG_MAX" \
- "\x02""SIZE_MAX" \
- "\x01""BARRIER"
+#define VIRTIO_BLK_FLAG_BITS \
+ VIRTIO_COMMON_FLAG_BITS \
+ "b\x0b" "CONFIG_WCE\0" \
+ "b\x0a" "TOPOLOGY\0" \
+ "b\x09" "FLUSH\0" \
+ "b\x07" "SCSI\0" \
+ "b\x06" "BLK_SIZE\0" \
+ "b\x05" "RO\0" \
+ "b\x04" "GEOMETRY\0" \
+ "b\x02" "SEG_MAX\0" \
+ "b\x01" "SIZE_MAX\0" \
+ "b\x00" "BARRIER\0"
/* Command */
#define VIRTIO_BLK_T_IN 0
Index: src/sys/dev/pci/viomb.c
diff -u src/sys/dev/pci/viomb.c:1.12 src/sys/dev/pci/viomb.c:1.13
--- src/sys/dev/pci/viomb.c:1.12 Wed Jan 20 19:46:48 2021
+++ src/sys/dev/pci/viomb.c Wed Apr 13 10:42:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: viomb.c,v 1.12 2021/01/20 19:46:48 reinoud Exp $ */
+/* $NetBSD: viomb.c,v 1.13 2022/04/13 10:42:12 uwe Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viomb.c,v 1.12 2021/01/20 19:46:48 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viomb.c,v 1.13 2022/04/13 10:42:12 uwe Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,10 +53,10 @@ __KERNEL_RCSID(0, "$NetBSD: viomb.c,v 1.
#define VIRTIO_BALLOON_F_MUST_TELL_HOST (1<<0)
#define VIRTIO_BALLOON_F_STATS_VQ (1<<1)
-#define VIRTIO_BALLOON_FLAG_BITS \
- VIRTIO_COMMON_FLAG_BITS \
- "\x02""STATS_VQ" \
- "\x01""MUST_TELL_HOST"
+#define VIRTIO_BALLOON_FLAG_BITS \
+ VIRTIO_COMMON_FLAG_BITS \
+ "b\x01" "STATS_VQ\0" \
+ "b\x00" "MUST_TELL_HOST\0"
#define PGS_PER_REQ (256) /* 1MB, 4KB/page */
#define VQ_INFLATE 0
Index: src/sys/dev/pci/virtioreg.h
diff -u src/sys/dev/pci/virtioreg.h:1.7 src/sys/dev/pci/virtioreg.h:1.8
--- src/sys/dev/pci/virtioreg.h:1.7 Wed Jan 20 19:46:48 2021
+++ src/sys/dev/pci/virtioreg.h Wed Apr 13 10:42:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: virtioreg.h,v 1.7 2021/01/20 19:46:48 reinoud Exp $ */
+/* $NetBSD: virtioreg.h,v 1.8 2022/04/13 10:42:12 uwe Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -99,12 +99,13 @@
#define VIRTIO_CONFIG_ISR_CONFIG_CHANGE 2
/* common device/guest features */
-#define VIRTIO_COMMON_FLAG_BITS \
- "\20" \
- "\x1f""BAD_FEATURE" \
- "\x1e""EVENT_IDX" \
- "\x1d""INDIRECT_DESC" \
- "\x19""NOTIFY_ON_EMPTY"
+#define VIRTIO_COMMON_FLAG_BITS \
+ "\177\020" \
+ "b\x20" "V1\0" /*XXX*/ \
+ "b\x1e" "BAD_FEATURE\0" \
+ "b\x1d" "EVENT_IDX\0" \
+ "b\x1c" "INDIRECT_DESC\0" \
+ "b\x18" "NOTIFY_ON_EMPTY\0"
/*
