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: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

2 files changed, 32 insertions, 30 deletions

diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h
index da96e3eaa641..647d974da392 100644
--- a/drivers/block/xen-blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
@@ -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__ */
diff --git a/include/xen/blkif.h b/include/xen/blkif.h
index ab794269fc53..6ed7c01253b2 100644
--- a/include/xen/blkif.h
+++ b/include/xen/blkif.h
@@ -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__ */