diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-25 11:50:49 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-25 11:50:49 +1000 |
commit | a3118746b75bac01f9b9bb1f7ec0cacce9a4f4fd (patch) | |
tree | bd6b943146a587692e6f91eb7501098cd054ce52 /tools | |
parent | 74d5cfa760ba4ffcc59bdcb4169726b1ae3e356c (diff) | |
parent | 927cfb9788475abd5cf5e6566bb1cf46d29b0694 (diff) |
Merge remote-tracking branch 'virtio/virtio-next'
Diffstat (limited to 'tools')
-rw-r--r-- | tools/lguest/lguest.c | 6 | ||||
-rw-r--r-- | tools/virtio/.gitignore | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tools/lguest/lguest.c b/tools/lguest/lguest.c index 68f67cf3d318..32cf2ce15d69 100644 --- a/tools/lguest/lguest.c +++ b/tools/lguest/lguest.c @@ -42,6 +42,10 @@ #include <pwd.h> #include <grp.h> +#ifndef VIRTIO_F_ANY_LAYOUT +#define VIRTIO_F_ANY_LAYOUT 27 +#endif + /*L:110 * We can ignore the 43 include files we need for this program, but I do want * to draw attention to the use of kernel-style types. @@ -1544,6 +1548,8 @@ static void setup_tun_net(char *arg) add_feature(dev, VIRTIO_NET_F_HOST_ECN); /* We handle indirect ring entries */ add_feature(dev, VIRTIO_RING_F_INDIRECT_DESC); + /* We're compliant with the damn spec. */ + add_feature(dev, VIRTIO_F_ANY_LAYOUT); set_config(dev, sizeof(conf), &conf); /* We don't need the socket any more; setup is done. */ diff --git a/tools/virtio/.gitignore b/tools/virtio/.gitignore new file mode 100644 index 000000000000..1cfbb0157a46 --- /dev/null +++ b/tools/virtio/.gitignore @@ -0,0 +1,3 @@ +*.d +virtio_test +vringh_test |