From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Wanpeng Li" <kernellwp@gmail.com>,
"Brijesh Singh" <brijesh.singh@amd.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
kvm@vger.kernel.org, "Radim Krčmář" <rkrcmar@redhat.com>,
"Cornelia Huck" <cohuck@redhat.com>,
"Roman Kagan" <rkagan@virtuozzo.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [PATCH 1/4] update-linux-headers.sh: drop kvm_para.h hacks
Date: Tue, 17 Apr 2018 21:58:21 +0300 [thread overview]
Message-ID: <1523991487-241006-2-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1523991487-241006-1-git-send-email-mst@redhat.com>
It turns out (as will be clear from follow-up patches)
we do not really need any kvm para macros host side
for now, except on x86, and there we need it
unconditionally whether we run on kvm or we don't.
Import the x86 asm/kvm_para.h into standard-headers,
follow-up patches remove a bunch of code using this.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
| 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
--git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 5b1d8dc..a017b53 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -43,6 +43,7 @@ cp_portable() {
-e 'limits' \
-e 'linux/kernel' \
-e 'linux/sysinfo' \
+ -e 'asm-generic/kvm_para' \
> /dev/null
then
echo "Unexpected #include in input file $f".
@@ -98,13 +99,9 @@ for arch in $ARCHLIST; do
rm -rf "$output/linux-headers/asm-$arch"
mkdir -p "$output/linux-headers/asm-$arch"
- for header in kvm.h kvm_para.h unistd.h; do
+ for header in kvm.h unistd.h; do
cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch"
done
- if [ $arch = powerpc ]; then
- cp "$tmpdir/include/asm/epapr_hcalls.h" "$output/linux-headers/asm-powerpc/"
- fi
-
rm -rf "$output/include/standard-headers/asm-$arch"
mkdir -p "$output/include/standard-headers/asm-$arch"
if [ $arch = s390 ]; then
@@ -124,20 +121,17 @@ EOF
cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"
cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
+ cp_portable "$tmpdir/include/asm/kvm_para.h" "$output/include/standard-headers/asm-$arch"
fi
done
rm -rf "$output/linux-headers/linux"
mkdir -p "$output/linux-headers/linux"
-for header in kvm.h kvm_para.h vfio.h vfio_ccw.h vhost.h \
+for header in kvm.h vfio.h vfio_ccw.h vhost.h \
psci.h psp-sev.h userfaultfd.h; do
cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux"
done
-rm -rf "$output/linux-headers/asm-generic"
-mkdir -p "$output/linux-headers/asm-generic"
-for header in kvm_para.h; do
- cp "$tmpdir/include/asm-generic/$header" "$output/linux-headers/asm-generic"
-done
+
if [ -L "$linux/source" ]; then
cp "$linux/source/COPYING" "$output/linux-headers"
else
--
MST
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Wanpeng Li" <kernellwp@gmail.com>,
kvm@vger.kernel.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Roman Kagan" <rkagan@virtuozzo.com>,
"Brijesh Singh" <brijesh.singh@amd.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Cornelia Huck" <cohuck@redhat.com>
Subject: [Qemu-devel] [PATCH 1/4] update-linux-headers.sh: drop kvm_para.h hacks
Date: Tue, 17 Apr 2018 21:58:21 +0300 [thread overview]
Message-ID: <1523991487-241006-2-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1523991487-241006-1-git-send-email-mst@redhat.com>
It turns out (as will be clear from follow-up patches)
we do not really need any kvm para macros host side
for now, except on x86, and there we need it
unconditionally whether we run on kvm or we don't.
Import the x86 asm/kvm_para.h into standard-headers,
follow-up patches remove a bunch of code using this.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
| 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
--git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 5b1d8dc..a017b53 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -43,6 +43,7 @@ cp_portable() {
-e 'limits' \
-e 'linux/kernel' \
-e 'linux/sysinfo' \
+ -e 'asm-generic/kvm_para' \
> /dev/null
then
echo "Unexpected #include in input file $f".
@@ -98,13 +99,9 @@ for arch in $ARCHLIST; do
rm -rf "$output/linux-headers/asm-$arch"
mkdir -p "$output/linux-headers/asm-$arch"
- for header in kvm.h kvm_para.h unistd.h; do
+ for header in kvm.h unistd.h; do
cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch"
done
- if [ $arch = powerpc ]; then
- cp "$tmpdir/include/asm/epapr_hcalls.h" "$output/linux-headers/asm-powerpc/"
- fi
-
rm -rf "$output/include/standard-headers/asm-$arch"
mkdir -p "$output/include/standard-headers/asm-$arch"
if [ $arch = s390 ]; then
@@ -124,20 +121,17 @@ EOF
cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"
cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
+ cp_portable "$tmpdir/include/asm/kvm_para.h" "$output/include/standard-headers/asm-$arch"
fi
done
rm -rf "$output/linux-headers/linux"
mkdir -p "$output/linux-headers/linux"
-for header in kvm.h kvm_para.h vfio.h vfio_ccw.h vhost.h \
+for header in kvm.h vfio.h vfio_ccw.h vhost.h \
psci.h psp-sev.h userfaultfd.h; do
cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux"
done
-rm -rf "$output/linux-headers/asm-generic"
-mkdir -p "$output/linux-headers/asm-generic"
-for header in kvm_para.h; do
- cp "$tmpdir/include/asm-generic/$header" "$output/linux-headers/asm-generic"
-done
+
if [ -L "$linux/source" ]; then
cp "$linux/source/COPYING" "$output/linux-headers"
else
--
MST
next prev parent reply other threads:[~2018-04-17 18:58 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-17 18:58 [PATCH 0/4] move kvm_para.h to standard-headers Michael S. Tsirkin
2018-04-17 18:58 ` [Qemu-devel] " Michael S. Tsirkin
2018-04-17 18:58 ` Michael S. Tsirkin [this message]
2018-04-17 18:58 ` [Qemu-devel] [PATCH 1/4] update-linux-headers.sh: drop kvm_para.h hacks Michael S. Tsirkin
2018-04-17 21:12 ` Eduardo Habkost
2018-04-17 21:12 ` [Qemu-devel] " Eduardo Habkost
2018-04-18 7:54 ` Cornelia Huck
2018-04-18 7:54 ` [Qemu-devel] " Cornelia Huck
2018-04-18 16:05 ` Michael S. Tsirkin
2018-04-18 16:05 ` [Qemu-devel] " Michael S. Tsirkin
2018-04-18 17:41 ` Cornelia Huck
2018-04-18 17:41 ` [Qemu-devel] " Cornelia Huck
2018-04-18 17:42 ` Cornelia Huck
2018-04-18 17:42 ` [Qemu-devel] " Cornelia Huck
2018-04-17 18:58 ` [PATCH 3/4] x86/cpu: use standard-headers/asm-x86.kvm_para.h Michael S. Tsirkin
2018-04-17 18:58 ` [Qemu-devel] " Michael S. Tsirkin
2018-04-17 20:05 ` Eduardo Habkost
2018-04-17 20:05 ` [Qemu-devel] " Eduardo Habkost
2018-04-17 18:58 ` [PATCH 2/4] include/standard-headers: add asm-x86/kvm_para.h Michael S. Tsirkin
2018-04-17 18:58 ` [Qemu-devel] " Michael S. Tsirkin
2018-04-17 21:12 ` Eduardo Habkost
2018-04-17 21:12 ` [Qemu-devel] " Eduardo Habkost
2018-04-17 18:58 ` [PATCH 4/4] linux-headers: drop kvm_para.h Michael S. Tsirkin
2018-04-17 18:58 ` [Qemu-devel] " Michael S. Tsirkin
2018-04-17 22:05 ` Eduardo Habkost
2018-04-17 22:05 ` [Qemu-devel] " Eduardo Habkost
2018-04-17 19:05 ` [PATCH 0/4] move kvm_para.h to standard-headers no-reply
2018-04-17 19:05 ` [Qemu-devel] " no-reply
2018-05-15 12:33 ` Michael S. Tsirkin
2018-05-15 12:33 ` [Qemu-devel] " Michael S. Tsirkin
2018-05-15 12:56 ` Paolo Bonzini
2018-05-15 12:56 ` [Qemu-devel] " Paolo Bonzini
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=1523991487-241006-2-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=brijesh.singh@amd.com \
--cc=cohuck@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kernellwp@gmail.com \
--cc=kraxel@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rkagan@virtuozzo.com \
--cc=rkrcmar@redhat.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.