From patchwork Tue Nov 5 16:38: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: 21343 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5893025B39 for ; Tue, 5 Nov 2013 16:43:41 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id fa1sf16200811pad.2 for ; Tue, 05 Nov 2013 08:43:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version: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=hb9tkd5yP5JyAXF+3XG0hNcf4Fem6j1MxwQxNE+3sqI=; b=nMJPkFkYg8zoNGtGdBUaFLYi3EqRHUPSKP7Bud0gqJtHKC2rmq3je97qx6RdZKKQ4Z ih5cZKJJR/LEXMUqpJEtqdQ3lQPNyCxhZIrJ1WJ3XhNQ0Bsog+iTz2zAt7PjEg+kWBKg J4i6rQ2Ih7waEVyvK10PR6P9lN9wX+fyWQxoK7mQxmM0R9aRDqH3fVxwxlUrZy5gHIya TVPHj8yXrmxHdRhZoIBY0hQpuzitQB4bzy3doAnccJlTvbATK/oNCpmvcHzqFvKkw6jG zsOZAkSejmnHZ3C9PA0LOwb0VE05G9ppzbc4Pqc18/jBTPMLJVhjM0xj6L8hOJBKVc53 vEIg== X-Gm-Message-State: ALoCoQk6b24c4q2vvBBUccnFU9c+0nUwpmRQ0Mk3e0B2IbDBw5cE53LNJpPz5FcFuOFRjMi1geIz X-Received: by 10.66.161.195 with SMTP id xu3mr7293618pab.33.1383669820122; Tue, 05 Nov 2013 08:43:40 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.110.5 with SMTP id hw5ls266575qeb.56.gmail; Tue, 05 Nov 2013 08:43:40 -0800 (PST) X-Received: by 10.58.178.239 with SMTP id db15mr16668983vec.9.1383669820000; Tue, 05 Nov 2013 08:43:40 -0800 (PST) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id lr1si6747216vcb.94.2013.11.05.08.43.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 05 Nov 2013 08:43:39 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id jw12so2708847veb.32 for ; Tue, 05 Nov 2013 08:43:39 -0800 (PST) X-Received: by 10.52.37.137 with SMTP id y9mr57222vdj.84.1383669819872; Tue, 05 Nov 2013 08:43:39 -0800 (PST) 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 u4csp220361vcz; Tue, 5 Nov 2013 08:43:39 -0800 (PST) X-Received: by 10.194.60.73 with SMTP id f9mr2084666wjr.65.1383669818484; Tue, 05 Nov 2013 08:43:38 -0800 (PST) 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 h4si2634463wie.62.2013.11.05.08.43.38 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 05 Nov 2013 08:43:38 -0800 (PST) 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 1VdjeH-0006ff-Gi; Tue, 05 Nov 2013 16:38:37 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: Anthony Liguori , patches@linaro.org, Kevin Wolf , Stefan Hajnoczi , "Michael S. Tsirkin" , Richard Henderson Subject: [PATCH v2 5/9] bswap.h: Remove be32_to_cpupu() Date: Tue, 5 Nov 2013 16:38:33 +0000 Message-Id: <1383669517-25598-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1383669517-25598-1-git-send-email-peter.maydell@linaro.org> References: <1383669517-25598-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.128.173 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: Richard Henderson Reviewed-by: Michael S. Tsirkin --- 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 ec8ecd7..a5fb8fc 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -603,7 +603,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);