From patchwork Fri Feb 10 05:31:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 140481 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CAD31B6EF7 for ; Fri, 10 Feb 2012 16:31:44 +1100 (EST) Received: from localhost ([::1]:43218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvj5B-0003Cn-Ly for incoming@patchwork.ozlabs.org; Fri, 10 Feb 2012 00:31:41 -0500 Received: from eggs.gnu.org ([140.186.70.92]:46849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvj56-0003AC-DJ for qemu-devel@nongnu.org; Fri, 10 Feb 2012 00:31:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rvj52-0000Et-Tz for qemu-devel@nongnu.org; Fri, 10 Feb 2012 00:31:36 -0500 Received: from ozlabs.org ([203.10.76.45]:49396) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvj52-0000Ea-FS for qemu-devel@nongnu.org; Fri, 10 Feb 2012 00:31:32 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 65CB1B6F98; Fri, 10 Feb 2012 16:31:29 +1100 (EST) From: David Gibson To: anthony@codemonkey.ws, avi@redhat.com, mtosatti@redhat.com Date: Fri, 10 Feb 2012 16:31:25 +1100 Message-Id: <1328851885-9348-1-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.8.3 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.10.76.45 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] kvm: Comparison with ioctl number macros needs to be unsigned X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org In kvm-all.c we store an ioctl cmd number in the irqchip_inject_ioctl field of KVMState, which has type 'int'. This seems to make sense since the ioctl() man page says that the cmd parameter has type int. However, the kernel treats ioctl numbers as unsigned - sys_ioctl() takes an unsigned int, and the macros which generate ioctl numbers expand to unsigned expressions. Furthermore, some ioctls (IOC_READ ioctls on x86 and IOC_WRITE ioctls on powerpc) have bit 31 set, and so would be negative if interpreted as an int. This has the surprising and compile-breaking consequence that in kvm_irqchip_set_irq() where we do: return (s->irqchip_inject_ioctl == KVM_IRQ_LINE) ? 1 : event.status; We will get a "comparison is always false due to limited range of data type" warning from gcc if KVM_IRQ_LINE is one of the bit-31-set ioctls, which it is on powerpc. So, despite the fact that the man page and posix say ioctl numbers are signed, they're actually unsigned. The kernel uses unsigned, the glibc header uses unsigned long, and FreeBSD, NetBSD and OSX also use unsigned long ioctl numbers in the code. Therefore, this patch changes the variable to be unsigned, fixing the compile. Signed-off-by: David Gibson --- kvm-all.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) Updated with improved patch comment. diff --git a/kvm-all.c b/kvm-all.c index 0b87658..681ad15 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -78,7 +78,10 @@ struct KVMState int pit_in_kernel; int xsave, xcrs; int many_ioeventfds; - int irqchip_inject_ioctl; + /* The man page (and posix) say ioctl numbers are signed int, but + * they're not. Linux, glibc and *BSD all treat ioctl numbers as + * unsigned, and treating them as signed here can break things */ + unsigned irqchip_inject_ioctl; #ifdef KVM_CAP_IRQ_ROUTING struct kvm_irq_routing *irq_routes; int nr_allocated_irq_routes;