* [Qemu-devel] [PATCH] update-linux-headers.sh: Handle new kernel uapi/ directories
@ 2012-10-22 11:54 Peter Maydell
2012-10-30 9:48 ` Peter Maydell
0 siblings, 1 reply; 4+ messages in thread
From: Peter Maydell @ 2012-10-22 11:54 UTC (permalink / raw)
To: qemu-devel; +Cc: Marcelo Tosatti, Jan Kiszka, Avi Kivity, kvm, patches
Recent kernels have moved to keeping the userspace headers
in uapi/ subdirectories. This breaks the detection of whether an
architecture has KVM support in the kernel because kvm.h has
moved in the kernel source tree. Update the check to support
both the old and new locations.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
This would otherwise cause us to ignore the architectures which
have moved over to uapi/ (which for QEMU's purposes means "everything
but x86"...)
| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 67be2ef..4c7b566 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -34,7 +34,8 @@ ARCHLIST=$(cd "$linux/arch" && echo *)
for arch in $ARCHLIST; do
# Discard anything which isn't a KVM-supporting architecture
- if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ]; then
+ if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ] &&
+ ! [ -e "$linux/arch/$arch/include/uapi/asm/kvm.h" ] ; then
continue
fi
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] update-linux-headers.sh: Handle new kernel uapi/ directories
2012-10-22 11:54 [Qemu-devel] [PATCH] update-linux-headers.sh: Handle new kernel uapi/ directories Peter Maydell
@ 2012-10-30 9:48 ` Peter Maydell
2012-10-30 18:33 ` Jan Kiszka
0 siblings, 1 reply; 4+ messages in thread
From: Peter Maydell @ 2012-10-30 9:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Marcelo Tosatti, Jan Kiszka, Avi Kivity, kvm, patches
Ping?
(patchwork url http://patchwork.ozlabs.org/patch/193125/)
thanks
-- PMM
On 22 October 2012 13:54, Peter Maydell <peter.maydell@linaro.org> wrote:
> Recent kernels have moved to keeping the userspace headers
> in uapi/ subdirectories. This breaks the detection of whether an
> architecture has KVM support in the kernel because kvm.h has
> moved in the kernel source tree. Update the check to support
> both the old and new locations.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> This would otherwise cause us to ignore the architectures which
> have moved over to uapi/ (which for QEMU's purposes means "everything
> but x86"...)
>
> scripts/update-linux-headers.sh | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 67be2ef..4c7b566 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -34,7 +34,8 @@ ARCHLIST=$(cd "$linux/arch" && echo *)
>
> for arch in $ARCHLIST; do
> # Discard anything which isn't a KVM-supporting architecture
> - if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ]; then
> + if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ] &&
> + ! [ -e "$linux/arch/$arch/include/uapi/asm/kvm.h" ] ; then
> continue
> fi
>
> --
> 1.7.9.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] update-linux-headers.sh: Handle new kernel uapi/ directories
2012-10-30 9:48 ` Peter Maydell
@ 2012-10-30 18:33 ` Jan Kiszka
2012-10-31 0:49 ` Marcelo Tosatti
0 siblings, 1 reply; 4+ messages in thread
From: Jan Kiszka @ 2012-10-30 18:33 UTC (permalink / raw)
To: Peter Maydell; +Cc: patches, Marcelo Tosatti, qemu-devel, kvm, Avi Kivity
[-- Attachment #1: Type: text/plain, Size: 1527 bytes --]
On 2012-10-30 10:48, Peter Maydell wrote:
> Ping?
>
> (patchwork url http://patchwork.ozlabs.org/patch/193125/)
Should obviously go in soon.
Jan
>
> thanks
> -- PMM
>
> On 22 October 2012 13:54, Peter Maydell <peter.maydell@linaro.org> wrote:
>> Recent kernels have moved to keeping the userspace headers
>> in uapi/ subdirectories. This breaks the detection of whether an
>> architecture has KVM support in the kernel because kvm.h has
>> moved in the kernel source tree. Update the check to support
>> both the old and new locations.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>> This would otherwise cause us to ignore the architectures which
>> have moved over to uapi/ (which for QEMU's purposes means "everything
>> but x86"...)
>>
>> scripts/update-linux-headers.sh | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
>> index 67be2ef..4c7b566 100755
>> --- a/scripts/update-linux-headers.sh
>> +++ b/scripts/update-linux-headers.sh
>> @@ -34,7 +34,8 @@ ARCHLIST=$(cd "$linux/arch" && echo *)
>>
>> for arch in $ARCHLIST; do
>> # Discard anything which isn't a KVM-supporting architecture
>> - if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ]; then
>> + if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ] &&
>> + ! [ -e "$linux/arch/$arch/include/uapi/asm/kvm.h" ] ; then
>> continue
>> fi
>>
>> --
>> 1.7.9.5
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] update-linux-headers.sh: Handle new kernel uapi/ directories
2012-10-30 18:33 ` Jan Kiszka
@ 2012-10-31 0:49 ` Marcelo Tosatti
0 siblings, 0 replies; 4+ messages in thread
From: Marcelo Tosatti @ 2012-10-31 0:49 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Peter Maydell, patches, qemu-devel, kvm, Avi Kivity
On Tue, Oct 30, 2012 at 07:33:16PM +0100, Jan Kiszka wrote:
> On 2012-10-30 10:48, Peter Maydell wrote:
> > Ping?
> >
> > (patchwork url http://patchwork.ozlabs.org/patch/193125/)
>
> Should obviously go in soon.
>
> Jan
Applied to uq/master, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-31 1:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-22 11:54 [Qemu-devel] [PATCH] update-linux-headers.sh: Handle new kernel uapi/ directories Peter Maydell
2012-10-30 9:48 ` Peter Maydell
2012-10-30 18:33 ` Jan Kiszka
2012-10-31 0:49 ` Marcelo Tosatti
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).