From patchwork Tue Jul 24 22:33:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jing Huang X-Patchwork-Id: 172891 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 09B3C2C0087 for ; Wed, 25 Jul 2012 00:32:46 +1000 (EST) Received: from localhost ([::1]:56354 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StgAG-00038D-4M for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2012 10:32:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57114) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StgA0-000351-9c for qemu-devel@nongnu.org; Tue, 24 Jul 2012 10:32:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Stg9u-00025Q-4e for qemu-devel@nongnu.org; Tue, 24 Jul 2012 10:32:28 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:57248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stg9t-00025L-Ua for qemu-devel@nongnu.org; Tue, 24 Jul 2012 10:32:22 -0400 Received: by pbbro12 with SMTP id ro12so12576102pbb.4 for ; Tue, 24 Jul 2012 07:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=XIcKOK8/+befXQJ8jZy2Q4imu+qaVnhBSifRJLQulUE=; b=QFQP/fsgBrtrgVEZbWoSsEedJIaYfRJ9TZD0gXpUfR0JecsXjEoDzLRKH1Lgn1uf0y d3tFN4NzT7NEPcD15JY+A3TjFwgV2eCfWmTddiabKO2+k0mJFcnxjsnQWbBjjSXWXEM0 jNDpsWXwBxbKrlejysVdzaEJkK0+o3A8b7ZZRsLTAufJn9H9bKufRLnGaIQbYDExO2gt k4gFXQUGLaRIpLCfJLC9HzBW77EFMmUjlCGSBwpbdtLCGbwFUyM3wQp8TAfR222Jv41t 0r/pKIvzaqiM9sswN+zyRzSvS2WUDCHM8CTojc+9MjlazpcVVksmXjgeT3qcCELbrDbO U1Gw== Received: by 10.68.232.104 with SMTP id tn8mr35844440pbc.118.1343140341147; Tue, 24 Jul 2012 07:32:21 -0700 (PDT) Received: from localhost.124.16.136.254 ([124.16.141.34]) by mx.google.com with ESMTPS id ot4sm12271217pbb.65.2012.07.24.07.32.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jul 2012 07:32:20 -0700 (PDT) From: Jing Huang To: qemu-devel@nongnu.org Date: Tue, 24 Jul 2012 22:33:18 +0000 Message-Id: <1343169198-9656-1-git-send-email-jing.huang.pku@gmail.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: peter.maydell@linaro.org, riku.voipio@iki.fi Subject: [Qemu-devel] [PATCH V5 3/3] linux-user: make host_to_target_cmsg support SO_TIMESTAMP cmsg_type 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 Signed-off-by: Jing Huang Reviewed-by: Peter Maydell --- linux-user/syscall.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index cc2a1c3..a5fa7a7 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1347,16 +1347,28 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, target_cmsg->cmsg_type = tswap32(cmsg->cmsg_type); target_cmsg->cmsg_len = tswapal(TARGET_CMSG_LEN(len)); - if (cmsg->cmsg_level != TARGET_SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) { - gemu_log("Unsupported ancillary data: %d/%d\n", cmsg->cmsg_level, cmsg->cmsg_type); - memcpy(target_data, data, len); - } else { + if ((cmsg->cmsg_level == TARGET_SOL_SOCKET) && + (cmsg->cmsg_type == SCM_RIGHTS)) { int *fd = (int *)data; int *target_fd = (int *)target_data; int i, numfds = len / sizeof(int); for (i = 0; i < numfds; i++) target_fd[i] = tswap32(fd[i]); + } else if ((cmsg->cmsg_level == TARGET_SOL_SOCKET) && + (cmsg->cmsg_type == SO_TIMESTAMP) && + (len == sizeof(struct timeval))) { + /* copy struct timeval to target */ + struct timeval *tv = (struct timeval *)data; + struct target_timeval *target_tv = + (struct target_timeval *)target_data; + + target_tv->tv_sec = tswapl(tv->tv_sec); + target_tv->tv_usec = tswapl(tv->tv_usec); + } else { + gemu_log("Unsupported ancillary data: %d/%d\n", + cmsg->cmsg_level, cmsg->cmsg_type); + memcpy(target_data, data, len); } cmsg = CMSG_NXTHDR(msgh, cmsg);