Commit 2d7ce0e8 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

tools/virtio: more stubs 



As usual, add more stubs to fix test build after main
codebase changes.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent d71de9ec

tools/virtio/linux/virtio.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
/* TODO: empty stubs for now. Broken but enough for virtio_ring.c */

#define list_add_tail(a, b) do {} while (0)

#define list_del(a) do {} while (0)

#define list_for_each_entry(a, b, c) while (0)

/* end of stubs */



struct virtio_device {

tools/virtio/linux/virtio_byteorder.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_VIRTIO_BYTEORDER_STUB_H

#define _LINUX_VIRTIO_BYTEORDER_STUB_H



#include <asm/byteorder.h>

#include "../../include/linux/byteorder/generic.h"

#include "../../include/linux/virtio_byteorder.h"



#endif

tools/virtio/linux/virtio_config.h

+68 −2
Original line number Diff line number Diff line 
#define VIRTIO_TRANSPORT_F_START	28

#define VIRTIO_TRANSPORT_F_END		32

#include <linux/virtio_byteorder.h>

#include <linux/virtio.h>

#include <uapi/linux/virtio_config.h>



/*

 * __virtio_test_bit - helper to test feature bits. For use by transports.

 *                     Devices should normally use virtio_has_feature,

 *                     which includes more checks.

 * @vdev: the device

 * @fbit: the feature bit

 */

static inline bool __virtio_test_bit(const struct virtio_device *vdev,

				     unsigned int fbit)

{

	return vdev->features & (1ULL << fbit);

}



/**

 * __virtio_set_bit - helper to set feature bits. For use by transports.

 * @vdev: the device

 * @fbit: the feature bit

 */

static inline void __virtio_set_bit(struct virtio_device *vdev,

				    unsigned int fbit)

{

	vdev->features |= (1ULL << fbit);

}



/**

 * __virtio_clear_bit - helper to clear feature bits. For use by transports.

 * @vdev: the device

 * @fbit: the feature bit

 */

static inline void __virtio_clear_bit(struct virtio_device *vdev,

				      unsigned int fbit)

{

	vdev->features &= ~(1ULL << fbit);

}



#define virtio_has_feature(dev, feature) \

	(__virtio_test_bit((dev), feature))



static inline u16 virtio16_to_cpu(struct virtio_device *vdev, __virtio16 val)

{

	return __virtio16_to_cpu(virtio_has_feature(vdev, VIRTIO_F_VERSION_1), val);

}



static inline __virtio16 cpu_to_virtio16(struct virtio_device *vdev, u16 val)

{

	return __cpu_to_virtio16(virtio_has_feature(vdev, VIRTIO_F_VERSION_1), val);

}



static inline u32 virtio32_to_cpu(struct virtio_device *vdev, __virtio32 val)

{

	return __virtio32_to_cpu(virtio_has_feature(vdev, VIRTIO_F_VERSION_1), val);

}



static inline __virtio32 cpu_to_virtio32(struct virtio_device *vdev, u32 val)

{

	return __cpu_to_virtio32(virtio_has_feature(vdev, VIRTIO_F_VERSION_1), val);

}



static inline u64 virtio64_to_cpu(struct virtio_device *vdev, __virtio64 val)

{

	return __virtio64_to_cpu(virtio_has_feature(vdev, VIRTIO_F_VERSION_1), val);

}



static inline __virtio64 cpu_to_virtio64(struct virtio_device *vdev, u64 val)

{

	return __cpu_to_virtio64(virtio_has_feature(vdev, VIRTIO_F_VERSION_1), val);

}

tools/virtio/uapi/linux/virtio_types.h

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "../../include/uapi/linux/virtio_types.h"

tools/virtio/virtio_test.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <sys/types.h>

#include <fcntl.h>

#include <stdbool.h>

#include <linux/virtio_types.h>

#include <linux/vhost.h>

#include <linux/virtio.h>

#include <linux/virtio_ring.h>