From patchwork Mon Jul 23 18:05:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10177 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D9E4323F08 for ; Mon, 23 Jul 2012 18:05:27 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 9A1C2A182B0 for ; Mon, 23 Jul 2012 18:05:27 +0000 (UTC) Received: by ghbz12 with SMTP id z12so6098107ghb.11 for ; Mon, 23 Jul 2012 11:05:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=yW4Y/0/SCtsMxvlp8hGRE/G/ZPJ1DWc/u7eWgfa97Vc=; b=iwxbSU1+zG4/KgurHfqFzSoNLb9Rd9t5W8rMhmbKUVSyeIBGvIhavrFhzynwuPjO9T 4CG7UFsViyxPBk69+FS6fexQjzcXFhfo+EKbiT7ER2YcPEmFzl9KCm8nnnWRFQJQu503 TKoMDCERJrkwL1ynYD0L6BVdsVS5JqFapal+rcNQxbX/9+QJTnIkRKKW9tzhHoIPLsgs UwrrLg9cfpNpfAjWq1iRdEI84oc+HB2Ol26oKB8YxXQcFo/fJ5uly4aDyS3wh/1yDaUi xivJsifCEPcNB+Z+tRZ1sLtra2Wea8NNJGb6cA9hzbYzyS4g+lHPm3OnbNHC3QgDV8/U 5EHA== Received: by 10.50.158.133 with SMTP id wu5mr14974770igb.67.1343066726503; Mon, 23 Jul 2012 11:05:26 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.153.7 with SMTP id i7csp59915ibw; Mon, 23 Jul 2012 11:05:25 -0700 (PDT) Received: by 10.180.81.165 with SMTP id b5mr51164218wiy.17.1343066725195; Mon, 23 Jul 2012 11:05:25 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id z8si17430683wiw.40.2012.07.23.11.05.24 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Jul 2012 11:05:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1StN0S-0005g9-O8; Mon, 23 Jul 2012 19:05:20 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Alexander Graf , Riku Voipio Subject: [PATCH] linux-user: Fix incorrect TARGET_BLKBSZGET, TARGET_BLKBSZSET Date: Mon, 23 Jul 2012 19:05:20 +0100 Message-Id: <1343066720-21806-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQkL+Gll39o3oXoTSXRgNkGgRLFZezbrDo2Fy1OJBLwtBVaNeq1GuHPo+WE39JiBh/BJ5nY7 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(). Signed-off-by: Peter Maydell Signed-off-by: Peter Maydell --- linux-user/syscall_defs.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) 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 request (ll_rw_blk.c) */ #define TARGET_BLKSSZGET TARGET_IO(0x12,104)/* get block device sector 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) */