From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KI8Bz-0002I8-0c for qemu-devel@nongnu.org; Sun, 13 Jul 2008 16:29:11 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KI8Bx-0002H8-Ih for qemu-devel@nongnu.org; Sun, 13 Jul 2008 16:29:10 -0400 Received: from [199.232.76.173] (port=40927 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KI8Bx-0002H5-Ab for qemu-devel@nongnu.org; Sun, 13 Jul 2008 16:29:09 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:46371) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KI8Bx-00074e-2B for qemu-devel@nongnu.org; Sun, 13 Jul 2008 16:29:09 -0400 Received: from smtp07.web.de (fmsmtp07.dlan.cinetic.de [172.20.5.215]) by fmmailgate01.web.de (Postfix) with ESMTP id 2AFD8E7D3A8B for ; Sun, 13 Jul 2008 22:29:08 +0200 (CEST) Received: from [88.64.30.223] (helo=[192.168.1.198]) by smtp07.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.109 #226) id 1KI8Bw-0006wZ-00 for qemu-devel@nongnu.org; Sun, 13 Jul 2008 22:29:08 +0200 Message-ID: <487A6593.5020508@web.de> Date: Sun, 13 Jul 2008 22:29:07 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH] linux-user: Fix target_statfs[64] on 64-bit hosts 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 Testing qemu-x86_64, I happen to run df and came across these mistakes in the target_statfs/target_statfs64 structure definitions (reference: linux/include/asm-x86/statfs.h). Signed-off-by: Jan Kiszka --- linux-user/syscall_defs.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) Index: b/linux-user/syscall_defs.h =================================================================== --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -1600,31 +1600,31 @@ struct target_statfs64 { }; #else struct target_statfs { - uint32_t f_type; - uint32_t f_bsize; - uint32_t f_blocks; - uint32_t f_bfree; - uint32_t f_bavail; - uint32_t f_files; - uint32_t f_ffree; + abi_long f_type; + abi_long f_bsize; + abi_long f_blocks; + abi_long f_bfree; + abi_long f_bavail; + abi_long f_files; + abi_long f_ffree; target_fsid_t f_fsid; - uint32_t f_namelen; - uint32_t f_frsize; - uint32_t f_spare[5]; + abi_long f_namelen; + abi_long f_frsize; + abi_long f_spare[5]; }; struct target_statfs64 { - uint32_t f_type; - uint32_t f_bsize; + uint64_t f_type; + uint64_t f_bsize; uint64_t f_blocks; uint64_t f_bfree; uint64_t f_bavail; uint64_t f_files; uint64_t f_ffree; target_fsid_t f_fsid; - uint32_t f_namelen; - uint32_t f_frsize; - uint32_t f_spare[5]; + uint64_t f_namelen; + uint64_t f_frsize; + uint64_t f_spare[5]; }; #endif