From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDbnD-0004nb-0X for qemu-devel@nongnu.org; Sun, 25 Aug 2013 10:59:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VDbnC-0006eh-8G for qemu-devel@nongnu.org; Sun, 25 Aug 2013 10:59:50 -0400 Received: from 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]:59464 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDbnC-0006cn-2I for qemu-devel@nongnu.org; Sun, 25 Aug 2013 10:59:50 -0400 From: Peter Maydell Date: Sun, 25 Aug 2013 15:59:36 +0100 Message-Id: <1377442777-11066-9-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1377442777-11066-1-git-send-email-peter.maydell@linaro.org> References: <1377442777-11066-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 8/9] bswap.h: Remove cpu_to_be64wu() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , "Michael S. Tsirkin" , patches@linaro.org, Anthony Liguori , Richard Henderson Replace the legacy cpu_to_be64wu() with stq_be_p(). Signed-off-by: Peter Maydell --- block/qcow2-cluster.c | 2 +- include/qemu/bswap.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index cca76d4..363a725 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -92,7 +92,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size, /* set new table */ BLKDBG_EVENT(bs->file, BLKDBG_L1_GROW_ACTIVATE_TABLE); cpu_to_be32w((uint32_t*)data, new_l1_size); - cpu_to_be64wu((uint64_t*)(data + 4), new_l1_table_offset); + stq_be_p(data + 4, new_l1_table_offset); ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, l1_size), data,sizeof(data)); if (ret < 0) { goto fail; diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index b95cc73..4cbd6e7 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_be64wu(uint64_t *p, uint64_t v) -{ - stq_be_p(p, v); -} - static inline void cpu_to_32wu(uint32_t *p, uint32_t v) { stl_p(p, v); -- 1.7.9.5