diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-03-22 08:56:32 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-03-22 08:56:32 -0600 |
| commit | 7fbaee72ff62843198980c258d09590536681b15 (patch) | |
| tree | 931d7b3a12fae77ecca9a0caa91b88443f4ec58b /include | |
| parent | 351a2c6e7d265f97799ec7f6b1dde7fc7cb4b92d (diff) | |
| parent | b1173e316bf2ff3c11f46247417f0f5789a4ea0c (diff) | |
| download | linux-3.10-7fbaee72ff62843198980c258d09590536681b15.tar.gz linux-3.10-7fbaee72ff62843198980c258d09590536681b15.tar.bz2 linux-3.10-7fbaee72ff62843198980c258d09590536681b15.zip | |
Merge branch 'stable/for-jens-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Konrad writes:
[the branch] has a bunch of fixes. They vary from being able to deal
with unknown requests, overflow in statistics, compile warnings, bug in
the error path, removal of unnecessary logic. There is also one
performance fix - which is to allocate pages for requests when the
driver loads - instead of doing it per request
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/interface/io/blkif.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/xen/interface/io/blkif.h b/include/xen/interface/io/blkif.h index 01c3d62436e..ffd4652de91 100644 --- a/include/xen/interface/io/blkif.h +++ b/include/xen/interface/io/blkif.h @@ -138,11 +138,21 @@ struct blkif_request_discard { uint8_t _pad3; } __attribute__((__packed__)); +struct blkif_request_other { + uint8_t _pad1; + blkif_vdev_t _pad2; /* only for read/write requests */ +#ifdef CONFIG_X86_64 + uint32_t _pad3; /* offsetof(blkif_req..,u.other.id)==8*/ +#endif + uint64_t id; /* private guest value, echoed in resp */ +} __attribute__((__packed__)); + struct blkif_request { uint8_t operation; /* BLKIF_OP_??? */ union { struct blkif_request_rw rw; struct blkif_request_discard discard; + struct blkif_request_other other; } u; } __attribute__((__packed__)); |