From patchwork Tue Apr 2 21:45:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 233172 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D2A992C016A for ; Wed, 3 Apr 2013 09:05:53 +1100 (EST) Received: from localhost ([::1]:35655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN9Kx-0003ca-BI for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 18:05:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN97z-0000tk-Rm for qemu-devel@nongnu.org; Tue, 02 Apr 2013 17:52:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN97u-0000XO-7f for qemu-devel@nongnu.org; Tue, 02 Apr 2013 17:52:27 -0400 Received: from mail-gg0-x230.google.com ([2607:f8b0:4002:c02::230]:62313) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN97u-0000XF-1x; Tue, 02 Apr 2013 17:52:22 -0400 Received: by mail-gg0-f176.google.com with SMTP id c4so137396ggn.7 for ; Tue, 02 Apr 2013 14:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=0ly212lvxJWuV0L0a5mnACBmSMPmTBVTwe6XwcYxg5M=; b=dK5nZZMH94YjVTJmAH4OdkxqpB9lcucO30tP/i4MOO/8L/laXLXqEgeGC2GDxRBHba 6zCE03fhkSRmq7JWL5oBRbOKfCOh8OX9zgrSP+CCpK78pwkU2WGTcZjmHHGpl0pV2TAH k8aov31fCaxR+F4J1fgVLmMBsflocG/sDFClDGO1eMC24N/hNRSkU1z9c8H7x9fhig4c TxdbMKeBcnHIvp1Iw4YROH4kHTaWaL/xTM1ApzukdfJnKBVG+92Ks6S1ddjrfNUm0I7l T4l0Z9nK75BXaHW5kF5xd/F1QHLe6znRo4AIEVof6zxfzYIMG56LvQECp52CqnSK1QK2 hA0Q== X-Received: by 10.236.135.76 with SMTP id t52mr16996909yhi.199.1364939541547; Tue, 02 Apr 2013 14:52:21 -0700 (PDT) Received: from localhost ([32.97.110.51]) by mx.google.com with ESMTPS id 30sm5805668yhb.6.2013.04.02.14.52.20 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 14:52:21 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 16:45:39 -0500 Message-Id: <1364939142-30066-35-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364939142-30066-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1364939142-30066-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4002:c02::230 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 34/37] linux-user: fix futex strace of FUTEX_CLOCK_REALTIME 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 From: John Rigby Handle same as existing FUTEX_PRIVATE_FLAG. Signed-off-by: John Rigby Signed-off-by: Riku Voipio (cherry picked from commit bfb669f39f2ecd854992924ced20b00163509043) Signed-off-by: Michael Roth --- linux-user/strace.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/linux-user/strace.c b/linux-user/strace.c index 4e91a6e..f8030e0 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -1437,6 +1437,12 @@ if( cmd == val ) { \ cmd &= ~FUTEX_PRIVATE_FLAG; } #endif +#ifdef FUTEX_CLOCK_REALTIME + if (cmd & FUTEX_CLOCK_REALTIME) { + gemu_log("FUTEX_CLOCK_REALTIME|"); + cmd &= ~FUTEX_CLOCK_REALTIME; + } +#endif print_op(FUTEX_WAIT) print_op(FUTEX_WAKE) print_op(FUTEX_FD)