From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [Qemu-devel] [PATCH] update-linux-headers.sh: Handle new kernel uapi/ directories Date: Tue, 30 Oct 2012 19:33:16 +0100 Message-ID: <50901D6C.4010109@web.de> References: <1350906879-31721-1-git-send-email-peter.maydell@linaro.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig4A222D3130BAAABF0E50C7FB" Cc: qemu-devel@nongnu.org, Marcelo Tosatti , Avi Kivity , kvm@vger.kernel.org, patches@linaro.org To: Peter Maydell Return-path: Received: from mout.web.de ([212.227.15.4]:49381 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965234Ab2J3SdY (ORCPT ); Tue, 30 Oct 2012 14:33:24 -0400 In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig4A222D3130BAAABF0E50C7FB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 2012-10-30 10:48, Peter Maydell wrote: > Ping? >=20 > (patchwork url http://patchwork.ozlabs.org/patch/193125/) Should obviously go in soon. Jan >=20 > thanks > -- PMM >=20 > On 22 October 2012 13:54, Peter Maydell wrot= e: >> 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 >> --- >> 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-he= aders.sh >> index 67be2ef..4c7b566 100755 >> --- a/scripts/update-linux-headers.sh >> +++ b/scripts/update-linux-headers.sh >> @@ -34,7 +34,8 @@ ARCHLIST=3D$(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 --------------enig4A222D3130BAAABF0E50C7FB 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.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iEYEARECAAYFAlCQHWwACgkQitSsb3rl5xR45QCg7ieCg7tFJj+08eT2AW08uFwO 7GsAniSDXQl3qUuJsEu7YFKnfE01FVrV =EPjH -----END PGP SIGNATURE----- --------------enig4A222D3130BAAABF0E50C7FB-- From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTGcw-0004kt-9F for qemu-devel@nongnu.org; Tue, 30 Oct 2012 14:33:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTGcq-0006bq-B2 for qemu-devel@nongnu.org; Tue, 30 Oct 2012 14:33:26 -0400 Received: from mout.web.de ([212.227.15.4]:57703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTGcp-0006bU-Rf for qemu-devel@nongnu.org; Tue, 30 Oct 2012 14:33:20 -0400 Message-ID: <50901D6C.4010109@web.de> Date: Tue, 30 Oct 2012 19:33:16 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <1350906879-31721-1-git-send-email-peter.maydell@linaro.org> In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig4A222D3130BAAABF0E50C7FB" Subject: Re: [Qemu-devel] [PATCH] update-linux-headers.sh: Handle new kernel uapi/ directories List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: patches@linaro.org, Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org, Avi Kivity This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig4A222D3130BAAABF0E50C7FB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 2012-10-30 10:48, Peter Maydell wrote: > Ping? >=20 > (patchwork url http://patchwork.ozlabs.org/patch/193125/) Should obviously go in soon. Jan >=20 > thanks > -- PMM >=20 > On 22 October 2012 13:54, Peter Maydell wrot= e: >> 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 >> --- >> 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-he= aders.sh >> index 67be2ef..4c7b566 100755 >> --- a/scripts/update-linux-headers.sh >> +++ b/scripts/update-linux-headers.sh >> @@ -34,7 +34,8 @@ ARCHLIST=3D$(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 --------------enig4A222D3130BAAABF0E50C7FB 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.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iEYEARECAAYFAlCQHWwACgkQitSsb3rl5xR45QCg7ieCg7tFJj+08eT2AW08uFwO 7GsAniSDXQl3qUuJsEu7YFKnfE01FVrV =EPjH -----END PGP SIGNATURE----- --------------enig4A222D3130BAAABF0E50C7FB--