From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [PATCH 03/12] Switch build system to accompanied kernel headers Date: Wed, 22 Jun 2011 23:37:19 +0200 Message-ID: <4E02608F.7010500@web.de> References: <4E0255D7.9080202@mail.berlios.de> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig7694EED0EAFB99605EFA12E7" Cc: Anthony Liguori , kvm@vger.kernel.org, Marcelo Tosatti , Alexander Graf , qemu-devel@nongnu.org, Avi Kivity To: Stefan Weil Return-path: Received: from fmmailgate01.web.de ([217.72.192.221]:58811 "EHLO fmmailgate01.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758920Ab1FVVh0 (ORCPT ); Wed, 22 Jun 2011 17:37:26 -0400 In-Reply-To: <4E0255D7.9080202@mail.berlios.de> Sender: kvm-owner@vger.kernel.org List-ID: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig7694EED0EAFB99605EFA12E7 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable On 2011-06-22 22:51, Stefan Weil wrote: > Am 08.06.2011 16:10, schrieb Jan Kiszka: >> This helps reducing our build-time checks for feature support in the >> available Linux kernel headers. And it helps users that do not have >> sufficiently recent headers installed on their build machine. >> >> Consequently, the patch removes and build-time checks for kvm and vhos= t >> in configure, the --kerneldir switch, and KVM_CFLAGS. Kernel headers a= re >> supposed to be provided by QEMU only. >> >> s390 needs some extra love as it carries redefinitions from kernel >> headers. >> >> CC: Alexander Graf >> Signed-off-by: Jan Kiszka >> --- >> Makefile.target | 4 +- >> configure | 151 ++++++---------------------------------------- >> target-s390x/cpu.h | 10 --- >> target-s390x/op_helper.c | 1 + >> 4 files changed, 21 insertions(+), 145 deletions(-) >> >> diff --git a/Makefile.target b/Makefile.target >> index 5c22df8..be9c0e8 100644 >> --- a/Makefile.target >> +++ b/Makefile.target >> @@ -14,7 +14,7 @@ endif >> >> TARGET_PATH=3D$(SRC_PATH)/target-$(TARGET_BASE_ARCH) >> $(call set-vpath, $(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw) >> -QEMU_CFLAGS+=3D -I.. -I$(TARGET_PATH) -DNEED_CPU_H >> +QEMU_CFLAGS+=3D -I.. -I../linux-headers -I$(TARGET_PATH) -DNEED_CPU_H= >> >> include $(SRC_PATH)/Makefile.objs >> >> @@ -37,8 +37,6 @@ ifndef CONFIG_HAIKU >> LIBS+=3D-lm >> endif >> >> -kvm.o kvm-all.o vhost.o vhost_net.o kvmclock.o: >> QEMU_CFLAGS+=3D$(KVM_CFLAGS) >> - >> config-target.h: config-target.h-timestamp >> config-target.h-timestamp: config-target.mak >> >> diff --git a/configure b/configure >> index d38b952..0e1dc46 100755 >> --- a/configure >> +++ b/configure >> @@ -113,8 +113,7 @@ curl=3D"" >> curses=3D"" >> docs=3D"" >> fdt=3D"" >> -kvm=3D"" >> -kvm_para=3D"" >> +kvm=3D"yes" >> nptl=3D"" >=20 > Are you planning to add kvm support for all platforms which don't > support it today? That would mean replacing all their kernels with Linux. Will take a bit longer. I simply overshot with my cleanups: diff --git a/configure b/configure index 3286e33..e6847c4 100755 --- a/configure +++ b/configure @@ -113,7 +113,7 @@ curl=3D"" curses=3D"" docs=3D"" fdt=3D"" -kvm=3D"yes" +kvm=3D"" nptl=3D"" sdl=3D"" vnc=3D"yes" @@ -129,7 +129,7 @@ xen=3D"" xen_ctrl_version=3D"" linux_aio=3D"" attr=3D"" -vhost_net=3D"yes" +vhost_net=3D"" xfs=3D"" gprof=3D"no" @@ -457,6 +457,8 @@ Haiku) linux=3D"yes" linux_user=3D"yes" usb=3D"linux" + kvm=3D"yes" + vhost_net=3D"yes" if [ "$cpu" =3D "i386" -o "$cpu" =3D "x86_64" ] ; then audio_possible_drivers=3D"$audio_possible_drivers fmod" fi Will post this as a patch tomorrow. > If not, kvm=3D"yes" should be restricted to platforms with kvm support.= >=20 > Otherwise, QEMU builds will fail very early: >=20 > ERROR: Host kernel lacks signalfd() support, > but KVM depends on it when the IO thread is disabled. >=20 > Of course, users of those non-kvm platforms can set --disable-kvm, > but I don't think that is the correct solution. >=20 > Even with kvm disabled, builds still fail for non-kvm systems: >=20 > In file included from /qemu/hw/kvmclock.c:21: > /qemu/linux-headers/linux/kvm_para.h:26:26: warning: asm/kvm_para.h: N= o > such file or directory That indicates symlink emulation under Windows does not support directories. Can you confirm this (check what /linux-headers/asm became)? Then we would have to link all files in the arch header dir individually. Jan --------------enig7694EED0EAFB99605EFA12E7 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/ iEYEARECAAYFAk4CYJQACgkQitSsb3rl5xSxPwCfV62knv1wo87imKyyKC62iUfH h4AAnjXSvMskDwFafIhy3KHN+P5b8xBf =zCZ3 -----END PGP SIGNATURE----- --------------enig7694EED0EAFB99605EFA12E7--