From patchwork Sun Aug 25 14:59:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 19522 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AC6D7246F3 for ; Sun, 25 Aug 2013 14:59:45 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id ha11sf2551275vcb.8 for ; Sun, 25 Aug 2013 07:59:45 -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=a/Dnjm+ul7hN6i6Kw0l7VBYcGpO/Scs+i2mLtdNpmYo=; b=K9j7lnPBV0zz1aLGNZaRqBbEH9F/WwAbA0U+kPwo5HwB4/x5A5GRm1/xuZu4CGI9lJ S63iX9b5jqnCKkWQckeUJ8KZZQZZC5NARJ94s0imYeqfRcUSRbqMtgpGdRBiRVXu0kC9 D5NFrVcmVBJakEHw0ahpADWgP7ANZuH6BnFLN93bddl0u8T27C179GG6S+Z4IHwPYACx HgfIcNxi0F9euS+C0Zk4JOzprbxShSq8rAtLyA4jLkhs0yruKGO9Vq5+uiDuk4xaqdHn mIh9OapXiES4gpSEQxQ8ZIPNebZMbYyCuM88oavUrZMCBL+0AG/qDv79VMWbBDV5kR2I VgFQ== X-Received: by 10.236.193.6 with SMTP id j6mr3491573yhn.44.1377442785282; Sun, 25 Aug 2013 07:59:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.35.10 with SMTP id d10ls2154402qej.19.gmail; Sun, 25 Aug 2013 07:59:45 -0700 (PDT) X-Received: by 10.58.119.233 with SMTP id kx9mr9827227veb.3.1377442785198; Sun, 25 Aug 2013 07:59:45 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id se9si1448232vdc.75.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 25 Aug 2013 07:59:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 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.174; Received: by mail-ve0-f174.google.com with SMTP id d10so1496269vea.5 for ; Sun, 25 Aug 2013 07:59:45 -0700 (PDT) X-Gm-Message-State: ALoCoQk7LlsWgp6xisJLY0u1c9vGeZdXpeXxKCWsb5n6loRNgBdESER7K0CBNWfZkJBUtZdSwes4 X-Received: by 10.58.119.233 with SMTP id kx9mr9827216veb.3.1377442785059; Sun, 25 Aug 2013 07:59:45 -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 u4csp192683vcz; Sun, 25 Aug 2013 07:59:44 -0700 (PDT) X-Received: by 10.14.103.69 with SMTP id e45mr4297708eeg.51.1377442782156; Sun, 25 Aug 2013 07:59:42 -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 x7si6985142eeo.127.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 25 Aug 2013 07:59:42 -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-0002tP-VB; Sun, 25 Aug 2013 15:59:39 +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 7/9] bswap.h: Remove cpu_to_be32wu() Date: Sun, 25 Aug 2013 15:59:35 +0100 Message-Id: <1377442777-11066-8-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.128.174 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 cpu_to_be32wu() with stl_be_p(). Signed-off-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/block/cdrom.c | 6 +++--- hw/net/e1000.c | 3 +-- hw/pci/pcie_aer.c | 4 ++-- include/qemu/bswap.h | 5 ----- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/hw/block/cdrom.c b/hw/block/cdrom.c index 5c69f34..4e1019c 100644 --- a/hw/block/cdrom.c +++ b/hw/block/cdrom.c @@ -59,7 +59,7 @@ int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_track) q += 3; } else { /* sector 0 */ - cpu_to_be32wu((uint32_t *)q, 0); + stl_be_p(q, 0); q += 4; } } @@ -73,7 +73,7 @@ int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_track) lba_to_msf(q, nb_sectors); q += 3; } else { - cpu_to_be32wu((uint32_t *)q, nb_sectors); + stl_be_p(q, nb_sectors); q += 4; } len = q - buf; @@ -127,7 +127,7 @@ int cdrom_read_toc_raw(int nb_sectors, uint8_t *buf, int msf, int session_num) lba_to_msf(q, nb_sectors); q += 3; } else { - cpu_to_be32wu((uint32_t *)q, nb_sectors); + stl_be_p(q, nb_sectors); q += 4; } diff --git a/hw/net/e1000.c b/hw/net/e1000.c index b8e3ce9..06a2f6e 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -522,8 +522,7 @@ xmit_seg(E1000State *s) DBGOUT(TXSUM, "tcp %d tucss %d len %d\n", tp->tcp, css, len); if (tp->tcp) { sofar = frames * tp->mss; - cpu_to_be32wu((uint32_t *)(tp->data+css+4), // seq - ldl_be_p(tp->data+css+4)+sofar); + stl_be_p(tp->data+css+4, ldl_be_p(tp->data+css+4)+sofar); /* seq */ if (tp->paylen - sofar > tp->mss) tp->data[css + 13] &= ~9; // PSH, FIN } else // UDP diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c index ca762ab..723d88d 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -425,7 +425,7 @@ static void pcie_aer_update_log(PCIDevice *dev, const PCIEAERErr *err) /* 7.10.8 Header Log Register */ uint8_t *header_log = aer_cap + PCI_ERR_HEADER_LOG + i * sizeof err->header[0]; - cpu_to_be32wu((uint32_t*)header_log, err->header[i]); + stl_be_p(header_log, err->header[i]); } } else { assert(!(err->flags & PCIE_AER_ERR_TLP_PREFIX_PRESENT)); @@ -439,7 +439,7 @@ static void pcie_aer_update_log(PCIDevice *dev, const PCIEAERErr *err) /* 7.10.12 tlp prefix log register */ uint8_t *prefix_log = aer_cap + PCI_ERR_TLP_PREFIX_LOG + i * sizeof err->prefix[0]; - cpu_to_be32wu((uint32_t*)prefix_log, err->prefix[i]); + stl_be_p(prefix_log, err->prefix[i]); } errcap |= PCI_ERR_CAP_TLP; } else { diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 3bb6b71..b95cc73 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 void cpu_to_be32wu(uint32_t *p, uint32_t v) -{ - stl_be_p(p, v); -} - static inline void cpu_to_be64wu(uint64_t *p, uint64_t v) { stq_be_p(p, v);