diff options
| author |   sf <sf@openbsd.org> | 2019-01-08 16:23:01 +0000 |
|---|---|---|
| committer | sf <sf@openbsd.org> | 2019-01-08 16:23:01 +0000 |
| commit | c30b7943cff98a6fd72acfe02a8bb5f073d0dfea (patch) | |
| tree | 8ea2e0336b3877edbb2b363e63048f04f7ae7f08 | |
| parent | The child processes of snmpd(8) did not detach from the terminal. (diff) | |
| download | wireguard-openbsd-c30b7943cff98a6fd72acfe02a8bb5f073d0dfea.tar.xz wireguard-openbsd-c30b7943cff98a6fd72acfe02a8bb5f073d0dfea.zip | |
virtio: Don't include feature strings without VIRTIO_DEBUG
They are only used if VIRTIO_DEBUG is enabled.
This should make the kernel slightly smaller.
| -rw-r--r-- | sys/dev/pv/if_vio.c | 4 | ||||
| -rw-r--r-- | sys/dev/pv/vioblk.c | 4 | ||||
| -rw-r--r-- | sys/dev/pv/viocon.c | 4 | ||||
| -rw-r--r-- | sys/dev/pv/viomb.c | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/sys/dev/pv/if_vio.c b/sys/dev/pv/if_vio.c index 46471f04181..28658380507 100644 --- a/sys/dev/pv/if_vio.c +++ b/sys/dev/pv/if_vio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vio.c,v 1.6 2018/09/25 13:46:44 mpi Exp $ */ +/* $OpenBSD: if_vio.c,v 1.7 2019/01/08 16:23:01 sf Exp $ */ /* * Copyright (c) 2012 Stefan Fritsch, Alexander Fiveg. @@ -96,6 +96,7 @@ #define CONFFLAG_QEMU_VLAN_BUG (1<<8) static const struct virtio_feature_name virtio_net_feature_names[] = { +#if VIRTIO_DEBUG { VIRTIO_NET_F_CSUM, "CSum" }, { VIRTIO_NET_F_GUEST_CSUM, "GuestCSum" }, { VIRTIO_NET_F_MAC, "MAC" }, @@ -115,6 +116,7 @@ static const struct virtio_feature_name virtio_net_feature_names[] = { { VIRTIO_NET_F_CTRL_VLAN, "CtrlVLAN" }, { VIRTIO_NET_F_CTRL_RX_EXTRA, "CtrlRXExtra" }, { VIRTIO_NET_F_GUEST_ANNOUNCE, "GuestAnnounce" }, +#endif { 0, NULL } }; diff --git a/sys/dev/pv/vioblk.c b/sys/dev/pv/vioblk.c index 69d9dd3fbdb..061043e8796 100644 --- a/sys/dev/pv/vioblk.c +++ b/sys/dev/pv/vioblk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vioblk.c,v 1.9 2017/08/10 18:06:58 reyk Exp $ */ +/* $OpenBSD: vioblk.c,v 1.10 2019/01/08 16:23:01 sf Exp $ */ /* * Copyright (c) 2012 Stefan Fritsch. @@ -72,6 +72,7 @@ #define ALLOC_SEGS (SEG_MAX + 2) struct virtio_feature_name vioblk_feature_names[] = { +#if VIRTIO_DEBUG { VIRTIO_BLK_F_BARRIER, "Barrier" }, { VIRTIO_BLK_F_SIZE_MAX, "SizeMax" }, { VIRTIO_BLK_F_SEG_MAX, "SegMax" }, @@ -81,6 +82,7 @@ struct virtio_feature_name vioblk_feature_names[] = { { VIRTIO_BLK_F_SCSI, "SCSI" }, { VIRTIO_BLK_F_FLUSH, "Flush" }, { VIRTIO_BLK_F_TOPOLOGY, "Topology" }, +#endif { 0, NULL } }; diff --git a/sys/dev/pv/viocon.c b/sys/dev/pv/viocon.c index 1ff2b847d2d..7c16e66751d 100644 --- a/sys/dev/pv/viocon.c +++ b/sys/dev/pv/viocon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viocon.c,v 1.3 2018/02/19 08:59:52 mpi Exp $ */ +/* $OpenBSD: viocon.c,v 1.4 2019/01/08 16:23:01 sf Exp $ */ /* * Copyright (c) 2013-2015 Stefan Fritsch <sf@sfritsch.de> @@ -49,9 +49,11 @@ #endif struct virtio_feature_name viocon_feature_names[] = { +#if VIRTIO_DEBUG { VIRTIO_CONSOLE_F_SIZE, "Size" }, { VIRTIO_CONSOLE_F_MULTIPORT, "MultiPort" }, { VIRTIO_CONSOLE_F_EMERG_WRITE, "EmergWrite" }, +#endif { 0, NULL }, }; diff --git a/sys/dev/pv/viomb.c b/sys/dev/pv/viomb.c index 6b5cfc2cabc..98c595dc2e2 100644 --- a/sys/dev/pv/viomb.c +++ b/sys/dev/pv/viomb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viomb.c,v 1.1 2017/01/21 11:22:43 reyk Exp $ */ +/* $OpenBSD: viomb.c,v 1.2 2019/01/08 16:23:01 sf Exp $ */ /* $NetBSD: viomb.c,v 1.1 2011/10/30 12:12:21 hannken Exp $ */ /* @@ -72,8 +72,10 @@ #define VIRTIO_BALLOON_F_STATS_VQ (1<<1) static const struct virtio_feature_name viomb_feature_names[] = { +#if VIRTIO_DEBUG {VIRTIO_BALLOON_F_MUST_TELL_HOST, "TellHost"}, {VIRTIO_BALLOON_F_STATS_VQ, "StatVQ"}, +#endif {0, NULL} }; #define PGS_PER_REQ 256 /* 1MB, 4KB/page */ |