summaryrefslogtreecommitdiffstats
path: root/sys/xen/blkif.h
diff options
context:
space:
mode:
authorroyger <royger@FreeBSD.org>2015-07-21 07:22:18 +0000
committerroyger <royger@FreeBSD.org>2015-07-21 07:22:18 +0000
commit0dafb147a9f694fe943d5634209b52b90a360dcc (patch)
tree729614725d8a6445e61e2f585f81298e93b7bcd5 /sys/xen/blkif.h
parent1266acc975217e8ef2550e592dbddc943821fcad (diff)
downloadFreeBSD-src-0dafb147a9f694fe943d5634209b52b90a360dcc.zip
FreeBSD-src-0dafb147a9f694fe943d5634209b52b90a360dcc.tar.gz
MFC: r284296
xen-blk{front/back}: remove broken FreeBSD extensions Approved by: re (gjb)
Diffstat (limited to 'sys/xen/blkif.h')
-rw-r--r--sys/xen/blkif.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/xen/blkif.h b/sys/xen/blkif.h
index 48b71ea..8a19d5d 100644
--- a/sys/xen/blkif.h
+++ b/sys/xen/blkif.h
@@ -46,7 +46,7 @@ struct blkif_x86_32_request {
blkif_vdev_t handle; /* only for read/write requests */
uint64_t id; /* private guest value, echoed in resp */
blkif_sector_t sector_number;/* start sector idx on disk (r/w only) */
- struct blkif_request_segment seg[BLKIF_MAX_SEGMENTS_PER_HEADER_BLOCK];
+ struct blkif_request_segment seg[BLKIF_MAX_SEGMENTS_PER_REQUEST];
};
struct blkif_x86_32_response {
uint64_t id; /* copied from request */
@@ -64,7 +64,7 @@ struct blkif_x86_64_request {
blkif_vdev_t handle; /* only for read/write requests */
uint64_t __attribute__((__aligned__(8))) id;
blkif_sector_t sector_number;/* start sector idx on disk (r/w only) */
- struct blkif_request_segment seg[BLKIF_MAX_SEGMENTS_PER_HEADER_BLOCK];
+ struct blkif_request_segment seg[BLKIF_MAX_SEGMENTS_PER_REQUEST];
};
struct blkif_x86_64_response {
uint64_t __attribute__((__aligned__(8))) id;
@@ -114,7 +114,7 @@ enum blkif_protocol {
static void inline blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_request_t *src)
{
- int i, n = BLKIF_MAX_SEGMENTS_PER_HEADER_BLOCK;
+ int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;
dst->operation = src->operation;
dst->nr_segments = src->nr_segments;
dst->handle = src->handle;
@@ -129,7 +129,7 @@ static void inline blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque
static void inline blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_request_t *src)
{
- int i, n = BLKIF_MAX_SEGMENTS_PER_HEADER_BLOCK;
+ int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;
dst->operation = src->operation;
dst->nr_segments = src->nr_segments;
dst->handle = src->handle;
OpenPOWER on IntegriCloud