leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/virtio: Use tools/include/list.h instead of stubs

Browse Source 
It should not make any significant difference but reduce stub code.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Link: https://lore.kernel.org/r/20200418102217.32327-9-eperezma@redhat.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Eugenio Pérez 2020-04-18 12:22:17 +02:00 committed by Michael S. Tsirkin
parent 1d8bf5c3a3
commit cb91909e48
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/virtio/linux/kernel.h
View File

@ -11,6 +11,7 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/list.h>
#include <linux/printk.h> #include <linux/printk.h>
#include <linux/bug.h> #include <linux/bug.h>
#include <errno.h> #include <errno.h>
@ -135,10 +136,4 @@ static inline void free_page(unsigned long addr)
(void) (&_min1 == &_min2); \ (void) (&_min1 == &_min2); \
_min1 < _min2 ? _min1 : _min2; }) _min1 < _min2 ? _min1 : _min2; })
/* 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 */
#endif /* KERNEL_H */ #endif /* KERNEL_H */

5
tools/virtio/linux/virtio.h
View File

@ -11,12 +11,11 @@ struct device {
struct virtio_device { struct virtio_device {
struct device dev; struct device dev;
u64 features; u64 features;
struct list_head vqs;
}; };
struct virtqueue { struct virtqueue {
/* TODO: commented as list macros are empty stubs for now. struct list_head list;
* Broken but enough for virtio_ring.c
* struct list_head list; */
void (*callback)(struct virtqueue *vq); void (*callback)(struct virtqueue *vq);
const char *name; const char *name;
struct virtio_device *vdev; struct virtio_device *vdev;

1
tools/virtio/virtio_test.c
View File

@ -129,6 +129,7 @@ static void vdev_info_init(struct vdev_info* dev, unsigned long long features)
int r; int r;
memset(dev, 0, sizeof *dev); memset(dev, 0, sizeof *dev);
dev->vdev.features = features; dev->vdev.features = features;
INIT_LIST_HEAD(&dev->vdev.vqs);
dev->buf_size = 1024; dev->buf_size = 1024;
dev->buf = malloc(dev->buf_size); dev->buf = malloc(dev->buf_size);
assert(dev->buf); assert(dev->buf);

2
tools/virtio/vringh_test.c
View File

@ -307,6 +307,7 @@ static int parallel_test(u64 features,
close(to_host[0]); close(to_host[0]);
gvdev.vdev.features = features; gvdev.vdev.features = features;
INIT_LIST_HEAD(&gvdev.vdev.vqs);
gvdev.to_host_fd = to_host[1]; gvdev.to_host_fd = to_host[1];
gvdev.notifies = 0; gvdev.notifies = 0;
@ -453,6 +454,7 @@ int main(int argc, char *argv[])
getrange = getrange_iov; getrange = getrange_iov;
vdev.features = 0; vdev.features = 0;
INIT_LIST_HEAD(&vdev.vqs);
while (argv[1]) { while (argv[1]) {
if (strcmp(argv[1], "--indirect") == 0) if (strcmp(argv[1], "--indirect") == 0)