From nobody Sun Nov 16 14:06:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600855352; cv=none; d=zohomail.com; s=zohoarc; b=TU2lLalUQX8sl8mZNQjArvS1SZLiNwTp/4t3Mzza2IaJKsRlCLi/+r/Q4jSLJMCm16hKZTnmM8gpyzBMmV0i5IZuUztDIWgm41duRmO6XNqqg34iNkQ7IWtTU8XoUXxn/MJTEmZcTYaaeDT4IF6pVQuGSDat1ZEYyx8lblzi0TE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600855352; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=VaJU4qce4d8kLY5vBvpzDPXaE03+xeWvm32Nm0kkdv0=; b=G27/dB5Ml1T2A2UxFnwGvBNHFbsj7UPYNMosmq/5mXxJLl9R8v9UnrZqhlHWaGEeM7dLIkM0BJr0WzmHn84MxRg7Rl5zIf4AM6td94Yfv9aOagkdlu4HrETIktblUY0rCaVpyvzLq3SnAUUT4Q7mdBdyBOqOau39xNpurI+1h58= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1600855352108991.4829348283912; Wed, 23 Sep 2020 03:02:32 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-84-LXYgJS_lN9mxpj2ehUPDYQ-1; Wed, 23 Sep 2020 06:02:29 -0400 Received: by mail-wm1-f72.google.com with SMTP id l26so1178279wmg.7 for ; Wed, 23 Sep 2020 03:02:28 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id t188sm8029162wmf.41.2020.09.23.03.02.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 03:02:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600855350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VaJU4qce4d8kLY5vBvpzDPXaE03+xeWvm32Nm0kkdv0=; b=eXsE5p9o2Y/mhwigQXXTcBKkyNLKqZSZAe+wX4STOmqseToe0HJuOTubpzYxm8Z7BhSfBd /bnclZyFwLPtQPGvqt0NzEZt1vxs7Btrcwwhgzil5rqUu8llPdSu4HWnCLu+89BNWgK7RZ v3yBpZslUi9wNiyuDdl9kQ5kEI9JRyQ= X-MC-Unique: LXYgJS_lN9mxpj2ehUPDYQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VaJU4qce4d8kLY5vBvpzDPXaE03+xeWvm32Nm0kkdv0=; b=f+CIepRoHW8A//5vuGnbZXTeyZkLV5OtPfxB8w99yy4K2Xe9/i1bpb73ljR3IAGboy 9cmq0XDGGv1cXXIQLOKPCrdRXpDYg97eLRoo17qUONTWiSZFzmrAO6NdhaDSAr61RmOE 6Y3cA90RrMAw447y6jfO/opTSDLgInYsJLVecU4lTyAn3BGnWBtVQPkdGXvw5KgtYgYS vdMALkDhg82MnQKl7cJPNpLzV4geg6icpg+0nQdpsFipe+JhYX/XnfC1/VR59lovwYEu QcUhaV62AQ2xJIv+X0oM2uIY/FxoT8kUH9YETLyDOfvzICeUpIUeWDW5EimMyJzdaCN+ ODZA== X-Gm-Message-State: AOAM532ar3+CQkuSrKO4tTaN65GQBJztqCtKHKhN7hbFKtZlEaZIsnyy WIQNfXMnORIgrBUeaORSIPmVFmKLcEImkIZGeClDzRy57agQmMLSiZX9ZZD/rxbn86htcC75+kQ CMEucZkkqPDm6jw== X-Received: by 2002:a5d:5307:: with SMTP id e7mr10083454wrv.215.1600855347524; Wed, 23 Sep 2020 03:02:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyErCwKgS8P5jJGkmT3fVvMkXsnbfsZMC3MQP86hUlkn2JWmNiVPlc8a9KPYjiOzhfMoa6EIA== X-Received: by 2002:a5d:5307:: with SMTP id e7mr10083433wrv.215.1600855347379; Wed, 23 Sep 2020 03:02:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/4] qemu/bswap: Remove unused qemu_bswap_len() Date: Wed, 23 Sep 2020 12:02:17 +0200 Message-Id: <20200923100220.674903-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200923100220.674903-1-philmd@redhat.com> References: <20200923100220.674903-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Last use of qemu_bswap_len() has been removed in commit e5fd1eb05ec ("apb: add busA qdev property to PBM PCI bridge"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/qemu/bswap.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 1d3e4c24e41..8b01c38040c 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -169,12 +169,6 @@ CPU_CONVERT(le, 16, uint16_t) CPU_CONVERT(le, 32, uint32_t) CPU_CONVERT(le, 64, uint64_t) =20 -/* len must be one of 1, 2, 4 */ -static inline uint32_t qemu_bswap_len(uint32_t value, int len) -{ - return bswap32(value) >> (32 - 8 * len); -} - /* * Same as cpu_to_le{16,32}, except that gcc will figure the result is * a compile-time constant if you pass in a constant. So this can be --=20 2.26.2 From nobody Sun Nov 16 14:06:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600855356; cv=none; d=zohomail.com; s=zohoarc; b=e3rzWlt0f+AuC01eZ3XaDKZMmKXuJ39BGGS3S8ASZtmnwtHYM0FCeZX4yM3LAUeHQb5Ewd4WOixvSGN7MXxUgDwZCEA5YDIPVllhuKJNbfaILOkxlFF0OflE8pYrwPEL4dzbtL1y5aLybLBPym9NVH9Fv6Y7RcTV57M1rgoN2mg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600855356; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=/e6JgH5beo3D4jWhUD/I0gOipenUtz7n5NS7zMmoHHk=; b=S6gpML7wGCBngPchw4K7inIsZZAZ/1csU29bcNIotQKAP6gPA1BSP8P8Ve6KmuKvyw/siDWWLR/bl34X0xlMeIEX9OKe2CREcH43XsD6cY3ELTHMEueYzk2cGd5c1SRn3nwtZA/WCtVUaY/x++Fc5kFLxZ4EqghrLxpPWYZwPcU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1600855356360578.3548008463788; Wed, 23 Sep 2020 03:02:36 -0700 (PDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-276-C8qzJAApNh-INP7aghtDMA-1; Wed, 23 Sep 2020 06:02:33 -0400 Received: by mail-wm1-f69.google.com with SMTP id m125so2024259wmm.7 for ; Wed, 23 Sep 2020 03:02:33 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id v9sm31863826wrv.35.2020.09.23.03.02.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 03:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600855355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/e6JgH5beo3D4jWhUD/I0gOipenUtz7n5NS7zMmoHHk=; b=OBK5gDSjMR71kt3G04EJPC8mm/WQ1NVZxDaGOsKqp99njtXcHw8Mvoa3XeOpi3grG7L5s/ Q4orLxaoIkWbHjV0vdsLTbU+vDZ2D0Zwo1YGR2m2zHfiXjlaAPxMG85RkN7QB2LpoQ87OV DMEOq7GhSOhO4XAPu8rvWsMKizrT37Q= X-MC-Unique: C8qzJAApNh-INP7aghtDMA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/e6JgH5beo3D4jWhUD/I0gOipenUtz7n5NS7zMmoHHk=; b=phx01RCmPapw6HySFK6FFb1QflWcH/YW+uYdKrmICIIx6uC/Z1X8xTyPe2GeNZYPkF +H1qEPvmXusdB4enjrmkP1U16mJF/d9YYknlzXabXJtFiKk684OEk3pNGSohRPBqykRh V/uNis1v+FyixM6sW+Ik9juAmEZFTuFvwVqBGwcpovcHN1MbeleNKIpThM4jbK9j5L/l 1NFeS1ORGmQ2l+ntX6whcd6KsSrR1DJdsjNPpEiqAIpYUi7iwohT4NB2sv1saCmjcfKu coQTKugcB/a3zdH3yKQuv0EoEyw+XhXIdm+pxKWOcsfX7uZ+bPSpSyHTXHZhulUWfA+7 dNHw== X-Gm-Message-State: AOAM533RwScZxQV0pJGtlKeyAtzy00mM6ES6b3Jf8pA9tRDAKMeMnlQ0 Wm8Eq/rHSP8GYCuhnZcWhmtw0PuCGjrl7Sg/z2zIa2Uk5ypsWI45OV7b63VxHRHJQzkwJTkRiiC mKHhKcfRDMk33qA== X-Received: by 2002:a7b:c151:: with SMTP id z17mr5888037wmi.53.1600855352197; Wed, 23 Sep 2020 03:02:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6O0Qjf8oO9lpF3SbviWLdvjTkbe0E561qxviPht1e1wza+nbmlYbMMN1VHTGZHVXBxIqnsg== X-Received: by 2002:a7b:c151:: with SMTP id z17mr5888021wmi.53.1600855352023; Wed, 23 Sep 2020 03:02:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/4] qemu/bswap: Replace bswapXX() by compiler __builtin_bswap() Date: Wed, 23 Sep 2020 12:02:18 +0200 Message-Id: <20200923100220.674903-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200923100220.674903-1-philmd@redhat.com> References: <20200923100220.674903-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Use the compiler built-in function to byte swap values, as the compiler is clever and will fold constants. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/qemu/bswap.h | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 8b01c38040c..d1a2f700f2a 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -27,32 +27,10 @@ static inline uint64_t bswap64(uint64_t x) { return bswap_64(x); } -# else -static inline uint16_t bswap16(uint16_t x) -{ - return (((x & 0x00ff) << 8) | - ((x & 0xff00) >> 8)); -} - -static inline uint32_t bswap32(uint32_t x) -{ - return (((x & 0x000000ffU) << 24) | - ((x & 0x0000ff00U) << 8) | - ((x & 0x00ff0000U) >> 8) | - ((x & 0xff000000U) >> 24)); -} - -static inline uint64_t bswap64(uint64_t x) -{ - return (((x & 0x00000000000000ffULL) << 56) | - ((x & 0x000000000000ff00ULL) << 40) | - ((x & 0x0000000000ff0000ULL) << 24) | - ((x & 0x00000000ff000000ULL) << 8) | - ((x & 0x000000ff00000000ULL) >> 8) | - ((x & 0x0000ff0000000000ULL) >> 24) | - ((x & 0x00ff000000000000ULL) >> 40) | - ((x & 0xff00000000000000ULL) >> 56)); -} +#else +# define bswap16(_x) __builtin_bswap16(_x) +# define bswap32(_x) __builtin_bswap32(_x) +# define bswap64(_x) __builtin_bswap64(_x) #endif /* ! CONFIG_MACHINE_BSWAP_H */ =20 static inline void bswap16s(uint16_t *s) --=20 2.26.2 From nobody Sun Nov 16 14:06:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600855361; cv=none; d=zohomail.com; s=zohoarc; b=aWg5RKg/sy0y1Siwo3gOju5A+MxzRoxeqQCOLcO65jkKMSzaeCaNhALt1RT86r730687I5+LxYQLjnr9KCNLT5ye0/LB6zh+2V2chEwUfWyQ5ZaRS/Ne9EVWYGa7+VPuOZCN+h+n7afNUENxb9qrDJ3KEl9uYNI3rO++CPEPVNk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600855361; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=cT9d0kWx7W8f1InGcBfK9ss0HD7cg0vYKo4xIiLm6K4=; b=OrKOACc7FtWqNyfokxOPcau6bWU16PVMGbzM0APQot6eVAc3x07Z8NQsPRGGmz+hcilyfcJVGQrwkKz9En48NYVh466KLtjwBE4DIwi/dxba+y1H4Sw2twOVCsWYK304v2BKLuLTLycV9w7NAtcDuweD4aSgnWNwpd3ezROI124= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1600855361754848.6425084616769; Wed, 23 Sep 2020 03:02:41 -0700 (PDT) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-327-pMniirs4OlaxGdqU2aQlfQ-1; Wed, 23 Sep 2020 06:02:39 -0400 Received: by mail-wr1-f70.google.com with SMTP id b7so8638286wrn.6 for ; Wed, 23 Sep 2020 03:02:37 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id n4sm29581314wrp.61.2020.09.23.03.02.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 03:02:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600855360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cT9d0kWx7W8f1InGcBfK9ss0HD7cg0vYKo4xIiLm6K4=; b=PxFx5JAUZ9AF6OPz0H7kDWdgFFdRL9DkPOy34Zcq5lQNQiDxIejqNLWOGcq5s80W6slENc AKqcWZ9xJoIGXGEmaRPubqspW7v1OGXo6skP9ws4YnWekMgQgx/1Idw/qmgeB9/uQfkQeU r/FVFj1wDxwAcU7tXC6mi1ISW4sdCYM= X-MC-Unique: pMniirs4OlaxGdqU2aQlfQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cT9d0kWx7W8f1InGcBfK9ss0HD7cg0vYKo4xIiLm6K4=; b=OHh9EcBBxfEFA1Lb6/C/7dM9SvRY/1pp9rnOZDAsNWZByNlu/h0hLK2peLAPG20fV6 GYnGk4sI3iD/s1If2gi05d+kcUPKV0sTai+wLGfThQ7+lJlrP+1u3iunhbiin441zchK sgsttxnOVq+TAMTTfuUpCWQ1Le1CMpDbtFv6+awfy12BME4X7SJqqNWGq/16eGzi0huc HVjMGOSs/u9d0fLQM4LDjAP8pSUf5QsozeMsJCchRusYpDpTTGJutYFvJVy+LggvghrW kOZJ7FHNKwbzRMdaCahbslNjI16+DWrfEAApIvDOSYVsmd9g8yXEjHRQKPc/xQMHnsR2 WEYQ== X-Gm-Message-State: AOAM532I1FI7nYdaS8xqLkXbEe5G1BpWCvlgjEymDH/8/fFDpdv/MtIC vxQmk1nSghE1/uWAoJRwak3nmFMbZkV+dgusuaV917uZ6Aup72fsOP1EMWVbBOj7c8mjWF4U0GX mU+uZ97/gbUkx0A== X-Received: by 2002:adf:f190:: with SMTP id h16mr10400417wro.202.1600855357018; Wed, 23 Sep 2020 03:02:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzFZSKv5EkW28efsDBlQa2LLR+DlXPzMU4i/rk6WMmnnTBcKYYiz4tEyCUpKgO4gTder7z4A== X-Received: by 2002:adf:f190:: with SMTP id h16mr10400388wro.202.1600855356754; Wed, 23 Sep 2020 03:02:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/4] qemu/bswap: Replace bswapXXs() by compiler __builtin_bswap() Date: Wed, 23 Sep 2020 12:02:19 +0200 Message-Id: <20200923100220.674903-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200923100220.674903-1-philmd@redhat.com> References: <20200923100220.674903-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/qemu/bswap.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index d1a2f700f2a..6875e48d617 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -35,29 +35,31 @@ static inline uint64_t bswap64(uint64_t x) =20 static inline void bswap16s(uint16_t *s) { - *s =3D bswap16(*s); + *s =3D __builtin_bswap16(*s); } =20 static inline void bswap32s(uint32_t *s) { - *s =3D bswap32(*s); + *s =3D __builtin_bswap32(*s); } =20 static inline void bswap64s(uint64_t *s) { - *s =3D bswap64(*s); + *s =3D __builtin_bswap64(*s); } =20 #if defined(HOST_WORDS_BIGENDIAN) #define be_bswap(v, size) (v) -#define le_bswap(v, size) glue(bswap, size)(v) +#define le_bswap(v, size) glue(__builtin_bswap, size)(v) #define be_bswaps(v, size) -#define le_bswaps(p, size) do { *p =3D glue(bswap, size)(*p); } while(0) +#define le_bswaps(p, size) \ + do { *p =3D glue(__builtin_bswap, size)(*p); } while (0) #else #define le_bswap(v, size) (v) -#define be_bswap(v, size) glue(bswap, size)(v) +#define be_bswap(v, size) glue(__builtin_bswap, size)(v) #define le_bswaps(v, size) -#define be_bswaps(p, size) do { *p =3D glue(bswap, size)(*p); } while(0) +#define be_bswaps(p, size) \ + do { *p =3D glue(__builtin_bswap, size)(*p); } while (0) #endif =20 /** --=20 2.26.2 From nobody Sun Nov 16 14:06:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600855368; cv=none; d=zohomail.com; s=zohoarc; b=MBLgS/0TPma1Or3bpHScBaoplkx5DfW9BM0KYEUhBH9y0Bqi8kgjkT+Q9LThd7C/J6txbFpHtbIUBKvXs3vtdWmBEOegiK0J7NzrRlxB4AsPmYZmzZ4v/qqB2knGAciRqEOzKhSM6orP9Od9KCQrouVhnzudk/BVFHEmYwh0axM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600855368; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=iC4V1PEXAFDMxJmiZikknRbb4O4GLLtG0+6GroPagmU=; b=kVB3S80jRal/AGX7VjWQi9Nf4H0IHOkREbsGZjLOif225blu2sje8qtOnSSGp8rijzmL0X1N5+WDA5ipJe/Vz//6guyY5cPvENCAXwMX1s/pZ94W9bVhkqwWbR48Ssztagp0UGq2GE3H16uSn8K3mGloLSeHhkNJVaJiUir9Ls8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1600855368237224.08758815157273; Wed, 23 Sep 2020 03:02:48 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-116-3xQAUvjDNxOxBlrYNpw8LA-1; Wed, 23 Sep 2020 06:02:43 -0400 Received: by mail-wr1-f72.google.com with SMTP id f18so8632231wrv.19 for ; Wed, 23 Sep 2020 03:02:42 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id d5sm31892640wrb.28.2020.09.23.03.02.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 03:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600855367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iC4V1PEXAFDMxJmiZikknRbb4O4GLLtG0+6GroPagmU=; b=BLzCxD/K+cqJSStP1dM24q5mDyIllQn1siG5y2W7/ZzjFDHc4IJMaWlaQUDwCYp6F9J3/2 HusJd9ENVz0d6bd/a/dF7o19UaPMbW4F2cjVx15UFy4NqjNSwkRgvkbsU+xLSBWpTiCP3b YqjzL0P5TC3ap4ZPOYpVhuzkX/9dKao= X-MC-Unique: 3xQAUvjDNxOxBlrYNpw8LA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iC4V1PEXAFDMxJmiZikknRbb4O4GLLtG0+6GroPagmU=; b=b8g5/HSlKbcrHx6whLdbg1ug0sq6xN02tqfZUgQwdAdHv7E12rk/weD0wm4K2c9syJ F4Xa685dfLaOh7y/UTsDQdugIsvRSDiXB3D/cdshNQMLyszYKAerGi/xavEQkn+hmqBV 9TbY7VotlnN274jwmJUYomdX35G4bGqfvB8EPH+pyHNh946b6nQhW8ZPXAQwHgHJhg5+ aPOzum07702LFE+8sN9+3RQCnNSNNQVYaI31nK7oec9WMBUvb8nTTlk2vB6//cGLTPD4 A5quVGgFqre+8yaun6S0XXr4Rvm2Hxq1jNODoPTsu5/H2A1IMpZ06Z4kNyWd5i1EP81K 46CQ== X-Gm-Message-State: AOAM530lOLg1xy/0O0L1p6UrJ4nqn4l4VHzgO9C4KbueG+5qmNY7Nbj9 JaDPpuzHuncU5IVy6rYbz2VFlZ9DuZar8KwqkHj640EM431H+9GMVRxGSQH1854sDPDLUPy5BFc QrfRJc7pOYxvZhg== X-Received: by 2002:adf:f190:: with SMTP id h16mr10400884wro.202.1600855361847; Wed, 23 Sep 2020 03:02:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUIwPj6O+U3sHYM/lPBsqJT2haHD47XIhumTZJ21A6kuR3lVIPUaxsGQGtiVtqI625zQGZqQ== X-Received: by 2002:adf:f190:: with SMTP id h16mr10400869wro.202.1600855361707; Wed, 23 Sep 2020 03:02:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/4] qemu/bswap: Remove dependency Date: Wed, 23 Sep 2020 12:02:20 +0200 Message-Id: <20200923100220.674903-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200923100220.674903-1-philmd@redhat.com> References: <20200923100220.674903-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) All our supported compilers provide the __builtin_bswap() functions. Drop the dependency. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- configure | 13 ------------- include/qemu/bswap.h | 17 ----------------- 2 files changed, 30 deletions(-) diff --git a/configure b/configure index e8e8e984f24..bff787daea7 100755 --- a/configure +++ b/configure @@ -4886,16 +4886,6 @@ if test "$docs" !=3D "no" ; then fi fi =20 -# Search for bswap_32 function -byteswap_h=3Dno -cat > $TMPC << EOF -#include -int main(void) { return bswap_32(0); } -EOF -if compile_prog "" "" ; then - byteswap_h=3Dyes -fi - # Search for bswap32 function bswap_h=3Dno cat > $TMPC << EOF @@ -6789,9 +6779,6 @@ fi if test "$st_atim" =3D "yes" ; then echo "HAVE_STRUCT_STAT_ST_ATIM=3Dy" >> $config_host_mak fi -if test "$byteswap_h" =3D "yes" ; then - echo "CONFIG_BYTESWAP_H=3Dy" >> $config_host_mak -fi if test "$bswap_h" =3D "yes" ; then echo "CONFIG_MACHINE_BSWAP_H=3Dy" >> $config_host_mak fi diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 6875e48d617..c192a6ad3e7 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -10,23 +10,6 @@ # include #elif defined(__HAIKU__) # include -#elif defined(CONFIG_BYTESWAP_H) -# include - -static inline uint16_t bswap16(uint16_t x) -{ - return bswap_16(x); -} - -static inline uint32_t bswap32(uint32_t x) -{ - return bswap_32(x); -} - -static inline uint64_t bswap64(uint64_t x) -{ - return bswap_64(x); -} #else # define bswap16(_x) __builtin_bswap16(_x) # define bswap32(_x) __builtin_bswap32(_x) --=20 2.26.2