From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stdok-0006ge-IM for qemu-devel@nongnu.org; Tue, 24 Jul 2012 08:02:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Stdoj-0004vC-Bi for qemu-devel@nongnu.org; Tue, 24 Jul 2012 08:02:22 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35549 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stdoj-0004v7-1i for qemu-devel@nongnu.org; Tue, 24 Jul 2012 08:02:21 -0400 Message-ID: <500E8EC5.6050806@suse.de> Date: Tue, 24 Jul 2012 14:02:13 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1343066720-21806-1-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1343066720-21806-1-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] linux-user: Fix incorrect TARGET_BLKBSZGET, TARGET_BLKBSZSET List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Blue Swirl , Riku Voipio , qemu-devel@nongnu.org, patches@linaro.org, Alexander Graf Am 23.07.2012 20:05, schrieb Peter Maydell: > The definitions for the ioctl numbers TARGET_BLKBSZGET and > TARGET_BLKBSZSET had the wrong size parameters (they are defined > with size_t, not int, even though the ioctl implementations themselves > read and write integers). Since commit 354a0008 we now have an > ioctl wrapper definition for BLKBSZGET and so on an x86-64-to-x86-64 > linux-user binary we were triggering the mismatch warning in > syscall_init(). >=20 > Signed-off-by: Peter Maydell Beep :) > --- > linux-user/syscall_defs.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h > index a79b67d..0b239c4 100644 > --- a/linux-user/syscall_defs.h > +++ b/linux-user/syscall_defs.h > @@ -832,8 +832,8 @@ struct target_pollfd { > #define TARGET_BLKSECTGET TARGET_IO(0x12,103)/* get max sectors per re= quest (ll_rw_blk.c) */ > #define TARGET_BLKSSZGET TARGET_IO(0x12,104)/* get block device secto= r size */ > /* A jump here: 108-111 have been used for various private purposes. *= / > -#define TARGET_BLKBSZGET TARGET_IOR(0x12,112,int) > -#define TARGET_BLKBSZSET TARGET_IOW(0x12,113,int) > +#define TARGET_BLKBSZGET TARGET_IOR(0x12, 112, abi_ulong) > +#define TARGET_BLKBSZSET TARGET_IOW(0x12, 113, abi_ulong) > #define TARGET_BLKGETSIZE64 TARGET_IOR(0x12,114,abi_ulong) > /* return device size in = bytes > (u64 *arg) */ For the usual suspects this looks right. But does abi_ulong correctly handle ppc64abi32 and sparc32plus? Or is this inside some #ifdef block? Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg