From nobody Fri May 17 17:45:50 2024 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=1601299186; cv=none; d=zohomail.com; s=zohoarc; b=WYc4j24eNzIiXiqije/3KOdiRbz5OLz8N80tSgvh2CnDQvyEfKo8FdltK+81zbv4QhhZqV8/9X3lClyvNaHfp6u6yGofTKW0WgeCLJlwq1av/CdG9VITSP1bM84CYhk2kBjJUhZgQ8o+rJyWJb5YAkjIn1TdwQl9XgQ0K3idLlU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601299186; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=hl9slfH0zxQ134l7Pfr//jBOIgk547l+qxt5CXwb7Qs=; b=RLpll1pbO+/jNAnvhdWoFvPBKk5k3hl8bNaIveZ1HFo0/eRIoS5nmOpOjr57KnlBh8+QhQGHxdvBlwo/Bmal+AXMNEc9KNydJIZTMZ/PT/cC0YsVrUee0ZOze37vm7ufmMfkll4jAsoyZrPdnSx7ebtPHyxyZt8vFaBHAmIuQP8= 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 1601299186714785.9448347008647; Mon, 28 Sep 2020 06:19:46 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-391-gdOMtqzAO3-ElM4_QaToOw-1; Mon, 28 Sep 2020 09:19:43 -0400 Received: by mail-wr1-f71.google.com with SMTP id l15so404615wro.10 for ; Mon, 28 Sep 2020 06:19:43 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id b64sm1344104wmh.13.2020.09.28.06.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 06:19:41 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601299185; 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=hl9slfH0zxQ134l7Pfr//jBOIgk547l+qxt5CXwb7Qs=; b=O3EVSfB84UVLxgT23LlsnN+DiqrhTpHgI7gzknF9HICuW7WnwghitD5OyGMc2Jh2bJy+S+ T3vlxNedLxznctnFO2Up+sEE61awueC3SQYADo0cEbZnOfzQHHmvY/7aLlQSMhAQ3CJYwT +G9b4FPgD7HeUq8htvZKG1Y0S+3ihvg= X-MC-Unique: gdOMtqzAO3-ElM4_QaToOw-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=hl9slfH0zxQ134l7Pfr//jBOIgk547l+qxt5CXwb7Qs=; b=HaH55O0luTS2kEBHqt/g4OaPrtQJdo8Aphc2oXy0K/yHR2s/vVoJ+tpeZ7S43t8sgZ bGj2+COelD7v8ZK+BybpCeFpGjHKZmfQXO6ChOEuenrpcCPr+eRRKnQUhYFkFQYUuly1 KSkMjeGAU02V3kIlpeg5mhnRJn/e3m9HhTwNu70zua5rLx1llyzqYwVBxBBjH8Iee6lU yp0ZyzSJgOVnkFvye6gWQfBKDd3ZB8wCAbc0MC9couHS5caWpVlKDj0E6HcoVAkUjf2R cPxPvTP3+kEi9Qd0b4Tiz8j70eIhkryLQxcLpIrfAxScSdeyrg/nLsUN5pPFef4T0I2L sLNg== X-Gm-Message-State: AOAM532blgh2vzDZ7KLIQfLdN2R6CeXh9W3Bc5lqrvbDGfbQwdqUcM5N /am5KnY9j/Z4PsTStklfXn0heU7YboDzAJ7d7dIU87z/rkNDFITsEJtkk98iLWfUzAABIxyJmnN 96IxYU9DZX1JomQ== X-Received: by 2002:a1c:55c3:: with SMTP id j186mr1633389wmb.77.1601299182704; Mon, 28 Sep 2020 06:19:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYoCu1W8ZOZC50kwm5Zi6PF3g8Wmc0+2rWOCbNTMdTYqqf1+PiCnHb4SkFJYiiU4evQRThQg== X-Received: by 2002:a1c:55c3:: with SMTP id j186mr1633363wmb.77.1601299182508; Mon, 28 Sep 2020 06:19:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Kamil Rytarowski Subject: [PATCH v2 1/8] qemu/bswap: Remove unused qemu_bswap_len() Date: Mon, 28 Sep 2020 15:19:27 +0200 Message-Id: <20200928131934.739451-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928131934.739451-1-philmd@redhat.com> References: <20200928131934.739451-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" 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"). Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 Fri May 17 17:45:50 2024 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=1601299194; cv=none; d=zohomail.com; s=zohoarc; b=E2ivmR8+eclDk2n4luEsckohau+xbLLKhg6OIBxAoU54hoSZ0QOWUDmGYr1atnIUoDLNYgDIEc+mf5ZZRBKqT1dwVOHEEgAAsY+bn73CUrNmgQEFZdg89agm3q77RN1GWtjM+NRwYZ/KHbEHMHqjy0IsCZgb5CxjLVJ2EdzfUFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601299194; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=05siY0cHdlWfeeA7J6d3xMUvet3cGKDwDV5A5FHlLno=; b=CyFUbRZY5mFjLb9fLYYB2x7r7DZfV7bT3kHoVCC8RO00H/RJW0PPadRR/SRGaSLilMqYVQxkahbBRG7WJX/1+Y756sbddG0N3RVK31HWoBRfhFdIzIvJ7vC4qeR8WgaS4YS3rY92RJUWSNN8v37Mvy50QHniaUVsNY3Xa27EUag= 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 160129919438964.53885931217326; Mon, 28 Sep 2020 06:19:54 -0700 (PDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-208-YW9OZQCkOt-HcsM25PNF2w-1; Mon, 28 Sep 2020 09:19:49 -0400 Received: by mail-wm1-f70.google.com with SMTP id b14so345613wmj.3 for ; Mon, 28 Sep 2020 06:19:48 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id i26sm1370291wmb.17.2020.09.28.06.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 06:19:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601299193; 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=05siY0cHdlWfeeA7J6d3xMUvet3cGKDwDV5A5FHlLno=; b=GYAfWeSp2kXrDSJt9mWIHaCDML5UYPCkU1ZsweJpEMdS632NSirujf68F28u8ek6mvf2Y0 euYQWL2Etyo5QVOomLUmhdaw0iWVAGcIS3AyyLbMNUct0z8lxfs8h05j3wylReRS4e6tn7 4374o5ZWnF2pvXzDTB2vU94Z5pZ4wSc= X-MC-Unique: YW9OZQCkOt-HcsM25PNF2w-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=05siY0cHdlWfeeA7J6d3xMUvet3cGKDwDV5A5FHlLno=; b=UlI8WghSDrRg6lX8bJU2QxrIlZ/xhKJ1aAM6pWl5H0TK/UA8QAF9y34CPUbek38GDL N/qhvA7E0MxL6fe+2Di4s2XqEpiVVXj5S3nx8QYga9i70oeMFn9FmbpndPtf6RLko7XI v8oDaI1fBqYL/mbozYWWliNUXxlnIGvck1dM/+u9DctLCMpL1BtD+edL29B38ergHiWo K386qyY1sTmq9lLBbIPQpTPt4fF5pnZxEmfrvePVG/zzid2YzmQ4qHKabteZcrOczVnf VQ83V+JnXBpFlTXbrAy5q5tq84IiJA2tZ1Jxi53XbSsvBt10QkbRyVC/CppAlxcWSPHh 5B2Q== X-Gm-Message-State: AOAM5303IZGUtDXvA7G+lqsjVQWGtZAB8JkdhLeRY4PermIdcdTcpCah IecJR+SfcBto+mda8ev5PX0zZxpl5l739T53fP/hUpq4BoEd4oa9tANgum6m8VTwHktGXwj86CF /SWOScY5S3dJFog== X-Received: by 2002:adf:edcc:: with SMTP id v12mr1674387wro.240.1601299187894; Mon, 28 Sep 2020 06:19:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKLPNwa34IqYdT5WX6CUVduVT7I5vLBBYwH0Iuh4tpURZlygsaB19A+gi4Tj394WDtQd/fyw== X-Received: by 2002:adf:edcc:: with SMTP id v12mr1674369wro.240.1601299187747; Mon, 28 Sep 2020 06:19:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Kamil Rytarowski Subject: [PATCH v2 2/8] qemu/bswap: Replace bswapXX() by compiler __builtin_bswap() Date: Mon, 28 Sep 2020 15:19:28 +0200 Message-Id: <20200928131934.739451-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928131934.739451-1-philmd@redhat.com> References: <20200928131934.739451-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.002 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 Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/bswap.h | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 8b01c38040c..41131d3d76e 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -27,32 +27,13 @@ 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 +#undef bswap16 +#define bswap16(_x) __builtin_bswap16(_x) +#undef bswap32 +#define bswap32(_x) __builtin_bswap32(_x) +#undef bswap64 +#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 Fri May 17 17:45:50 2024 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=1601299197; cv=none; d=zohomail.com; s=zohoarc; b=ZQxtwP24QwDviGDnhr/pgo5GcfP+c6/XFql90KwTeQRatZ2VLYT27AG3iY5aYQJUTFIIZLB3HApkZsi9Gs4+VARsovH/0Dsgznrod0g518onkm0/+Vb70N1vvk3K88AYpXYO5l8vkjay0EGsovB3tFRK4QZGlsYWa7Kmq7ZEhvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601299197; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=/GuNNoh6nkdsrmjKbQNZ/H8CBCcsX4tPVisO++gKbE0=; b=NW2y5JdsLTuqHot6H7RyHOfxAb7ACOAhbrRzzV/gN/Znhf30V6x4a3YAhprmreYGfi47xllIWl5NAPSgXnDYNzm9b+PbgKOP6suuzgxgFmwHOh/aOWA3qKaeAEdKVuIpdP2oy5AWI8Xj/3AhlOQJWGjIrgaZ6ZjAueYe8DZgJ6Y= 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 1601299197217162.86741824237322; Mon, 28 Sep 2020 06:19:57 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-565-NOr_YHeQNj2HkICn4zNFLA-1; Mon, 28 Sep 2020 09:19:54 -0400 Received: by mail-wr1-f69.google.com with SMTP id r16so394279wrm.18 for ; Mon, 28 Sep 2020 06:19:54 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id z83sm1392284wmb.4.2020.09.28.06.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 06:19:52 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601299196; 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=/GuNNoh6nkdsrmjKbQNZ/H8CBCcsX4tPVisO++gKbE0=; b=NymI8jyUMD9t3Z4oqWb/HWUJfPuJwtj3X6PJPKu5YAG3DUC+YVxuAAVblxZSs8A1sTd5vN EVOpDL2pORJZCiwUd2Z0Mnd5JmDZsBdLH2oFFqNOzRMKfKTyCUcVg9cSTbWkjNVkwQqRVQ DiaayKuKZbqQgVZUt75Uc8c9rWHAEGM= X-MC-Unique: NOr_YHeQNj2HkICn4zNFLA-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=/GuNNoh6nkdsrmjKbQNZ/H8CBCcsX4tPVisO++gKbE0=; b=F7IEhnJh0CbN91BR6WC4bPnx2rMbAYkV9xIFg0nbUWQccSlUy/WrFTJclUHMHF/cwH 2qDuK2GTGRcoa7hnHvpDvzCqJMYhVRx7eWw8bLaFKNOFP+4iR/So63c2g/Mj7M0xEoI5 HNco/VNMWXuGP3cvuLJUnJ0DdvbNb1LMg05A7ibbJhajj6ZzyJXXc3tlZwPguUhDL7tj dGUl8T26GGqij81ZbOdnqQ3rH/VfbO/wNNMGvpYJPbiLOtcbflCJA+KSir+ULdaS4Rin pmCYnGNUionm/KzsC2xAhI/DeyAlf1FZv4AEb7DWVDlZYhBT7DwXTLrc4kqFf1GTYt1X wxPw== X-Gm-Message-State: AOAM530/UTGl5MHZP5kEyllod3WAmuh313Gwj/FT4dTiIGRZNWJy9Cim thulXwqdVZAe9+/EUZVHaW44J8Ls97goasgvJakjIIwAhNbeWgP8jWVOHuqGW/ZGKC2zith4+YP JqoeDYMpo7MIfCg== X-Received: by 2002:a7b:c84a:: with SMTP id c10mr1597331wml.139.1601299193214; Mon, 28 Sep 2020 06:19:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyat1laQPxulibnFjOJctKDEtgKO4pKfyi/4oZgnhBrfdQVkb9kh6nVGm0ZFsSjsDUCiOH5sw== X-Received: by 2002:a7b:c84a:: with SMTP id c10mr1597319wml.139.1601299193024; Mon, 28 Sep 2020 06:19:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Kamil Rytarowski Subject: [PATCH v2 3/8] qemu/bswap: Replace bswapXXs() by compiler __builtin_bswap() Date: Mon, 28 Sep 2020 15:19:29 +0200 Message-Id: <20200928131934.739451-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928131934.739451-1-philmd@redhat.com> References: <20200928131934.739451-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" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 41131d3d76e..fed96dddd7a 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -38,29 +38,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 Fri May 17 17:45:50 2024 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=1601299203; cv=none; d=zohomail.com; s=zohoarc; b=dlnQL4j2H53Pxl3j1dF3wzMTbqAt2CPX6V+viPi42iDqTO2dIVKZxqfL76PuX3GcNfg+bViAx3D6DnOQVXOcDbcormwNFexgYDxmUrRvvV/g7RDtszwXs0YgYed2hnNm3dSqIUafFr7+1M8ityUc6QMTNXEmnEgzoaYkEdhvdrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601299203; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=IQxJXzhc1czKuYkocMWwWEQUckk+RWA2innt4R1BD+0=; b=cjJ9Zff/3I2OMo1zb+Twh70S2fxsnLU5UmZYGk4gCC6MEhSu7Mgmedwz5IOnb8Kd8gqj3AVQnS+wH92Mt4mBOb9TFEtghjtb4LZstLOU7SznCqPoCZZl18Wd2DmUkm7W7Eg7CDUApQ3052cUE1pH5zLuKt/0xK9W4HfNCmHGQfY= 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 1601299203342936.147218842947; Mon, 28 Sep 2020 06:20:03 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-238-eb-2VHt1OeWM-7iR-BD_LA-1; Mon, 28 Sep 2020 09:19:59 -0400 Received: by mail-wm1-f71.google.com with SMTP id t8so340646wmj.6 for ; Mon, 28 Sep 2020 06:19:59 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id k6sm1201517wmi.1.2020.09.28.06.19.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 06:19:57 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601299202; 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=IQxJXzhc1czKuYkocMWwWEQUckk+RWA2innt4R1BD+0=; b=McNHHhjkiWLp2z0uT1R3jAJk85LqJtC+uEzVcWU9FObrvypEHUv70E/EpmGNEUcxozcEjl XPSIgIB3O/RnVP1ai2h1SpnpngOBjOnRYfatOemOik7Shs1BpI0N2UteXqHO8gCSd5dcHQ tjhRBBAayIKsqtP5ZuKGZUXGkdq/vsc= X-MC-Unique: eb-2VHt1OeWM-7iR-BD_LA-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=IQxJXzhc1czKuYkocMWwWEQUckk+RWA2innt4R1BD+0=; b=fisO/YqmBYy8sWF1DPrfrFOkHzscO7aMOyvi/KQe5tiAxwalpXD3iv6MD/lhHp8czx y3+PvmS7yA+4z0VRXgQY+WVMR9MNUDMiQ9PAThC1BCfi+FedUwpQci5VFerKoMB7/ww4 qmy7D4VM9xz+f/bediS8qIo3oavyBJuAQlFBoI8JPa8ZSQxfhuFptHoat94XB2kwK0+s aNB1zSUFBlj99hh+N8oEOP3/vxQ/SoEHDp30qNA8W3kqHnyy+vif2IBbBYCYiPHiXsuc 4YDgm8jMa8zgDRtNDCpACH2e3Ig6xAnrxGUTZRZtDqglEydpJuTs+HHOWG4Y/zFEZ+HQ COoA== X-Gm-Message-State: AOAM533NUf15orPzYxj0ILF6s1dXvtd+lpBzvrqnA+4VYaUI4Pnc3VjE 3hI3CBgkStUwVxRC/CttNyoJHfhn31XJiQH/luK3FmEdj+nPPmjqeUNaCQKbF8SpAQAN+skouko yj3TLcNG0gnSR3Q== X-Received: by 2002:a5d:522d:: with SMTP id i13mr1818018wra.296.1601299198478; Mon, 28 Sep 2020 06:19:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzblxRHV4qk9P2hlAVjSPw3Wp0Nhe/xUUzTvRLnKirvlK6osBca2K+2+wIrV8HZYIs84O6bSA== X-Received: by 2002:a5d:522d:: with SMTP id i13mr1818005wra.296.1601299198312; Mon, 28 Sep 2020 06:19:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Kamil Rytarowski Subject: [PATCH v2 4/8] qemu/bswap: Remove dependency Date: Mon, 28 Sep 2020 15:19:30 +0200 Message-Id: <20200928131934.739451-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928131934.739451-1-philmd@redhat.com> References: <20200928131934.739451-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" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Since commit efc6c070aca ("configure: Add a test for the minimum compiler version") the minimum compiler version required for GCC is 4.8, which supports __builtin_bswap(). Drop the dependency. Suggested-by: Richard Henderson Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 fed96dddd7a..55916670d39 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 #undef bswap16 #define bswap16(_x) __builtin_bswap16(_x) --=20 2.26.2 From nobody Fri May 17 17:45:50 2024 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=1601299208; cv=none; d=zohomail.com; s=zohoarc; b=eAassXxkaBNcRXml48gPtdOTt8YWmmVimD9wnkzTtYdICkkvwNmbpGiEbO6c8yWvwJmcF0+Uh8AsEGggabU48XrD0kILHqC906wDnvTLY9mxczQzWiyIvXA7xHmuHUI76d3SMrnnwhJbp4Ty65kLTLV54+1e+3s9Th0uUTdKiD4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601299208; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=01GR7uo5lwZc+yIqp2XAePCo6kJWui/s9AmyV2I4Bcc=; b=AOkMyted7G0+mD9Fl+WE57whq253DI6s/prxp7r2k4fxRJPyQHxz1srDABIgRAwmLipBPzJ8MbUy/Rqzmd1t/WyXGCOd3O43QlGO6/0Tj9kdiAjRll93j+Gm50LEVnJTHl/BBE+ZofeleZ+VTGSrY1+il2BG/ZkPMCNKyCA7bU8= 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 1601299208091239.849052058393; Mon, 28 Sep 2020 06:20:08 -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-275-8-LPvPUsMOqaV6Zh_9Q07g-1; Mon, 28 Sep 2020 09:20:04 -0400 Received: by mail-wr1-f72.google.com with SMTP id w7so415002wrp.2 for ; Mon, 28 Sep 2020 06:20:04 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id f12sm1132893wmf.26.2020.09.28.06.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 06:20:03 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601299206; 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=01GR7uo5lwZc+yIqp2XAePCo6kJWui/s9AmyV2I4Bcc=; b=Yf+Y5BKUPhbfxWDQG0toWR/4/de/P5jZksmU00wJXX+AbCX8QW1e2S6ApT5l9p9/pFs6oU BdAFqRZghZVi3xim+j69lTL2mjckxfO8bHHzeaGcjREUSqu9xzNBCWZuDIyWzKJBSgGicA JDvQ7RvVLsydJ6d454q+5gqPyO8hu5s= X-MC-Unique: 8-LPvPUsMOqaV6Zh_9Q07g-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=01GR7uo5lwZc+yIqp2XAePCo6kJWui/s9AmyV2I4Bcc=; b=DBUNT48aAuSjNkrUsx4IwkIT4WWKEo2KmAH5Hg3QaBNul9Nmoos+X41sBbiqjAfwn7 H+1xn+Ft2EXquHPr3MuFCnbNslekSCeLoKvjDQCPUFsHagR1+A6nZXZCd0ZI586fY9sg /94QFPiC3MQybSsR+DzZ+Do4dXSoIyCGE790QkASHFt2bhMbHWJZTsmU9Voyg7V260Yf CyBXJNnwSCRTQNZKRwoaqN7XFjVYW6RmzUI7dIhrBY6HKcG2onmnLyt1PQsdjGw6fVox AUl5cQPHNQy7Ta8Xky/9MWqGFUsKFigRpJtrdefCS+LllriXtGlkhEED1yLoDyTXR4PV nYxw== X-Gm-Message-State: AOAM530LqsmzlU4rzTJsh5FgXRndL3cIv9TA+jJ5UWwZCcMzJRYO4r2Z zFDp5UNOT7fkzK6fKvFvhNC207BZX1q5dDlAM9VOof5iNHgfNQHXAz9hy/gxpSiDH2lTaswTih8 OQ++MwYtF5PWYcw== X-Received: by 2002:adf:9b8b:: with SMTP id d11mr1816012wrc.71.1601299203796; Mon, 28 Sep 2020 06:20:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRb/MptPfIb8V1ZZQJzsk6PCTgiXyYbDVQOS/vQAmwn1XFKrLmnjBlEJjT0jPXMMKaVlCz+Q== X-Received: by 2002:adf:9b8b:: with SMTP id d11mr1815982wrc.71.1601299203649; Mon, 28 Sep 2020 06:20:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Kamil Rytarowski , David Carlier , Carlo Arenas Subject: [PATCH v2 5/8] qemu/bswap: Use compiler __builtin_bswap() on Haiku Date: Mon, 28 Sep 2020 15:19:31 +0200 Message-Id: <20200928131934.739451-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928131934.739451-1-philmd@redhat.com> References: <20200928131934.739451-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" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Since commit efc6c070aca ("configure: Add a test for the minimum compiler version") the minimum compiler version required for GCC is 4.8, which supports __builtin_bswap(). Remove the Haiku specific ifdef'ry. This reverts commit 652a46ebba970017c7a23767dcc983265cdb8eb7 ("bswap.h: Include on Haiku for bswap operations"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: David Carlier Cc: Carlo Arenas --- include/qemu/bswap.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 55916670d39..719d620bfe6 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -8,8 +8,6 @@ # include #elif defined(__FreeBSD__) # include -#elif defined(__HAIKU__) -# include #else #undef bswap16 #define bswap16(_x) __builtin_bswap16(_x) --=20 2.26.2 From nobody Fri May 17 17:45:50 2024 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=1601299213; cv=none; d=zohomail.com; s=zohoarc; b=DaW6Qbsd0p8vptDCzKupPa/1PpOUjnwPBB4hHeLpbSqJ0/v0wCKaLF3L8umgYta1IlOvFoB5kJhuy090iSZ0DYQ9HkweY2SqHdscvm9fzYFtQltBouuouimEiASzPy7o1RClQ1YFrHyRyjbCLCLl5K6zrDesF17EIWaVIwKNopI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601299213; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=se/oNrbj72j7l4wWWeNKso7ox10vwm+7m/MBRp2oEp4=; b=cZzlvJjwnjpE4868firzAffrdBUuvfzNDDHkVVbopUkgY5UuC6wy49Em5CiP0me4nWK2iHg8UKzOwQH3EfXZ6y9Df4L5Lhm+cZ4oWP7XV/D6//LB/ligarowDjsVj93eiM/RHp76L+uzP8hJm4o7uer9aHCD/6EQifNJx5caMdg= 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 1601299213464497.42649626063564; Mon, 28 Sep 2020 06:20:13 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-64-oYOjIvq_OQuAyNNrXr87XQ-1; Mon, 28 Sep 2020 09:20:10 -0400 Received: by mail-wr1-f71.google.com with SMTP id b7so408910wrn.6 for ; Mon, 28 Sep 2020 06:20:10 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id y68sm1281318wmd.39.2020.09.28.06.20.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 06:20:08 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601299212; 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=se/oNrbj72j7l4wWWeNKso7ox10vwm+7m/MBRp2oEp4=; b=HQsnbO8IFM8xrEoDxlHpgNls8BwwmmlG3Q8665znSaVdYLcQcyovj+eb3vMsbwebcpcuTc FvJ79iMFCmpAH63QEzev0wPhkfz3lehOO2ZOgE5uKSYiz4qytG1sriDrzjzvqicz3acV12 zCBoyRSnE8xcJ1Su5WWmIYyvrwMlUco= X-MC-Unique: oYOjIvq_OQuAyNNrXr87XQ-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=se/oNrbj72j7l4wWWeNKso7ox10vwm+7m/MBRp2oEp4=; b=lXvmYjk1owskTWR/KVG9pCbrhXYUr5MxeidhdpLZpYFagYbvAWsrUUD8dQ1taWYEju nECEuNM5Gx1x9nrFuazTvxORTepuEqig0jkLAxSoNekuQWiYCTwc5QX1p35SBpNx3zvH 3ZkLYPCRYjjc7LWAj65LGYcYZUW3mPNr4pYFsX+1dBpiUHnGEVDGBmASsZ+M1K6cNiWO Tuc8tqFYpTpvGW6VS6oJ2eVqckRCJ5KvhNluR0aphx9+odBNZc/6116AamwfIMjfcBx5 v+fOyBmm1SCm6IDuoVBCWmo2yStg6Yv10QT+uip2zc4PgutHRICnIiNp0hVFL1TP9ceH Zfqw== X-Gm-Message-State: AOAM530DQLrPwtf9HQFjyzEc30ici2by8cEP4aYHU4x6Hte1h+degTip hde1fhl/VhxCrJCZ18IpmEguixz48llTV9kmVWiJtD8vb+0h/2mhAsKvRv6SfiNZd5h2/54egnd XaVelMgP9nKx6cw== X-Received: by 2002:adf:a29a:: with SMTP id s26mr1698403wra.197.1601299209070; Mon, 28 Sep 2020 06:20:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUE02FaPHU84DL31UVZTdkSiT6Kw4FelT6seiFl635D8xxNJTA2H9fSmXydnxs+8HeE17oUA== X-Received: by 2002:adf:a29a:: with SMTP id s26mr1698382wra.197.1601299208893; Mon, 28 Sep 2020 06:20:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Kamil Rytarowski , Ed Maste Subject: [PATCH v2 6/8] qemu/bswap: Use compiler __builtin_bswap() on FreeBSD Date: Mon, 28 Sep 2020 15:19:32 +0200 Message-Id: <20200928131934.739451-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928131934.739451-1-philmd@redhat.com> References: <20200928131934.739451-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" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Since commit efc6c070aca ("configure: Add a test for the minimum compiler version") the minimum compiler version required for GCC is 4.8, which supports __builtin_bswap(). Remove the FreeBSD specific ifdef'ry. This reverts commit de03c3164accc21311c39327601fcdd95da301f3 ("bswap: Fix build on FreeBSD 10.0"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ed Maste --- Cc: Ed Maste --- include/qemu/bswap.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 719d620bfe6..1a297bfec22 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -6,8 +6,6 @@ #ifdef CONFIG_MACHINE_BSWAP_H # include # include -#elif defined(__FreeBSD__) -# include #else #undef bswap16 #define bswap16(_x) __builtin_bswap16(_x) --=20 2.26.2 From nobody Fri May 17 17:45:50 2024 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=1601299219; cv=none; d=zohomail.com; s=zohoarc; b=YfS0Xsk/1r+RhHF2hrp/3KynJwB9N8pls8TqEEPCBk0AJiekIhzX9TX0P/MivZIQczfW9J0jN4sWiKti8zZ2FVp4swoEaJ8G3EU1/0exjdhv4Wxmtp/jXwsltwRg5+YLCYlo94ylQNTFHdfnmHBgdWsrzZro8o1kj39R0jmLRbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601299219; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=sA8HBLAd+5/ZjYUElQKsQkBPTjMwphQifvUOAKUKqLY=; b=oAt844TtRoZxmlUtPAQovZctOtoI85p++sse/vWLVOXmYD3ZMp+ShMRsm+bMmiqeBENS2xbdEMsVSashfQMloznsjXnp8rlZ59B4Wupc7OaT/XzcRm66UN48J32wNkF6o7xFHXy9Cs6A8WXU8QhtWxSbZNGrcApUhqbBPdI36J8= 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 1601299219454225.35212890527282; Mon, 28 Sep 2020 06:20:19 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-236-cRFxJtfqPr2PTJ-mSqZxjw-1; Mon, 28 Sep 2020 09:20:16 -0400 Received: by mail-wm1-f71.google.com with SMTP id x6so384306wmi.1 for ; Mon, 28 Sep 2020 06:20:15 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id n66sm1263253wmb.35.2020.09.28.06.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 06:20:13 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601299218; 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=sA8HBLAd+5/ZjYUElQKsQkBPTjMwphQifvUOAKUKqLY=; b=P024kiPnoU/nL9hPkQylbCcIqzxpFwyggXfc+uQlUihjyYfjJ0tre4+Zfo4m6fk/oP8Yw4 S4CyAEgkMPY22Ge2Ek+B4DUraJY6qrDCoBwTb51asGKn5ojpXfbdgBr29V3lNbEqw7cesZ 7U711rO62bBwQK9xnu9MwtiesD0gQ2g= X-MC-Unique: cRFxJtfqPr2PTJ-mSqZxjw-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=sA8HBLAd+5/ZjYUElQKsQkBPTjMwphQifvUOAKUKqLY=; b=KdoSLvMYBpSl0VQRTTVGh42ULQ4MCtO5HwOUw2zzqEvLFfHxxkufD8WhOXwrm9+Xs2 ej1mEL/HyoFQOXAqbC+JbsTPcTCR9pa47RmdtZ5FY5iopMdCI4GT4V2b501ZGcjTqi/U G/BhM0gBON+Lv5/arNINOqyhrwFwcB9uYcsG6rzQdhDZO7gPjYq4aQDCWdZp8+TsJ5aA ZcldVBjk+RBw35zExTyri5Gu+s/6B9262AKIp+kPnjB1K5s72SdxG5PTf7Tdo0H1CQLN yMJ63UFTfUT7J660gPqh3XVJwq7MeD6SSm1mi68pP3e2IJ1IWE4aDCNZs5Nv0HxEoT2u eqfA== X-Gm-Message-State: AOAM530oMOREohLwYA1NFLqnhq27gSpWE2FF+rSreITgA8S1z2MDu1we 2wglOGa4Auj/kHrjrSn1vhKdFz+nfbFn0IkzwAnTfhwb0UzK4wP0I0kFc7BG/LLVIJH96FsFjUn t3PwBPYmMdFu15w== X-Received: by 2002:a1c:bdd4:: with SMTP id n203mr1583648wmf.119.1601299214473; Mon, 28 Sep 2020 06:20:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEekBAVGlab3ArbOg3zRXJpzuwxev55ZyX+AzjMJADRVtos1SnupBe8YxhFGjJqQ5N1hG0Pw== X-Received: by 2002:a1c:bdd4:: with SMTP id n203mr1583620wmf.119.1601299214237; Mon, 28 Sep 2020 06:20:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Kamil Rytarowski Subject: [PATCH v2 7/8] qemu/bswap: Use compiler __builtin_bswap() on NetBSD Date: Mon, 28 Sep 2020 15:19:33 +0200 Message-Id: <20200928131934.739451-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928131934.739451-1-philmd@redhat.com> References: <20200928131934.739451-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" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Since commit efc6c070aca ("configure: Add a test for the minimum compiler version") the minimum compiler version required for GCC is 4.8, which supports __builtin_bswap(). Remove the NetBSD specific ifdef'ry. This reverts commit 1360677cfe3ca8f945fa1de77823df21a77e4500 ("makes NetBSD use the native bswap functions"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- configure | 15 --------------- include/qemu/bswap.h | 5 ----- 2 files changed, 20 deletions(-) diff --git a/configure b/configure index bff787daea7..1b0a02a0af8 100755 --- a/configure +++ b/configure @@ -4886,18 +4886,6 @@ if test "$docs" !=3D "no" ; then fi fi =20 -# Search for bswap32 function -bswap_h=3Dno -cat > $TMPC << EOF -#include -#include -#include -int main(void) { return bswap32(0); } -EOF -if compile_prog "" "" ; then - bswap_h=3Dyes -fi - ########################################## # Do we have libiscsi >=3D 1.9.0 if test "$libiscsi" !=3D "no" ; then @@ -6779,9 +6767,6 @@ fi if test "$st_atim" =3D "yes" ; then echo "HAVE_STRUCT_STAT_ST_ATIM=3Dy" >> $config_host_mak fi -if test "$bswap_h" =3D "yes" ; then - echo "CONFIG_MACHINE_BSWAP_H=3Dy" >> $config_host_mak -fi if test "$curl" =3D "yes" ; then echo "CONFIG_CURL=3Dy" >> $config_host_mak echo "CURL_CFLAGS=3D$curl_cflags" >> $config_host_mak diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 1a297bfec22..7e586531c09 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -3,17 +3,12 @@ =20 #include "fpu/softfloat-types.h" =20 -#ifdef CONFIG_MACHINE_BSWAP_H -# include -# include -#else #undef bswap16 #define bswap16(_x) __builtin_bswap16(_x) #undef bswap32 #define bswap32(_x) __builtin_bswap32(_x) #undef bswap64 #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 Fri May 17 17:45:50 2024 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=1601299241; cv=none; d=zohomail.com; s=zohoarc; b=I/k2Elf/xIXx3FxEQqrErL9C2IRiFa+Keb3096+gys86ckOgse1xoZZP0g4fqFraB2pnZTsRDwC3qrxtYIYsWTkhRbEis6QloL9KVoqqwzIDj5mtQswQQGJwO/lxrQBw8uEc/1WCj2PnCoBEIL8qoY6BJQNq/lXEJRgGqVc+wT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601299241; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=fm6WWS9bLJ1+765QuleIRGTm1J4tvn4WsZZ1hKdwNQQ=; b=Zyskz9M84rVlYlFBCNSOOcsSuZ8ymUxDKuHkv13HKbkvQnuHOXSD3yEsqBgMGWAbx3akeHLNJTaAnUpUgbAdChQ2mMVoVmOcHbOkZhqPp2BfJwPS43BeOtbboVuaF/TEtOOS7fobFRaOcSeHFHbgvQnEbfZk3Co5hBwjww6/oxw= 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 16012992410181022.2272278510608; Mon, 28 Sep 2020 06:20:41 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-562--9esV7KgMVGyFPVHFyHshg-1; Mon, 28 Sep 2020 09:20:21 -0400 Received: by mail-wm1-f71.google.com with SMTP id t10so336528wmi.9 for ; Mon, 28 Sep 2020 06:20:21 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id p3sm1120145wmm.40.2020.09.28.06.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 06:20:18 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601299239; 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=fm6WWS9bLJ1+765QuleIRGTm1J4tvn4WsZZ1hKdwNQQ=; b=fcQBYM4KL/j/G7P3uJE+lnJTCrVhMqtq0E3TAE2mLCvXTV0CFgF0SskUlTbVhRBGFRc+2F in8WpdGs/JAuXHbyo2o9TP+ZasTqOI/VMk7a9QuD6ouoBRSKTte1WUkVNYv6qYIqBhGD1x BpLV/wK3KPRX1Gd6CTVy1P3BPXiCB6E= X-MC-Unique: -9esV7KgMVGyFPVHFyHshg-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=fm6WWS9bLJ1+765QuleIRGTm1J4tvn4WsZZ1hKdwNQQ=; b=rugC1NIGlI1kjaXzlQ0KEDqxOMyAE736JVGCf0IsAMCdzLFj8QHheKhdRvpRpYwZ9B TzIF1ou9zVU5Z2+DeX0+X/dQYTtQn65p/n4vyklhXEdppdE5BIH09Cd0Bkzl6AbOBwvG DOmLCYUjRR8Ho5ziVaJ8VqXAMuWncj1wkyRNTeTyk6zMZtYt9x1uL7SeEBeZt5G9etXl H8OoNEZuTZ2Fz4Bgf8R3v+xhWjH9q4TR9J1L6EudFMEWfQt9pHbysh51lS28tMHDC17q Gvo2F0OXRgE47MEr/86ykJU4LipiD/91UIXFEm+A1gHgnPf0xu+8FqWcmdc/inkUvjdH owag== X-Gm-Message-State: AOAM533v933zCoCD9j+3njH9Sj1XzaJaHHgzAZ38Kw3SWTboa3p6AzfX 96AfMallNr0l8SlP5VSPbn64YdY+4u1gGqv6Vv/4wbfqdn1CaJ3RzbJPQ/jqBGxZITnO+lU9Pth JccoJuV/87aKyjQ== X-Received: by 2002:a5d:67c2:: with SMTP id n2mr1672822wrw.4.1601299219839; Mon, 28 Sep 2020 06:20:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKv9zlQi+ODNCvNFXjHA8Bicbujft1+bzvCzkTsX8grgu8kzSBFw87MPA9S8AEmjjRFpA1jA== X-Received: by 2002:a5d:67c2:: with SMTP id n2mr1672804wrw.4.1601299219549; Mon, 28 Sep 2020 06:20:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Kamil Rytarowski , Alexander von Gluck IV , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 8/8] tests/vm: Add Haiku test based on their vagrant images Date: Mon, 28 Sep 2020 15:19:34 +0200 Message-Id: <20200928131934.739451-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200928131934.739451-1-philmd@redhat.com> References: <20200928131934.739451-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" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Alexander von Gluck IV Signed-off-by: Alexander von Gluck IV [PMD: Avoid to recreate the image each time] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- RFC because Alexander will probably add more comments to this patch. tests/keys/vagrant | 27 +++++++++ tests/keys/vagrant.pub | 1 + tests/vm/Makefile.include | 3 +- tests/vm/basevm.py | 5 +- tests/vm/haiku.x86_64 | 116 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 149 insertions(+), 3 deletions(-) create mode 100644 tests/keys/vagrant create mode 100644 tests/keys/vagrant.pub create mode 100755 tests/vm/haiku.x86_64 diff --git a/tests/keys/vagrant b/tests/keys/vagrant new file mode 100644 index 00000000000..7d6a083909e --- /dev/null +++ b/tests/keys/vagrant @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI +w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP +kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2 +hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO +Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW +yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd +ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1 +Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf +TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK +iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A +sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf +4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP +cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk +EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN +CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX +3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG +YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj +3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+ +dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz +6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC +P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF +llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ +kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH ++vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ +NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=3D +-----END RSA PRIVATE KEY----- diff --git a/tests/keys/vagrant.pub b/tests/keys/vagrant.pub new file mode 100644 index 00000000000..b8d012d787f --- /dev/null +++ b/tests/keys/vagrant.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4= TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPk= cmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUec= p4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdET= k1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c= 9WhQ=3D=3D well-known vagrant key for qemu-test, do not use on any machine = exposed to an external network diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 61f893ffdc0..e94d95ec541 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -4,7 +4,7 @@ =20 EFI_AARCH64 =3D $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd) =20 -IMAGES :=3D freebsd netbsd openbsd centos fedora +IMAGES :=3D freebsd netbsd openbsd centos fedora haiku.x86_64 ifneq ($(GENISOIMAGE),) IMAGES +=3D ubuntu.i386 centos ifneq ($(EFI_AARCH64),) @@ -41,6 +41,7 @@ endif else @echo " (install genisoimage to build centos/ubuntu images)" endif + @echo " vm-build-haiku.x86_64 - Build QEMU in Haiku VM" @echo "" @echo " vm-build-all - Build QEMU in all VMs" @echo " vm-clean-all - Clean up VM images" diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 3fac20e929a..00f1d5ca8da 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -44,6 +44,7 @@ 'machine' : 'pc', 'guest_user' : "qemu", 'guest_pass' : "qemupass", + 'root_user' : "root", 'root_pass' : "qemupass", 'ssh_key_file' : SSH_KEY_FILE, 'ssh_pub_key_file': SSH_PUB_KEY_FILE, @@ -245,13 +246,13 @@ def ssh(self, *cmd): return self._ssh_do(self._config["guest_user"], cmd, False) =20 def ssh_root(self, *cmd): - return self._ssh_do("root", cmd, False) + return self._ssh_do(self._config["root_user"], cmd, False) =20 def ssh_check(self, *cmd): self._ssh_do(self._config["guest_user"], cmd, True) =20 def ssh_root_check(self, *cmd): - self._ssh_do("root", cmd, True) + self._ssh_do(self._config["root_user"], cmd, True) =20 def build_image(self, img): raise NotImplementedError diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64 new file mode 100755 index 00000000000..634ef774870 --- /dev/null +++ b/tests/vm/haiku.x86_64 @@ -0,0 +1,116 @@ +#!/usr/bin/env python3 +# +# Haiku VM image +# +# Copyright 2020 Haiku, Inc. +# +# Authors: +# Alexander von Gluck IV +# +# This code is licensed under the GPL version 2 or later. See +# the COPYING file in the top-level directory. +# + +import os +import re +import sys +import time +import socket +import subprocess +import basevm + +VAGRANT_KEY_FILE =3D os.path.join(os.path.dirname(__file__), + "..", "keys", "vagrant") + +VAGRANT_PUB_KEY_FILE =3D os.path.join(os.path.dirname(__file__), + "..", "keys", "vagrant.pub") + +HAIKU_CONFIG =3D { + 'cpu' : "max", + 'machine' : 'pc', + 'guest_user' : "vagrant", + 'guest_pass' : "", + 'root_user' : "vagrant", + 'root_pass' : "", + 'ssh_key_file' : VAGRANT_KEY_FILE, + 'ssh_pub_key_file': VAGRANT_PUB_KEY_FILE, + 'memory' : "4G", + 'extra_args' : [], + 'qemu_args' : "-device VGA", + 'dns' : "", + 'ssh_port' : 0, + 'install_cmds' : "", + 'boot_dev_type' : "block", + 'ssh_timeout' : 1, +} + +class HaikuVM(basevm.BaseVM): + name =3D "haiku" + arch =3D "x86_64" + + link =3D "https://app.vagrantup.com/haiku-os/boxes/r1beta2-x86_64/vers= ions/20200702/providers/libvirt.box" + csum =3D "41c38b316e0cbdbc66b5dbaf3612b866700a4f35807cb1eb266a5bf83e9e= 68d5" + + poweroff =3D "shutdown" + + requirements =3D [ + "devel:libbz2", + "devel:libcapstone", + "devel:libcurl", + "devel:libfdt", + "devel:libgcrypt", + "devel:libgl", + "devel:libglib_2.0", + "devel:libgnutls", + "devel:libgpg_error", + "devel:libintl", + "devel:libjpeg", + "devel:liblzo2", + "devel:libncursesw", + "devel:libnettle", + "devel:libpixman_1", + "devel:libpng16", + "devel:libsdl2_2.0", + "devel:libsnappy", + "devel:libssh2", + "devel:libtasn1", + "devel:libusb_1.0", + "devel:libz", + "setuptools_python3" + ] + + # https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (re= versed order) + BUILD_SCRIPT =3D """ + set -e; + rm -rf /tmp/qemu-test.* + cd $(mktemp -d /tmp/qemu-test.XXXXXX); + mkdir src build; cd src; + tar -xf /dev/disk/virtual/virtio_block/0/raw; + cd ../build + ../src/configure --python=3Dpython3 {configure_opts}; + make --output-sync -j{jobs} {target} {verbose}; + """ + + def build_image(self, img): + self.print_step("Downloading disk image") + tarball =3D self._download_with_cache(self.link, sha256sum=3Dself.= csum) + + self.print_step("Extracting disk image") + + subprocess.check_call(["tar", "xzf", tarball, "./box.img", "-O"], + stdout=3Dopen(img, 'wb')) + + self.print_step("Preparing disk image") + self.boot(img) + + # Wait for ssh to be available. + self.wait_ssh(wait_root=3DTrue, cmd=3D"exit 0") + + # Install packages + self.ssh_root("pkgman install -y %s" % " ".join(self.requirements)) + self.graceful_shutdown() + + self.print_step("All done") + +if __name__ =3D=3D "__main__": + sys.exit(basevm.main(HaikuVM, config=3DHAIKU_CONFIG)) --=20 2.26.2