Skip to content

Commit dbe449d

Browse files
fengidrimstsirkin
authored andcommitted
virtio_test: fixup for vq reset
Fix virtio test compilation failure caused by vq reset. ../../drivers/virtio/virtio_ring.c: In function ‘vring_create_virtqueue_packed’: ../../drivers/virtio/virtio_ring.c:1999:8: error: ‘struct virtqueue’ has no member named ‘reset’ 1999 | vq->vq.reset = false; | ^ ../../drivers/virtio/virtio_ring.c: In function ‘__vring_new_virtqueue’: ../../drivers/virtio/virtio_ring.c:2493:8: error: ‘struct virtqueue’ has no member named ‘reset’ 2493 | vq->vq.reset = false; | ^ ../../drivers/virtio/virtio_ring.c: In function ‘virtqueue_resize’: ../../drivers/virtio/virtio_ring.c:2587:18: error: ‘struct virtqueue’ has no member named ‘num_max’ 2587 | if (num > vq->vq.num_max) | ^ ../../drivers/virtio/virtio_ring.c:2596:11: error: ‘struct virtio_device’ has no member named ‘config’ 2596 | if (!vdev->config->disable_vq_and_reset) | ^~ ../../drivers/virtio/virtio_ring.c:2599:11: error: ‘struct virtio_device’ has no member named ‘config’ 2599 | if (!vdev->config->enable_vq_after_reset) | ^~ ../../drivers/virtio/virtio_ring.c:2602:12: error: ‘struct virtio_device’ has no member named ‘config’ 2602 | err = vdev->config->disable_vq_and_reset(_vq); | ^~ ../../drivers/virtio/virtio_ring.c:2614:10: error: ‘struct virtio_device’ has no member named ‘config’ 2614 | if (vdev->config->enable_vq_after_reset(_vq)) | ^~ make: *** [<builtin>: virtio_ring.o] Error 1 Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> Message-Id: <20220830110549.103168-1-xuanzhuo@linux.alibaba.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
1 parent 1bedcf2 commit dbe449d

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

tools/virtio/linux/virtio.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ struct virtio_device {
1414
u64 features;
1515
struct list_head vqs;
1616
spinlock_t vqs_list_lock;
17+
const struct virtio_config_ops *config;
1718
};
1819

1920
struct virtqueue {
@@ -23,7 +24,9 @@ struct virtqueue {
2324
struct virtio_device *vdev;
2425
unsigned int index;
2526
unsigned int num_free;
27+
unsigned int num_max;
2628
void *priv;
29+
bool reset;
2730
};
2831

2932
/* Interfaces exported by virtio_ring. */

tools/virtio/linux/virtio_config.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
#include <linux/virtio.h>
44
#include <uapi/linux/virtio_config.h>
55

6+
struct virtio_config_ops {
7+
int (*disable_vq_and_reset)(struct virtqueue *vq);
8+
int (*enable_vq_after_reset)(struct virtqueue *vq);
9+
};
10+
611
/*
712
* __virtio_test_bit - helper to test feature bits. For use by transports.
813
* Devices should normally use virtio_has_feature,

0 commit comments

Comments
 (0)