projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clk: rockchip: rk3368: Add CLK_IGNORE_UNUSED flag for mipi phy refclk
[firefly-linux-kernel-4.4.55.git]
/
tools
/
virtio
/
virtio_test.c
diff --git
a/tools/virtio/virtio_test.c
b/tools/virtio/virtio_test.c
index db3437c641a64c467d3d7f01d84ffdb8670ef4ea..e0445898f08fa981d372d4de6bad4eebe265cb15 100644
(file)
--- a/
tools/virtio/virtio_test.c
+++ b/
tools/virtio/virtio_test.c
@@
-11,6
+11,7
@@
#include <sys/types.h>
#include <fcntl.h>
#include <stdbool.h>
#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>
#include <linux/vhost.h>
#include <linux/virtio.h>
#include <linux/virtio_ring.h>
@@
-226,6
+227,14
@@
const struct option longopts[] = {
.name = "no-indirect",
.val = 'i',
},
.name = "no-indirect",
.val = 'i',
},
+ {
+ .name = "virtio-1",
+ .val = '1',
+ },
+ {
+ .name = "no-virtio-1",
+ .val = '0',
+ },
{
.name = "delayed-interrupt",
.val = 'D',
{
.name = "delayed-interrupt",
.val = 'D',
@@
-243,6
+252,7
@@
static void help(void)
fprintf(stderr, "Usage: virtio_test [--help]"
" [--no-indirect]"
" [--no-event-idx]"
fprintf(stderr, "Usage: virtio_test [--help]"
" [--no-indirect]"
" [--no-event-idx]"
+ " [--no-virtio-1]"
" [--delayed-interrupt]"
"\n");
}
" [--delayed-interrupt]"
"\n");
}
@@
-251,7
+261,7
@@
int main(int argc, char **argv)
{
struct vdev_info dev;
unsigned long long features = (1ULL << VIRTIO_RING_F_INDIRECT_DESC) |
{
struct vdev_info dev;
unsigned long long features = (1ULL << VIRTIO_RING_F_INDIRECT_DESC) |
- (1ULL << VIRTIO_RING_F_EVENT_IDX);
+ (1ULL << VIRTIO_RING_F_EVENT_IDX)
| (1ULL << VIRTIO_F_VERSION_1)
;
int o;
bool delayed = false;
int o;
bool delayed = false;
@@
-272,6
+282,9
@@
int main(int argc, char **argv)
case 'i':
features &= ~(1ULL << VIRTIO_RING_F_INDIRECT_DESC);
break;
case 'i':
features &= ~(1ULL << VIRTIO_RING_F_INDIRECT_DESC);
break;
+ case '0':
+ features &= ~(1ULL << VIRTIO_F_VERSION_1);
+ break;
case 'D':
delayed = true;
break;
case 'D':
delayed = true;
break;