diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-04 12:28:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-04 12:28:05 +0200 |
| commit | 3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4 (patch) | |
| tree | 58fbef582846fef0e777b1a552aca12e21a071b1 /tools | |
| parent | Merge branch 'perf/core' of ssh://k/pub/scm/linux/kernel/git/acme/linux into ... (diff) | |
| parent | perf: Comment /proc/sys/kernel/perf_event_paranoid to be part of user ABI (diff) | |
| download | linux-3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4.tar.xz linux-3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4.zip | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/util/python.c
Merge reason: resolve the conflict with perf/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/virtio/virtio_test.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c index df0c6d2c3860..74d3331bdaf9 100644 --- a/tools/virtio/virtio_test.c +++ b/tools/virtio/virtio_test.c @@ -198,6 +198,14 @@ const struct option longopts[] = { .val = 'h', }, { + .name = "event-idx", + .val = 'E', + }, + { + .name = "no-event-idx", + .val = 'e', + }, + { .name = "indirect", .val = 'I', }, @@ -211,13 +219,17 @@ const struct option longopts[] = { static void help() { - fprintf(stderr, "Usage: virtio_test [--help] [--no-indirect]\n"); + fprintf(stderr, "Usage: virtio_test [--help]" + " [--no-indirect]" + " [--no-event-idx]" + "\n"); } int main(int argc, char **argv) { struct vdev_info dev; - unsigned long long features = 1ULL << VIRTIO_RING_F_INDIRECT_DESC; + unsigned long long features = (1ULL << VIRTIO_RING_F_INDIRECT_DESC) | + (1ULL << VIRTIO_RING_F_EVENT_IDX); int o; for (;;) { @@ -228,6 +240,9 @@ int main(int argc, char **argv) case '?': help(); exit(2); + case 'e': + features &= ~(1ULL << VIRTIO_RING_F_EVENT_IDX); + break; case 'h': help(); goto done; |