diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2020-04-01 12:46:22 -0400 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2020-04-16 18:31:08 -0400 |
| commit | 3302363a27fb38a3581921a74aff855f4dcbfe0a (patch) | |
| tree | 5facda6624c9bf93dee6434c89dc3352e89e0d96 /tools/virtio | |
| parent | 247643f85782fc1119ccbd712a5075535ebf9d43 (diff) | |
| download | linux-3302363a27fb38a3581921a74aff855f4dcbfe0a.tar.gz linux-3302363a27fb38a3581921a74aff855f4dcbfe0a.tar.bz2 linux-3302363a27fb38a3581921a74aff855f4dcbfe0a.zip | |
virtio/test: fix up after IOTLB changes
Allow building vringh without IOTLB (that's the case for userspace
builds, will be useful for CAIF/VOD down the road too).
Update for API tweaks.
Don't include vringh with userspace builds.
Cc: Jason Wang <jasowang@redhat.com>
Cc: Eugenio Pérez <eperezma@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'tools/virtio')
| -rw-r--r-- | tools/virtio/Makefile | 5 | ||||
| -rw-r--r-- | tools/virtio/generated/autoconf.h | 0 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/virtio/Makefile b/tools/virtio/Makefile index f33f32f1d208..b587b9a7a124 100644 --- a/tools/virtio/Makefile +++ b/tools/virtio/Makefile @@ -4,7 +4,7 @@ test: virtio_test vringh_test virtio_test: virtio_ring.o virtio_test.o vringh_test: vringh_test.o vringh.o virtio_ring.o -CFLAGS += -g -O2 -Werror -Wall -I. -I../include/ -I ../../usr/include/ -Wno-pointer-sign -fno-strict-overflow -fno-strict-aliasing -fno-common -MMD -U_FORTIFY_SOURCE +CFLAGS += -g -O2 -Werror -Wall -I. -I../include/ -I ../../usr/include/ -Wno-pointer-sign -fno-strict-overflow -fno-strict-aliasing -fno-common -MMD -U_FORTIFY_SOURCE -include ../../include/linux/kconfig.h vpath %.c ../../drivers/virtio ../../drivers/vhost mod: ${MAKE} -C `pwd`/../.. M=`pwd`/vhost_test V=${V} @@ -22,7 +22,8 @@ OOT_CONFIGS=\ CONFIG_VHOST=m \ CONFIG_VHOST_NET=n \ CONFIG_VHOST_SCSI=n \ - CONFIG_VHOST_VSOCK=n + CONFIG_VHOST_VSOCK=n \ + CONFIG_VHOST_RING=n OOT_BUILD=KCFLAGS="-I "${OOT_VHOST} ${MAKE} -C ${OOT_KSRC} V=${V} oot-build: echo "UNSUPPORTED! Don't use the resulting modules in production!" diff --git a/tools/virtio/generated/autoconf.h b/tools/virtio/generated/autoconf.h new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/tools/virtio/generated/autoconf.h |