Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68c88dd7 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk
Browse files

xen/blkback: Move blkif_get_x86_[32|64]_req to common.h in block/xen-blkback dir. 



From the blkif.h header, which was exposed to the frontend.

Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 72468bfc

drivers/block/xen-blkback/common.h

+32 −0
Original line number Diff line number Diff line
@@ -132,4 +132,36 @@ int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt, 


struct xenbus_device *xen_blkbk_xenbus(struct backend_info *be);



static void inline blkif_get_x86_32_req(struct blkif_request *dst,

					struct blkif_x86_32_request *src)

{

	int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;

	dst->operation = src->operation;

	dst->nr_segments = src->nr_segments;

	dst->handle = src->handle;

	dst->id = src->id;

	dst->u.rw.sector_number = src->sector_number;

	barrier();

	if (n > dst->nr_segments)

		n = dst->nr_segments;

	for (i = 0; i < n; i++)

		dst->u.rw.seg[i] = src->seg[i];

}



static void inline blkif_get_x86_64_req(struct blkif_request *dst,

					struct blkif_x86_64_request *src)

{

	int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;

	dst->operation = src->operation;

	dst->nr_segments = src->nr_segments;

	dst->handle = src->handle;

	dst->id = src->id;

	dst->u.rw.sector_number = src->sector_number;

	barrier();

	if (n > dst->nr_segments)

		n = dst->nr_segments;

	for (i = 0; i < n; i++)

		dst->u.rw.seg[i] = src->seg[i];

}



#endif /* __BLKIF__BACKEND__COMMON_H__ */

include/xen/blkif.h

+0 −30
Original line number Diff line number Diff line
@@ -89,34 +89,4 @@ enum blkif_protocol { 
	BLKIF_PROTOCOL_X86_64 = 3,

};



static void inline blkif_get_x86_32_req(struct blkif_request *dst, struct blkif_x86_32_request *src)

{

	int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;

	dst->operation = src->operation;

	dst->nr_segments = src->nr_segments;

	dst->handle = src->handle;

	dst->id = src->id;

	dst->u.rw.sector_number = src->sector_number;

	barrier();

	if (n > dst->nr_segments)

		n = dst->nr_segments;

	for (i = 0; i < n; i++)

		dst->u.rw.seg[i] = src->seg[i];

}



static void inline blkif_get_x86_64_req(struct blkif_request *dst, struct blkif_x86_64_request *src)

{

	int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;

	dst->operation = src->operation;

	dst->nr_segments = src->nr_segments;

	dst->handle = src->handle;

	dst->id = src->id;

	dst->u.rw.sector_number = src->sector_number;

	barrier();

	if (n > dst->nr_segments)

		n = dst->nr_segments;

	for (i = 0; i < n; i++)

		dst->u.rw.seg[i] = src->seg[i];

}



#endif /* __XEN_BLKIF_H__ */