From patchwork Sun Aug 25 14:59:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 19528 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3B9E525A57 for ; Sun, 25 Aug 2013 15:24:22 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id gf11sf2572556vcb.6 for ; Sun, 25 Aug 2013 08:24:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=kmRlW2Y3DTfiHY/8te86DWrQyQe86Yo84tzPCGSAEY0=; b=nzXswScqb7eZD1V+LjDUbCTWs6SyBEdGcgMjJcUEgO3BSu2mAoeGODJw0pIo1heQ92 F1Ts2hO1d5QkBkdDBGICgZ8e4K//LG5h49HBsqZ387/bIKX90P/npCwTQ6N0e10wciZh 8DvqkFaJ+ES4gQNU0yEMvb3ur/HzaGMOU32i+3vJcllS/WSaXZXYxAcCfWK1/6H/k5IK lp3QQijgnX4oZ3vvb0vT6Qt2jFI8uTmuZDQ2BvJdQ4cIF0g49hZ2FDm1L98Vrhd6/X9z OEgJ82sqBvYDp8YgEwxQxZ8L3m6XkKykglulNG8M+DHizd9cFQmTII4kChsOBqz7wdGQ CHvA== X-Received: by 10.236.222.228 with SMTP id t94mr3609713yhp.18.1377444261499; Sun, 25 Aug 2013 08:24:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.53.103 with SMTP id a7ls2084442qep.90.gmail; Sun, 25 Aug 2013 08:24:21 -0700 (PDT) X-Received: by 10.52.230.74 with SMTP id sw10mr1581127vdc.6.1377444261384; Sun, 25 Aug 2013 08:24:21 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id rx1si606536vdc.151.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 25 Aug 2013 08:24:21 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id ht10so1455594vcb.24 for ; Sun, 25 Aug 2013 08:24:21 -0700 (PDT) X-Gm-Message-State: ALoCoQn0dCumwndc6pRvwFTubU9wANsRGQyz1HN34SOZkxxIW3JLat+96qqsZbp2zhOAz/QtMYsV X-Received: by 10.58.152.3 with SMTP id uu3mr10159403veb.16.1377444261256; Sun, 25 Aug 2013 08:24:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp193462vcz; Sun, 25 Aug 2013 08:24:20 -0700 (PDT) X-Received: by 10.180.37.173 with SMTP id z13mr881337wij.9.1377444260097; Sun, 25 Aug 2013 08:24:20 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id ux10si3511156wjc.81.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 25 Aug 2013 08:24:20 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1VDbn0-0002tH-MS; Sun, 25 Aug 2013 15:59:38 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Kevin Wolf , Stefan Hajnoczi , "Michael S. Tsirkin" , Richard Henderson , Anthony Liguori Subject: [PATCH 5/9] bswap.h: Remove be32_to_cpupu() Date: Sun, 25 Aug 2013 15:59:33 +0100 Message-Id: <1377442777-11066-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1377442777-11066-1-git-send-email-peter.maydell@linaro.org> References: <1377442777-11066-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Replace the legacy be32_to_cpupu() with ldl_be_p(). Signed-off-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/net/e1000.c | 2 +- include/qemu/bswap.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index fdb1f89..f770f08 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -526,7 +526,7 @@ xmit_seg(E1000State *s) if (tp->tcp) { sofar = frames * tp->mss; cpu_to_be32wu((uint32_t *)(tp->data+css+4), // seq - be32_to_cpupu((uint32_t *)(tp->data+css+4))+sofar); + ldl_be_p(tp->data+css+4)+sofar); if (tp->paylen - sofar > tp->mss) tp->data[css + 13] &= ~9; // PSH, FIN } else // UDP diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index ac5b2e0..9524931 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -412,11 +412,6 @@ static inline void stfq_be_p(void *ptr, float64 v) /* Legacy unaligned versions. Note that we never had a complete set. */ -static inline uint32_t be32_to_cpupu(const uint32_t *p) -{ - return ldl_be_p(p); -} - static inline void cpu_to_be16wu(uint16_t *p, uint16_t v) { stw_be_p(p, v);