On Tue, May 24, 2022 at 04:40:42PM +0100, Alex Bennée wrote:
> We were not building the vhost-user-blk server due to 32 bit
> compilation problems. The problem was due to format string types so
> fix that and then enable the build. Tweak the rule to follow the same
> rules as other vhost-user daemons.
>
> Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
> Message-Id: <20220321153037.3622127-12-alex.ben...@linaro.org>
Reviewed-by: Raphael Norwitz <raphael.norw...@nutanix.com>
> ---
> meson.build | 2 +-
> contrib/vhost-user-blk/vhost-user-blk.c | 6 +++---
> contrib/vhost-user-blk/meson.build | 3 +--
> 3 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 9ebc00f032..a33ed52b7a 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1489,7 +1489,7 @@ have_vhost_user_blk_server =
> get_option('vhost_user_blk_server') \
> error_message: 'vhost_user_blk_server requires linux') \
> .require(have_vhost_user,
> error_message: 'vhost_user_blk_server requires vhost-user
> support') \
> - .disable_auto_if(not have_system) \
> + .disable_auto_if(not have_tools and not have_system) \
> .allowed()
>
> if get_option('fuse').disabled() and get_option('fuse_lseek').enabled()
> diff --git a/contrib/vhost-user-blk/vhost-user-blk.c
> b/contrib/vhost-user-blk/vhost-user-blk.c
> index cd4a5d7335..9cb78ca1d0 100644
> --- a/contrib/vhost-user-blk/vhost-user-blk.c
> +++ b/contrib/vhost-user-blk/vhost-user-blk.c
> @@ -146,7 +146,7 @@ vub_readv(VubReq *req, struct iovec *iov, uint32_t iovcnt)
> req->size = vub_iov_size(iov, iovcnt);
> rc = preadv(vdev_blk->blk_fd, iov, iovcnt, req->sector_num * 512);
> if (rc < 0) {
> - fprintf(stderr, "%s, Sector %"PRIu64", Size %lu failed with %s\n",
> + fprintf(stderr, "%s, Sector %"PRIu64", Size %zu failed with %s\n",
> vdev_blk->blk_name, req->sector_num, req->size,
> strerror(errno));
> return -1;
> @@ -169,7 +169,7 @@ vub_writev(VubReq *req, struct iovec *iov, uint32_t
> iovcnt)
> req->size = vub_iov_size(iov, iovcnt);
> rc = pwritev(vdev_blk->blk_fd, iov, iovcnt, req->sector_num * 512);
> if (rc < 0) {
> - fprintf(stderr, "%s, Sector %"PRIu64", Size %lu failed with %s\n",
> + fprintf(stderr, "%s, Sector %"PRIu64", Size %zu failed with %s\n",
> vdev_blk->blk_name, req->sector_num, req->size,
> strerror(errno));
> return -1;
> @@ -188,7 +188,7 @@ vub_discard_write_zeroes(VubReq *req, struct iovec *iov,
> uint32_t iovcnt,
>
> size = vub_iov_size(iov, iovcnt);
> if (size != sizeof(*desc)) {
> - fprintf(stderr, "Invalid size %ld, expect %ld\n", size,
> sizeof(*desc));
> + fprintf(stderr, "Invalid size %zd, expect %zd\n", size,
> sizeof(*desc));
> return -1;
> }
> buf = g_new0(char, size);
> diff --git a/contrib/vhost-user-blk/meson.build
> b/contrib/vhost-user-blk/meson.build
> index 601ea15ef5..dcb9e2ffcd 100644
> --- a/contrib/vhost-user-blk/meson.build
> +++ b/contrib/vhost-user-blk/meson.build
> @@ -1,5 +1,4 @@
> -# FIXME: broken on 32-bit architectures
> executable('vhost-user-blk', files('vhost-user-blk.c'),
> dependencies: [qemuutil, vhost_user],
> - build_by_default: false,
> + build_by_default: targetos == 'linux',
> install: false)
> --
> 2.30.2
>
