From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH 00/12] [uq/master] Import linux headers and some cleanups Date: Wed, 8 Jun 2011 16:10:54 +0200 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Christoph Hellwig , Eduardo Habkost , Peter Maydell To: Avi Kivity , Marcelo Tosatti Return-path: Received: from thoth.sbs.de ([192.35.17.2]:22216 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755876Ab1FHOLS (ORCPT ); Wed, 8 Jun 2011 10:11:18 -0400 Sender: kvm-owner@vger.kernel.org List-ID: Licensing of the virtio headers is no clarified. So we can finally resolve the clumbsy and constantly buggy #ifdef'ery around old KVM and virtio headers. Recent example: current qemu-kvm does not build against 2.6.32 headers. This series introduces an import mechanism for all required Linux headers so that the appropriate versions can be kept safely inside the QEMU tree. I've incorporated all the valuable review comments on the first version and rebased the result over current uq/master after rebasing that one over current QEMU master. Please note that I had no chance to test-build PPC or s390. Beside the header topic, this series also includes a few assorted KVM cleanup patches so that my queue is empty again. CC: Alexander Graf CC: Andreas F=C3=A4rber CC: Christoph Hellwig CC: Eduardo Habkost CC: Peter Maydell Jan Kiszka (12): Add kernel header update script Import kernel headers Switch build system to accompanied kernel headers kvm: Drop CONFIG_KVM_PARA kvm: ppc: Drop CONFIG_KVM_PPC_PVR kvm: Drop useless zero-initializations kvm: Drop KVM_CAP build dependencies kvm: x86: Drop KVM_CAP build dependencies kvm: ppc: Drop KVM_CAP build dependencies kvm: Clean up stubs kvm: x86: Pass KVMState to kvm_arch_get_supported_cpuid Remove unneeded kvm.h from cpu-exec.c Makefile.target | 4 +- configure | 149 +------ cpu-exec.c | 1 - hw/kvmclock.c | 9 - kvm-all.c | 13 - kvm-stub.c | 18 +- kvm.h | 2 +- linux-headers/COPYING | 356 +++++++++++++++ linux-headers/README | 2 + linux-headers/asm-powerpc/kvm.h | 275 ++++++++++++ linux-headers/asm-powerpc/kvm_para.h | 53 +++ linux-headers/asm-s390/kvm.h | 44 ++ linux-headers/asm-s390/kvm_para.h | 17 + linux-headers/asm-x86/hyperv.h | 193 ++++++++ linux-headers/asm-x86/kvm.h | 324 ++++++++++++++ linux-headers/asm-x86/kvm_para.h | 79 ++++ linux-headers/linux/kvm.h | 804 ++++++++++++++++++++++++++= ++++++++ linux-headers/linux/kvm_para.h | 29 ++ linux-headers/linux/vhost.h | 130 ++++++ linux-headers/linux/virtio_config.h | 54 +++ linux-headers/linux/virtio_ring.h | 163 +++++++ scripts/update-linux-headers.sh | 55 +++ target-i386/cpuid.c | 20 +- target-i386/kvm.c | 123 +----- target-ppc/kvm.c | 23 - target-s390x/cpu.h | 10 - target-s390x/op_helper.c | 1 + 27 files changed, 2630 insertions(+), 321 deletions(-) create mode 100644 linux-headers/COPYING create mode 100644 linux-headers/README create mode 100644 linux-headers/asm-powerpc/kvm.h create mode 100644 linux-headers/asm-powerpc/kvm_para.h create mode 100644 linux-headers/asm-s390/kvm.h create mode 100644 linux-headers/asm-s390/kvm_para.h create mode 100644 linux-headers/asm-x86/hyperv.h create mode 100644 linux-headers/asm-x86/kvm.h create mode 100644 linux-headers/asm-x86/kvm_para.h create mode 100644 linux-headers/linux/kvm.h create mode 100644 linux-headers/linux/kvm_para.h create mode 100644 linux-headers/linux/vhost.h create mode 100644 linux-headers/linux/virtio_config.h create mode 100644 linux-headers/linux/virtio_ring.h create mode 100755 scripts/update-linux-headers.sh