Patchwork update-linux-headers.sh: Pull in asm-generic/kvm_para.h

login
register
mail settings
Submitter Peter Maydell
Date July 25, 2012, 3:29 p.m.
Message ID <1343230147-25557-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/173202/
State New
Headers show

Comments

Peter Maydell - July 25, 2012, 3:29 p.m.
Add asm-generic/kvm_para.h to the set of non-architecture specific
KVM kernel headers we copy into QEMU. This header may be included
by an architecture's kvm_para.h header.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 scripts/update-linux-headers.sh |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
Jan Kiszka - July 28, 2012, 10:20 a.m.
On 2012-07-25 17:29, Peter Maydell wrote:
> Add asm-generic/kvm_para.h to the set of non-architecture specific
> KVM kernel headers we copy into QEMU. This header may be included
> by an architecture's kvm_para.h header.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  scripts/update-linux-headers.sh |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 9d2a4bc..a639c5b 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -46,6 +46,11 @@ mkdir -p "$output/linux-headers/linux"
>  for header in kvm.h kvm_para.h vhost.h virtio_config.h virtio_ring.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
> 

Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
Peter Maydell - Aug. 8, 2012, 12:34 p.m.
Ping?

patchwork url: http://patchwork.ozlabs.org/patch/173202/

-- PMM

On 25 July 2012 16:29, Peter Maydell <peter.maydell@linaro.org> wrote:
> Add asm-generic/kvm_para.h to the set of non-architecture specific
> KVM kernel headers we copy into QEMU. This header may be included
> by an architecture's kvm_para.h header.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  scripts/update-linux-headers.sh |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 9d2a4bc..a639c5b 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -46,6 +46,11 @@ mkdir -p "$output/linux-headers/linux"
>  for header in kvm.h kvm_para.h vhost.h virtio_config.h virtio_ring.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
> --
> 1.7.5.4
Peter Maydell - Aug. 13, 2012, 9:24 a.m.
Ping^2 ?

On 8 August 2012 13:34, Peter Maydell <peter.maydell@linaro.org> wrote:
> Ping?
>
> patchwork url: http://patchwork.ozlabs.org/patch/173202/
>
> -- PMM
>
> On 25 July 2012 16:29, Peter Maydell <peter.maydell@linaro.org> wrote:
>> Add asm-generic/kvm_para.h to the set of non-architecture specific
>> KVM kernel headers we copy into QEMU. This header may be included
>> by an architecture's kvm_para.h header.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>>  scripts/update-linux-headers.sh |    5 +++++
>>  1 files changed, 5 insertions(+), 0 deletions(-)
>>
>> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
>> index 9d2a4bc..a639c5b 100755
>> --- a/scripts/update-linux-headers.sh
>> +++ b/scripts/update-linux-headers.sh
>> @@ -46,6 +46,11 @@ mkdir -p "$output/linux-headers/linux"
>>  for header in kvm.h kvm_para.h vhost.h virtio_config.h virtio_ring.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
>> --
>> 1.7.5.4
Anthony Liguori - Aug. 13, 2012, 2:24 p.m.
Peter Maydell <peter.maydell@linaro.org> writes:

> Ping^2 ?

In a previous thread, we all agreed that all changes to linux headers
would come in through uq/master to ensure that we didn't have a repeat
scenario of depending on a header that didn't make it to Avi's tree
unchanged.

Avi/Marcelo, can you guys pick this up through uq/master?

Regards,

Anthony Liguori

>
> On 8 August 2012 13:34, Peter Maydell <peter.maydell@linaro.org> wrote:
>> Ping?
>>
>> patchwork url: http://patchwork.ozlabs.org/patch/173202/
>>
>> -- PMM
>>
>> On 25 July 2012 16:29, Peter Maydell <peter.maydell@linaro.org> wrote:
>>> Add asm-generic/kvm_para.h to the set of non-architecture specific
>>> KVM kernel headers we copy into QEMU. This header may be included
>>> by an architecture's kvm_para.h header.
>>>
>>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>>> ---
>>>  scripts/update-linux-headers.sh |    5 +++++
>>>  1 files changed, 5 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
>>> index 9d2a4bc..a639c5b 100755
>>> --- a/scripts/update-linux-headers.sh
>>> +++ b/scripts/update-linux-headers.sh
>>> @@ -46,6 +46,11 @@ mkdir -p "$output/linux-headers/linux"
>>>  for header in kvm.h kvm_para.h vhost.h virtio_config.h virtio_ring.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
>>> --
>>> 1.7.5.4
Peter Maydell - Aug. 13, 2012, 4:05 p.m.
On 13 August 2012 15:24, Anthony Liguori <aliguori@us.ibm.com> wrote:
> Peter Maydell <peter.maydell@linaro.org> writes:
>> [re patchwork url: http://patchwork.ozlabs.org/patch/173202/ ]
>> Ping^2 ?
>
> In a previous thread, we all agreed that all changes to linux headers
> would come in through uq/master to ensure that we didn't have a repeat
> scenario of depending on a header that didn't make it to Avi's tree
> unchanged.
>
> Avi/Marcelo, can you guys pick this up through uq/master?

Applies also to http://patchwork.ozlabs.org/patch/171628/
I guess.

thanks
-- PMM
Marcelo Tosatti - Aug. 14, 2012, 10:23 p.m.
On Wed, Jul 25, 2012 at 04:29:07PM +0100, Peter Maydell wrote:
> Add asm-generic/kvm_para.h to the set of non-architecture specific
> KVM kernel headers we copy into QEMU. This header may be included
> by an architecture's kvm_para.h header.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  scripts/update-linux-headers.sh |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)

Applied, thanks.

Patch

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 9d2a4bc..a639c5b 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -46,6 +46,11 @@  mkdir -p "$output/linux-headers/linux"
 for header in kvm.h kvm_para.h vhost.h virtio_config.h virtio_ring.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