diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-15 11:15:02 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-15 11:15:02 -0500 |
| commit | cc92186773df8c9aae8f812fff85e7325e1d7583 (patch) | |
| tree | 023bfbffa648a28153ab3c5aad978c09e4a20c4b /scripts | |
| parent | 8fa27d21a993e261137d15def5475ba2c4d8985b (diff) | |
| parent | 256d046ca70788e4cb3aad56cda64ad81f19b7cd (diff) | |
| download | qemu-cc92186773df8c9aae8f812fff85e7325e1d7583.zip qemu-cc92186773df8c9aae8f812fff85e7325e1d7583.tar.gz qemu-cc92186773df8c9aae8f812fff85e7325e1d7583.tar.bz2 | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
update-linux-headers.sh: Pull in asm-generic/kvm_para.h
kvmvapic: Disable if there is insufficient memory
kvm: i8254: Finish time conversion fix
kvm: i8254: Cache kernel clock offset in KVMPITState
Diffstat (limited to 'scripts')
| -rwxr-xr-x | 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 |