From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HPn2N-000476-N7 for qemu-devel@nongnu.org; Fri, 09 Mar 2007 16:54:07 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HPn2M-00046X-5O for qemu-devel@nongnu.org; Fri, 09 Mar 2007 16:54:07 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HPn2M-00046S-0M for qemu-devel@nongnu.org; Fri, 09 Mar 2007 16:54:06 -0500 Received: from partizan.velesys.com ([213.184.230.195]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HPn1z-0004rv-1p for qemu-devel@nongnu.org; Fri, 09 Mar 2007 16:53:43 -0500 Received: from localhost (partizan [10.0.0.24]) by partizan.velesys.com (paritzan.velesys.com) with ESMTP id 3C534D642BC for ; Fri, 9 Mar 2007 23:54:18 +0200 (EET) Received: from partizan.velesys.com ([10.0.0.24]) by localhost (partizan.velesys.com [10.0.0.24]) (amavisd-new, port 10024) with ESMTP id ivV91J8SXXo4 for ; Fri, 9 Mar 2007 23:54:15 +0200 (EET) Received: from localhost.localdomain (mm-110-150-57-86.adsl.mgts.by [86.57.150.110]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by partizan.velesys.com (paritzan.velesys.com) with ESMTP id 74379D6429B for ; Fri, 9 Mar 2007 23:54:14 +0200 (EET) Date: Fri, 9 Mar 2007 23:53:35 +0200 From: "Kirill A. Shutemov" Message-ID: <20070309215335.GB5629@localhost.localdomain> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dkEUBIird37B8yKS" Content-Disposition: inline Subject: [Qemu-devel] [PATCH] fcntl64 fix Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org --dkEUBIird37B8yKS Content-Type: multipart/mixed; boundary="FkmkrVfFsRoUs1wW" Content-Disposition: inline --FkmkrVfFsRoUs1wW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline TARGET_F_*64 should be used instead of F_*64, because on 64-bit host systems F_GETLK == F_GETLK64(same for SETLK and SETLKW), so we cannot determinate if it's a long lock or not on a target 32-bit system. Patch in the attachment. P.S. Please, review my privious patches, which I have added description recently. Or should I repost it? --FkmkrVfFsRoUs1wW Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="qemu-0.9.0-alt-fcntl64-fix.patch" Content-Transfer-Encoding: quoted-printable diff -uNr qemu-0.9.0.cvs20070304.orig/linux-user/syscall.c qemu-0.9.0.cvs20= 070304/linux-user/syscall.c --- qemu-0.9.0.cvs20070304.orig/linux-user/syscall.c 2007-03-09 20:08:59 +0= 200 +++ qemu-0.9.0.cvs20070304/linux-user/syscall.c 2007-03-09 20:09:54 +0200 @@ -4063,7 +4063,7 @@ #endif =20 switch(arg2) { - case F_GETLK64: + case TARGET_F_GETLK64: ret =3D get_errno(fcntl(arg1, arg2, &fl)); if (ret =3D=3D 0) { #ifdef TARGET_ARM @@ -4089,8 +4089,8 @@ } break; =20 - case F_SETLK64: - case F_SETLKW64: + case TARGET_F_SETLK64: + case TARGET_F_SETLKW64: #ifdef TARGET_ARM if (((CPUARMState *)cpu_env)->eabi) { lock_user_struct(target_efl, arg3, 1); --FkmkrVfFsRoUs1wW-- --dkEUBIird37B8yKS Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFF8dd2bWYnhzC5v6oRAtL6AJoDIzHjG/1sVC+4AZCWozXWWEsOYACfd7df b5Bk7enk4hmCfnRvyoAAIe4= =uLlk -----END PGP SIGNATURE----- --dkEUBIird37B8yKS--