From patchwork Sat Jul 21 01:30:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jing Huang X-Patchwork-Id: 172317 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 2D0102C03E5 for ; Sat, 21 Jul 2012 03:33:53 +1000 (EST) Received: from localhost ([::1]:38186 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsH5L-00012e-8j for incoming@patchwork.ozlabs.org; Fri, 20 Jul 2012 13:33:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsH3a-0007wg-LI for qemu-devel@nongnu.org; Fri, 20 Jul 2012 13:33:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsH1p-0006tA-Aa for qemu-devel@nongnu.org; Fri, 20 Jul 2012 13:32:02 -0400 Received: from mail-gg0-f173.google.com ([209.85.161.173]:48695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsH1p-0006t6-66 for qemu-devel@nongnu.org; Fri, 20 Jul 2012 13:30:13 -0400 Received: by ggnp1 with SMTP id p1so4325852ggn.4 for ; Fri, 20 Jul 2012 10:30:12 -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=c8tt6lHtbZWlYssH2qb2CaC9I0a1nS2YlCv+mJ1qC8k=; b=OTR6xMIR3dtizxcddjfUOJ8kqsCbCr4J2f1ZyfRWu49JDiTT8tuw/y1N/OH7I1k9Eh sGmQOGtu1f+FFxdry5RuOFqS7kFyodUK/gthXK6b/XmaJNwuq9Olo/oDhmp6KX74c8Bc eVSkgBlvuHiqPPZXQeL2JtOYhh5gag2m3UJSNFZ2ynY4Kkuure/o9HjW7+c780W5i2RB niqPxwmmSqmkn1vuHnm1CWmw8Tx8Op9hBnpPv+KN1QZwDXCf29KcYZrHE0eXyfHdp1A9 VTsZ6PAgPGMbz83Sf0dpT/KLfjAWVTp5FIugiXLIftFP68AMMsutj/lmq/Ovcv4Lslxt /pkA== Received: by 10.66.83.200 with SMTP id s8mr13064568pay.10.1342805412262; Fri, 20 Jul 2012 10:30:12 -0700 (PDT) Received: from localhost.124.16.136.254 ([124.16.141.34]) by mx.google.com with ESMTPS id pf8sm4334457pbc.44.2012.07.20.10.30.09 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Jul 2012 10:30:11 -0700 (PDT) From: Jing Huang To: qemu-devel@nongnu.org Date: Sat, 21 Jul 2012 01:30:54 +0000 Message-Id: <1342834254-2751-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.161.173 Cc: peter.maydell@linaro.org, riku.voipio@iki.fi, jing.huang.pku@gmail.com Subject: [Qemu-devel] [PATCH V3 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 --- linux-user/syscall.c | 15 +++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 2228b1f..7521746 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1350,8 +1350,17 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, 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); + if ((cmsg->cmsg_type == SO_TIMESTAMP) && + (len == sizeof(struct timeval))) { + /* copy struct timeval to target */ + struct timeval *tv = (struct timeval *)data; + struct timeval *target_tv = (struct timeval *)target_data; + + tv->tv_sec = tswap32(target_tv->tv_sec); + tv->tv_usec = tswap32(target_tv->tv_usec); + } else { + gemu_log("Unsupported ancillary data: %d/%d\n", + cmsg->cmsg_level, cmsg->cmsg_type); + memcpy(target_data, data, len); + } } else { int *fd = (int *)data; int *target_fd = (int *)target_data;