From: Marcel Apfelbaum <marcel@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, ehabkost@redhat.com,
yuval.shaia@oracle.com, marcel@redhat.com, mst@redhat.com,
dotanb@mellanox.com, yanjun.zhu@oracle.com, ghammer@redhat.com
Subject: [Qemu-devel] [PATCH V11 03/10] scripts/update-linux-headers: import pvrdma headers
Date: Wed, 14 Feb 2018 21:22:23 +0200 [thread overview]
Message-ID: <20180214192230.70287-4-marcel@redhat.com> (raw)
In-Reply-To: <20180214192230.70287-1-marcel@redhat.com>
Modify the script to import the headers used by the pvrdma device.
Part of them are interfaces between the guest driver and the device,
import them under include/standart-headers/drivers/infiniband/... .
Remove the unused functions from pvrdma_verbs.h avoiding the
unnecessary import of several infiniband/networking/other headers.
Reviewed-by: Gal Hammer <ghammer@redhat.com>
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
---
| 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
--git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 135a10d96a..be065704df 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -38,6 +38,7 @@ cp_portable() {
-e 'linux/if_ether' \
-e 'input-event-codes' \
-e 'sys/' \
+ -e 'pvrdma_verbs' \
> /dev/null
then
echo "Unexpected #include in input file $f".
@@ -46,6 +47,7 @@ cp_portable() {
header=$(basename "$f");
sed -e 's/__u\([0-9][0-9]*\)/uint\1_t/g' \
+ -e 's/u\([0-9][0-9]*\)/uint\1_t/g' \
-e 's/__s\([0-9][0-9]*\)/int\1_t/g' \
-e 's/__le\([0-9][0-9]*\)/uint\1_t/g' \
-e 's/__be\([0-9][0-9]*\)/uint\1_t/g' \
@@ -56,6 +58,7 @@ cp_portable() {
-e 's/__inline__/inline/' \
-e '/sys\/ioctl.h/d' \
-e 's/SW_MAX/SW_MAX_/' \
+ -e 's/atomic_t/int/' \
"$f" > "$to/$header";
}
@@ -147,6 +150,33 @@ for i in "$tmpdir"/include/linux/*virtio*.h "$tmpdir/include/linux/input.h" \
cp_portable "$i" "$output/include/standard-headers/linux"
done
+rm -rf "$output/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma"
+mkdir -p "$output/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma"
+
+# Remove the unused functions from pvrdma_verbs.h avoiding the unnecessary
+# import of several infiniband/networking/other headers
+tmp_pvrdma_verbs="$tmpdir/pvrdma_verbs.h"
+# Parse the entire file instead of single lines to match
+# function declarations expanding over multiple lines
+# and strip the declarations starting with pvrdma prefix.
+sed -e '1h;2,$H;$!d;g' -e 's/[^};]*pvrdma[^(| ]*([^)]*);//g' \
+ "$linux/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h" > \
+ "$tmp_pvrdma_verbs";
+
+for i in "$linux/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h" \
+ "$linux/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h" \
+ "$tmp_pvrdma_verbs"; do \
+ cp_portable "$i" \
+ "$output/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/"
+done
+
+rm -rf "$output/include/standard-headers/rdma/"
+mkdir -p "$output/include/standard-headers/rdma/"
+for i in "$tmpdir/include/rdma/vmw_pvrdma-abi.h"; do
+ cp_portable "$i" \
+ "$output/include/standard-headers/rdma/"
+done
+
cat <<EOF >$output/include/standard-headers/linux/types.h
/* For QEMU all types are already defined via osdep.h, so this
* header does not need to do anything.
--
2.13.5
next prev parent reply other threads:[~2018-02-14 19:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-14 19:22 [Qemu-devel] [PATCH V11 00/10] hw/pvrdma: PVRDMA device implementation Marcel Apfelbaum
2018-02-14 19:22 ` [Qemu-devel] [PATCH V11 01/10] mem: add share parameter to memory-backend-ram Marcel Apfelbaum
2018-02-14 19:22 ` [Qemu-devel] [PATCH V11 02/10] docs: add pvrdma device documentation Marcel Apfelbaum
2018-02-14 19:22 ` Marcel Apfelbaum [this message]
2018-02-14 19:22 ` [Qemu-devel] [PATCH V11 04/10] include/standard-headers: add pvrdma related headers Marcel Apfelbaum
2018-02-14 19:22 ` [Qemu-devel] [PATCH V11 05/10] hw/rdma: Add wrappers and macros Marcel Apfelbaum
2018-02-14 19:22 ` [Qemu-devel] [PATCH V11 06/10] hw/rdma: Definitions for rdma device and rdma resource manager Marcel Apfelbaum
2018-02-14 19:22 ` [Qemu-devel] [PATCH V11 07/10] hw/rdma: Implementation of generic rdma device layers Marcel Apfelbaum
2018-02-14 19:22 ` [Qemu-devel] [PATCH V11 08/10] hw/rdma: PVRDMA commands and data-path ops Marcel Apfelbaum
2018-02-14 19:22 ` [Qemu-devel] [PATCH V11 09/10] hw/rdma: Implementation of PVRDMA device Marcel Apfelbaum
2018-02-14 19:22 ` [Qemu-devel] [PATCH V11 10/10] MAINTAINERS: add entry for hw/rdma Marcel Apfelbaum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180214192230.70287-4-marcel@redhat.com \
--to=marcel@redhat.com \
--cc=dotanb@mellanox.com \
--cc=ehabkost@redhat.com \
--cc=ghammer@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=yanjun.zhu@oracle.com \
--cc=yuval.shaia@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.