Commit 55189bee authored May 07, 2021 by Changpeng Liu Committed by Tomasz Zawadzki May 12, 2021

libvfio-user: update submodule



This update will stop using `struct vfio_device_info` from
<linux/vfio.h>.

Fix issue #1922.

Change-Id: Ia7ad745db8d7ed8f5248ca13e3188ebd540b0e40
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7831


Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by:  <dongx.yi@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>

parent 78a794b9

include/spdk/vfio_user_spec.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,14 @@ struct vfio_user_version {
		uint8_t data[];
		} __attribute__((packed));

		struct vfio_user_device_info {
		uint32_t argsz;
		/* VFIO_DEVICE_FLAGS_* */
		uint32_t flags;
		uint32_t num_regions;
		uint32_t num_irqs;
		} __attribute__((packed));

		struct vfio_user_dma_region {
		uint64_t addr;
		uint64_t size;

lib/vfio_user/vfio_user.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -285,10 +285,10 @@ vfio_user_get_dev_region_info(struct vfio_device dev, struct vfio_region_info
		}

		int
		vfio_user_get_dev_info(struct vfio_device dev, struct vfio_device_info dev_info,
		vfio_user_get_dev_info(struct vfio_device dev, struct vfio_user_device_info dev_info,
		size_t buf_len)
		{
		dev_info->argsz = sizeof(struct vfio_device_info);
		dev_info->argsz = sizeof(struct vfio_user_device_info);
		return vfio_user_dev_send_request(dev, VFIO_USER_DEVICE_GET_INFO,
		dev_info, dev_info->argsz, buf_len, NULL, 0);
		}

lib/vfio_user/vfio_user_internal.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@
		#define _VFIO_INTERNAL_H

		#include <linux/vfio.h>
		#include "spdk/vfio_user_spec.h"

		#define VFIO_USER_MAJOR_VER 0
		#define VFIO_USER_MINOR_VER 1
		@@ -85,7 +86,7 @@ struct vfio_device {
		};

		int vfio_user_dev_setup(struct vfio_device *dev);
		int vfio_user_get_dev_info(struct vfio_device dev, struct vfio_device_info dev_info,
		int vfio_user_get_dev_info(struct vfio_device dev, struct vfio_user_device_info dev_info,
		size_t buf_len);
		int vfio_user_get_dev_region_info(struct vfio_device dev, struct vfio_region_info region_info,
		size_t buf_len, int *fds, int num_fds);

lib/vfio_user/vfio_user_pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -369,7 +369,7 @@ spdk_vfio_user_setup(const char *path)
		{
		int ret;
		struct vfio_device *device = NULL;
		struct vfio_device_info dev_info = {};
		struct vfio_user_device_info dev_info = {};

		device = calloc(1, sizeof(*device));
		if (!device) {

libvfio-user @ 702a4cad

Original line number	Diff line number	Diff line
		Subproject commit 3acb97477f261bf11c866b5764deabe693607bc3
		Subproject commit 702a4cad49c40406ff498e0da4a80c6d07b4fc83