From patchwork Sat Mar 18 11:46:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 664741 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp245852wrv; Sat, 18 Mar 2023 04:48:54 -0700 (PDT) X-Google-Smtp-Source: AK7set+Ya8EagsPFJnZxfM54qPA+HAZDzHKyaAtDa5F66Vk/Z9R5Ukn4bsjaYWZkOD0ZuaRRUwYj X-Received: by 2002:ac8:5a88:0:b0:3c0:3db8:387 with SMTP id c8-20020ac85a88000000b003c03db80387mr17031047qtc.11.1679140133927; Sat, 18 Mar 2023 04:48:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679140133; cv=none; d=google.com; s=arc-20160816; b=T3WTWK0cgG5iW2AFuK4GTW1Gy7pT0og/Sa/g7A/wiw/DaJg5EKB6wBKpiJyjv+mjv+ Op8ntln0tzFqOfC5ovOQNCmUqhqCeSWU1Ccz7JqRbTTxn2hO/1mcQrMdCRpmRVg4o4f3 s7LjHbuu5/454MpUG3XUwyHPLoQfplDirWqRwG9LRCiTMTvs1oXnIQo/dEYsJpwNhp/l nL4j/61yJUmAkdiALiQrpamX6e2ZFWfYV2fUNjk/JbWo7eIBHKaYY5q7+snZn5oaWw0w luaEauwUwP7RnQk7haa6c3ikFsG6tQJTSyEQgWO7a5Ah7hapJUemNNF7CTWhYLnZ2+tP bdSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IytrMAvWC1Jh7uTr+86aE9RmM4K+C1Isx+W5vQcB/p8=; b=Idzt6gVs0xk8w4TCUZsnGEd9NQhS+nb8Kb3l3buZVhQ70hdjiH6XAtd80thyQDfa1F duwdaEE0WgSvf4fWPcqGM6iQ2GOSULCjDp2dNf3KY+TCnwrzWLmDNMZoEegEpLIpFzWf aoXz0buyTuZzOwoMjCDeeUUpV3i7tu+9j2pqqOwdDA15fgb/Ac68bLODHS9miFPHL2O1 3NRe78gD9lu7cwihFaEHVaxHOAp6aRAW3S+vRfKbqOORJsqVC2gejvLzqprzbSsP1NSE NiJ3DkQTi8NC12XSBgZwCKF0A6Kmtbq6OwmHeYAUmg6G3vjWcjTFh9rW1i8al8bzH2ej HXag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=m2DB8WRa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k13-20020ac85fcd000000b003b9dfd85b94si2990719qta.374.2023.03.18.04.48.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Mar 2023 04:48:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=m2DB8WRa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdV1X-0004ot-9p; Sat, 18 Mar 2023 07:46:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pdV1O-0004lT-FS for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:50 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdV1L-0007CS-ED for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:50 -0400 Received: by mail-wr1-x436.google.com with SMTP id j2so6488329wrh.9 for ; Sat, 18 Mar 2023 04:46:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679140005; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IytrMAvWC1Jh7uTr+86aE9RmM4K+C1Isx+W5vQcB/p8=; b=m2DB8WRavOI3rr0mCb5ehYrj5z1VrPcF6WMyg5aSDMSEN3LJPpzhGoCFjJEVR4HXeW geuBY+D9N1ZUuB9SS8In+5HQpJkdBUHfqC/7HNCuZNGRVNal6xZbe2sVSMKJpXnIBWEx QzVKT0oQU3m5r2sQhFAb8ehcczHzwkZ479kDUIx/UkUqgqCGVfUJPEAYd7z4wjfXN7yM PNGfsN1LeVq3fQ6rwNUGpioFcoZ/iTZPMc7IKhXs6j1nWZM0uT5tPH6IvEo/frQi9ZyE wKXVi0D/TICfT3e5qyQqCQ3cMdDxUGiUeStp5QZb7wDgA2X9jfjo0z3Q4X4Qm65KL5Hf gb8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679140005; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IytrMAvWC1Jh7uTr+86aE9RmM4K+C1Isx+W5vQcB/p8=; b=rSw0MPVe9pciYhwfCp11KGvUKfl/DcnPJUjsyOf0G3hIz3GsH+UZTq0YH/K6AiA46N w7Qeg2a1eOQ0r49SVV9e8YqjVUBsZED2O96xafixmRrcjrLufyKx0cgh7hCtuBb2uZ7L dChDhIjdfMcHoBSkFMKElWdWQQTT52sjA3qYJbxdS2G1U9w0FhfOVEiYEFuSr5g0MXBC AYCkkDxqOTw32ZD5YQh/P2ujlRCBd0NYTQjfkEA9KImVfF8aj2MCudZZu2DB+hyci+3w LNV5POkeKvnreNKtXmrfZGAiwgfmmHwexS7A5uOknOyuId/xmVRm+9b66eWdxa68yqJF l+6A== X-Gm-Message-State: AO0yUKV+3RrVQDAeWEIuLlf5dTjLLcPZpWjJPOnfVLmooE8qz/FDxs40 yYlnE1010yzv5vGtA+vwziyfwQ== X-Received: by 2002:a5d:5914:0:b0:2c7:aed:b97b with SMTP id v20-20020a5d5914000000b002c70aedb97bmr8258696wrd.62.1679140005592; Sat, 18 Mar 2023 04:46:45 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a17-20020a5d5091000000b002c7b229b1basm4160135wrt.15.2023.03.18.04.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 04:46:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AD8971FFB8; Sat, 18 Mar 2023 11:46:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Marcin Juszkiewicz , =?utf-8?q?Philippe_Math?= =?utf-8?q?ieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal , qemu-arm@nongnu.org (open list:Virt) Subject: [PULL 01/31] tests/avocado: update AArch64 tests to Alpine 3.17.2 Date: Sat, 18 Mar 2023 11:46:14 +0000 Message-Id: <20230318114644.1340899-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230318114644.1340899-1-alex.bennee@linaro.org> References: <20230318114644.1340899-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marcin Juszkiewicz To test Alpine boot on SBSA-Ref target we need Alpine Linux 'standard' image as 'virt' one lacks kernel modules. So to minimalize Avocado cache I move test to 'standard' image. Signed-off-by: Marcin Juszkiewicz Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20230302191146.1790560-1-marcin.juszkiewicz@linaro.org> Message-Id: <20230315174331.2959-2-alex.bennee@linaro.org> diff --git a/tests/avocado/machine_aarch64_virt.py b/tests/avocado/machine_aarch64_virt.py index 25dab8dc00..a90dc6ff4b 100644 --- a/tests/avocado/machine_aarch64_virt.py +++ b/tests/avocado/machine_aarch64_virt.py @@ -38,11 +38,11 @@ def test_alpine_virt_tcg_gic_max(self): :avocado: tags=accel:tcg """ iso_url = ('https://dl-cdn.alpinelinux.org/' - 'alpine/v3.16/releases/aarch64/' - 'alpine-virt-3.16.3-aarch64.iso') + 'alpine/v3.17/releases/aarch64/' + 'alpine-standard-3.17.2-aarch64.iso') # Alpine use sha256 so I recalculated this myself - iso_sha1 = '0683bc089486d55c91bf6607d5ecb93925769bc0' + iso_sha1 = '76284fcd7b41fe899b0c2375ceb8470803eea839' iso_path = self.fetch_asset(iso_url, asset_hash=iso_sha1) self.vm.set_console() @@ -65,7 +65,7 @@ def test_alpine_virt_tcg_gic_max(self): self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom') self.vm.launch() - self.wait_for_console_pattern('Welcome to Alpine Linux 3.16') + self.wait_for_console_pattern('Welcome to Alpine Linux 3.17') def common_aarch64_virt(self, machine): From patchwork Sat Mar 18 11:46:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 664737 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp245694wrv; Sat, 18 Mar 2023 04:48:22 -0700 (PDT) X-Google-Smtp-Source: AK7set+xU1iSlMP8706sjy84naW1Z2bxfvt9Jcj/XHi93oN33dzfvaethUvFJ6CCqbRlbBJwB7Jt X-Received: by 2002:a05:6214:c88:b0:5a9:c758:ba0e with SMTP id r8-20020a0562140c8800b005a9c758ba0emr35397794qvr.16.1679140102374; Sat, 18 Mar 2023 04:48:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679140102; cv=none; d=google.com; s=arc-20160816; b=vCz5R9o80MCKI5Ry2uS6vexenQ7Q3XUj6cpxDBp9/WqXctnu8F8iN+C/ZFKQa2M9x2 TPNIUoWWU//BcI2eDBTK4q8E0b9eaNtVSBinOYBo7VJjGECZ/oQ+ssw+BhmZ0jHBvijS 900lhqzfR8Jr2TB+/KU48BygjqnhznCSdLJcMsQyFfTKu3EiBWHWYs4wOWMxUzCk7/mR vtmGWUmqR/lbEI2FyZw1ZnKlG53VqdlEipndcPKCpc/aa4ig9BHTrlRHDogKR7faWk4S BmXNjQFCX88sk72ZIp4+TVHFJSJvmyyTZHbPD6nmJPkwZ9WLa5t3gE8wQiQr01SfnJni PhnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=B6zGJoVeKFYAhyoV9aUUZF5EezFXIRrgXHiT39hie2Y=; b=wFfIROg1rxi2gEdh1VSs0QC04B+QREyuIsFxt3d/wwdXPBaA3sIg4e5D8g5a/SImfY TGVDU2ozHtUli4s5x/xY5e7TaTMJkA4RalqUtT9lOuhtsGCq2Yqw7r2DHyCtgalNlF0F dI6eUzdMnCy4TaUmjvRsQbPdx9d11HUaZY7mAoFVFC2EfNfmfbCgxIaZ3QraCyEfoCU4 6ZjbuBuWzaqBt00R5J+Q4VUny/EZyzjQFVfE8hYiQviqs6IVjA8wwq3lysD7IQzwpzw/ XxtCsi8a0loEiH0Az4/YRx0mykCGXZHv8YM1myc1xZ88Gyj/ByRM4d/2bgo+UuEOM0RD AcZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SD3G5J4K; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id dj3-20020a056214090300b005743e1c4376si2865731qvb.577.2023.03.18.04.48.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Mar 2023 04:48:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SD3G5J4K; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdV1S-0004nR-30; Sat, 18 Mar 2023 07:46:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pdV1O-0004lP-Bh for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:50 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdV1M-0007Cb-0I for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:50 -0400 Received: by mail-wr1-x432.google.com with SMTP id p4so6495849wre.11 for ; Sat, 18 Mar 2023 04:46:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679140006; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B6zGJoVeKFYAhyoV9aUUZF5EezFXIRrgXHiT39hie2Y=; b=SD3G5J4KMId/+7/remHEa3logAcpEOBvJSZ63hJZqHzHIXaf/o69pwDR931YxTm+3Q asxYkdoTZK/el/Ga8+wr8EHayG19iZu9nToSTyeGAYGtKdlv8k1ivf9lPT2JXUj48SKD lZfaPsLGj/udRGbwG54OxJvCGPvxwK7F9RKVf90ptrwcmuduOYRrUc/aPjMW5NQJ6Azm kyhXNj+uUozRHFF4SX1j9LEwqiaLXtHknJAJiRaX3Mw+HQaOvshMQG58+CY64Fsdhz7k O0h2+r8Oo8ToINYYJRMsVyIe/PdbegHSeG2Z8Apip3bfi8p+FAYOsb3EHM9XXpxdW467 aUtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679140006; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B6zGJoVeKFYAhyoV9aUUZF5EezFXIRrgXHiT39hie2Y=; b=TA771q5KxI7ThNxp77pQL0dOK4/qpxnt99jaJbYkfULdneL2jJYsXuKFtina7F2Mnf Y4RCd6zAXpWdcid0P8FqxjB/fAjLitjxgBZJl2bGFsQIOwZKf7xNdbh0QrxWlZllwFmD zCupbx90D8D3nFSCf8+BEimIOqKYygciUXCKImfBtgszBeyg/28DxQ/ODDy0JHQtIYPq +pVmMqU+Q8kXdKXFQbMUFSkY4SAkR04lTuDVLB7yfEFOsAe8ir5DpfFPv+BzvHS/HQCN grMMeEwkVXo1MLCnrLbsb8gF/hPUuvi0A7aeq6J6h5rLBkJlKlNqOHi2UAfrUv6j/+AB C9Qg== X-Gm-Message-State: AO0yUKX5pbNjnI+BqRnTLVx6NKdcqBGH3PajEB8Ceyifo0kQW3iSa8xy J48nd+as1Eixb/ILx3tCqD1TcQ== X-Received: by 2002:a5d:5090:0:b0:2ce:a8d6:5427 with SMTP id a16-20020a5d5090000000b002cea8d65427mr8993963wrt.15.1679140006629; Sat, 18 Mar 2023 04:46:46 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u8-20020adfdb88000000b002cff06039d7sm4162112wri.39.2023.03.18.04.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 04:46:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C2E951FFBA; Sat, 18 Mar 2023 11:46:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Fabiano Rosas , Richard Henderson , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 02/31] tests/docker: all add DOCKER_BUILDKIT to RUNC environment Date: Sat, 18 Mar 2023 11:46:15 +0000 Message-Id: <20230318114644.1340899-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230318114644.1340899-1-alex.bennee@linaro.org> References: <20230318114644.1340899-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org It seems we also need to pass DOCKER_BUILDKIT as an argument to docker itself to get the full benefit of caching. Signed-off-by: Alex Bennée Suggested-by: Fabiano Rosas Tested-by: Richard Henderson Reviewed-by: Thomas Huth Message-Id: <20230315174331.2959-3-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 54ed77f671..9401525325 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -39,7 +39,7 @@ docker-qemu-src: $(DOCKER_SRC_COPY) # General rule for building docker images. docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command, \ - $(RUNC) build \ + DOCKER_BUILDKIT=1 $(RUNC) build \ $(if $V,,--quiet) \ $(if $(NOCACHE),--no-cache, \ $(if $(DOCKER_REGISTRY),--cache-from $(DOCKER_REGISTRY)/qemu/$*)) \ From patchwork Sat Mar 18 11:46:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 664740 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp245771wrv; Sat, 18 Mar 2023 04:48:41 -0700 (PDT) X-Google-Smtp-Source: AK7set+KDsk5/k1AE7rTeP2pM37oCXW+wJ9FzE9HX4U1NvzHPvs1Pn1DLJryZmsk+vxdRlgJn1Jm X-Received: by 2002:ac8:5989:0:b0:3bf:c5a7:595f with SMTP id e9-20020ac85989000000b003bfc5a7595fmr16254527qte.21.1679140121080; Sat, 18 Mar 2023 04:48:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679140121; cv=none; d=google.com; s=arc-20160816; b=xKuJpjYSqd0BjfYgjs4S3ZcPc7XcY2YalTmMl0UaXsxcuyJTFZJyX8lPTbYGGY08sb 8oENyB2kdJu4n1rA7ZP8nIWZ2t/aVrSzDGKKNFujS4NZclgIZlF33gUgJirx3Tb3rk24 rMxSghcb8tCmvs/nYY891EC2a0Cn4pUdPEbGgmvXn5LN6UPonMaoRLg2iHfvgm4vVNgX QOlNW9XL6EGvjh380N06+5JAPt5r9R3N1HpdOXljieOS/7tL/Du6h34qgAKg2ZwU8jWs wrpQ7NKlID5ScQRpi7AEBWfa+E7yVaVIIP1SCt5JYcPiMQBjOv0K2l28wY/EMp8WvtTp i9/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1N/OulA3IcWNhsQzhmChEA/faRYoekZujDhr1Ro9J5g=; b=HwizPh26nk6rsHHvoiSoGAscsAqCzvqfi0QQMiyl0zyFbrN/azcUrPeWDAumdRYerk rP/nr/BoZLjGNlAHXlFk6K2f2FaxbL5Zj2+jdy1IybEVLhWMko9L8617Uje5+4NdViNg mGD/PqOmsS1mr+OSXmVL3M967K7IURRs2rlPZhyOqil7JGPxvEkVSyH2oaUe5iY0qVyv SjP8WOq4Oyym/v4BsCiLm3v5mtPsViDWYV681Dp0GBpeVSzmleeopUcyrbSKEjASYQVo Ljm7QocGBjkC3OpQBP5epJis+3dNbufU896U3ie7PDXnnFyttHZkAnCbfv1RdYZBopS0 pWQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vLbWC8ib; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n17-20020ac85b51000000b003b9c812b83asi3207190qtw.407.2023.03.18.04.48.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Mar 2023 04:48:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vLbWC8ib; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdV1Q-0004mS-MW; Sat, 18 Mar 2023 07:46:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pdV1O-0004lL-4V for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:50 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdV1L-0007CQ-DZ for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:49 -0400 Received: by mail-wr1-x42a.google.com with SMTP id o7so6503041wrg.5 for ; Sat, 18 Mar 2023 04:46:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679140006; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1N/OulA3IcWNhsQzhmChEA/faRYoekZujDhr1Ro9J5g=; b=vLbWC8ibZASKEFYqBskixr6opRCmrRvwACmc1nR5FJ3I5uGdXmIT09t5gLkrwFBI/n jzLCNlilNCwZS7/UpgbjptcUvphmdxxPGbMKzs7gW0PTkoS6LIsfVcBN96tMooq9iXJn RUtmke7eO7gls1LRcC5QijJAIgzd3gqNvYvDRfB4SoDKBJ4EGzYxa2Kx7Zlln3OXAroQ 93oAYnGlQjrqa/hBqsaviab3P5xboUyFjoPc3T1nLaauska41hRziYDJzLnJCXniwcTm ype/x8OYGnNdTjkEuI4r3lURNr2UupZfEgVQCjtHqA0qL4fkFOW79fb56Lp9CX64ESjq YHhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679140006; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1N/OulA3IcWNhsQzhmChEA/faRYoekZujDhr1Ro9J5g=; b=50o1+dV2m4trn7CUDlDUkdU+IKu8C/iP7ZY3pZtbn9M2m5MT/VYV+1mm0dPJlyOjbK 0ewG2qWhS779EX7lFhQXJgMpZtuheFGDBzRqajMil2ztBXlPUJySo/C8x91g9D05kGY7 M5yXcV/iZTC70b81t+UvS77JNqktPCwbBJ9lbMrGxc5k7scQnvehBS1wVwyjqATluTNI PWC3lICqeRusc2Fq8/FFCjie4SdJd8Jw3/EZYJYER6vcdN2xj4Ti1GpvkyY1Y7GgJKoF ponnNGUqDx/5w/wH68MLzghHTycWrbNBYk57gi3s02JAfeJA3Fi4lpDeeqf/E3J+HK2v 7yrQ== X-Gm-Message-State: AO0yUKVsz5pVFONGKdD+dUcbcDWEB+RmUVQbF7lSWwTkoSuoOIBtLPAX baWhB8PKKYLlCccOC44J74ZL6gD7qpFSKc2C1dA= X-Received: by 2002:a5d:534e:0:b0:2ce:9fb8:b560 with SMTP id t14-20020a5d534e000000b002ce9fb8b560mr9267528wrv.8.1679140005808; Sat, 18 Mar 2023 04:46:45 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id d10-20020adfe88a000000b002c70e60abd4sm4223137wrm.2.2023.03.18.04.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 04:46:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D85ED1FFBB; Sat, 18 Mar 2023 11:46:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 03/31] scripts/ci: add libslirp-devel to build-environment Date: Sat, 18 Mar 2023 11:46:16 +0000 Message-Id: <20230318114644.1340899-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230318114644.1340899-1-alex.bennee@linaro.org> References: <20230318114644.1340899-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Without libslip enabled we won't have user networking which means the KVM tests won't run. Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20230315174331.2959-4-alex.bennee@linaro.org> diff --git a/scripts/ci/org.centos/stream/8/build-environment.yml b/scripts/ci/org.centos/stream/8/build-environment.yml index 0d094d70c3..1ead77e2cb 100644 --- a/scripts/ci/org.centos/stream/8/build-environment.yml +++ b/scripts/ci/org.centos/stream/8/build-environment.yml @@ -55,6 +55,7 @@ - librados-devel - librbd-devel - libseccomp-devel + - libslirp-devel - libssh-devel - libxkbcommon-devel - lzo-devel From patchwork Sat Mar 18 11:46:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 664735 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp245624wrv; Sat, 18 Mar 2023 04:48:05 -0700 (PDT) X-Google-Smtp-Source: AK7set8/yT6ZKD7AVSy2rMfgliye6sGGD30eSwkCtGEEin2+EkAVqcaUjHxAfjuV0+rJXGwO+Xq2 X-Received: by 2002:a05:6214:20a7:b0:56e:a2a1:a4b2 with SMTP id 7-20020a05621420a700b0056ea2a1a4b2mr44950479qvd.15.1679140085326; Sat, 18 Mar 2023 04:48:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679140085; cv=none; d=google.com; s=arc-20160816; b=p1Eq8VfNwtOlPDAb2ho4WNW1JrpgB0XFnnmlUCfXFsry79sgf5nGS8jJUqkChQfOKG NiDDQTMPAsjC1oXAM3zyNAz4FJQaX5G2Mfwa9DRwcfUvIVWjqTWxihHuiMsrwAb0gg1B B/3e78iNz32U7wPDUXLIblDn0aIz00e1gYjItcbi+i7GjCquZtZHJlLjTLx7jB1Tb4RW u15ipno/WM3d8cXXiyJdSYF8zAjLg89v6hdQUSFaXynP21a8E9Qz9uzAZg1Vea2WiPxm 1MOx7atMpslrHMzOMe5+2ZMMNeRdIlbmdTptOgC6xn9gFHPyIu7YOWVH5hLDMh5Q4fo8 b54w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ym/QZjPWNLy4DWZhpWySS6BaNsmS4AnivkHm8ts1J/k=; b=DqSvD2dO6bcTkX7vibiAGn1MlTK5n7s6ir1yVQzaACTcbYvtAGUDHcFZcfQslh4lkH VZkbLuANXu8NjJjeSEpIOC/31oU334R5EqL6eFKAM8QZVu6EsibO43eCTv5MuzQMn0Hk QGU+zlPiprLBz/MfRdiAIWCcGznKyvfSr8TrtImIK3erLvxZ7EwDZ/AdrabW17CGObqC wjjz3/VyzhwSiTqp2eAh05nJ9/A6r1S5aJJP55U2/5hXorLqwQWjgvo5KkjJYAy0GmeY UUr6Bt0w2F+mFwwXX4UsMu32j/pkO2pd6S/slDBpzbOcczlJgqNG2+Ty4KU1UXPNd2Fe EXFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RQ+d6Jpb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k15-20020a0cd68f000000b00572498b51fasi3154765qvi.527.2023.03.18.04.48.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Mar 2023 04:48:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RQ+d6Jpb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdV1R-0004mn-8Q; Sat, 18 Mar 2023 07:46:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pdV1O-0004lU-GU for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:50 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdV1M-0007Cg-4m for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:50 -0400 Received: by mail-wm1-x332.google.com with SMTP id ay8so4761975wmb.1 for ; Sat, 18 Mar 2023 04:46:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679140007; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ym/QZjPWNLy4DWZhpWySS6BaNsmS4AnivkHm8ts1J/k=; b=RQ+d6JpbfRK0G/EW132ILhDaAThRjnWbOAfFecwA7KuC85Cyw2wBYavmJMI10M+WcL SztadXGDCIFbdV1mTLvIezjVywTCFS/cEtF/gC8nA9lpFa1wG0aHdk5Z8elUkO/FeIPD 9nbTB0G3oTEvBMOgAzglkrsW898t2JzRmaRymEdNfV78taFYo4niObPBvXIhlghVCJoq s75YX1c/xnQ+UDwg4UzpyLqPuLggSVkjFmSXr+KUcGRrCCjq8cJGcMiaQWCDa3VdAAKe oVuaLsFi3jApYIbnPq4JmYJ0CDhOMpe2IrcrGA3M48WuicMeP3pQnErHhRnbFTlb7bCC UqgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679140007; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ym/QZjPWNLy4DWZhpWySS6BaNsmS4AnivkHm8ts1J/k=; b=NhNZ6Q11x0XKxyiwa2lnL+U956Uxc+EV6UFSVd2j94gotU9mvhAwUNwQmxMaAUgCU+ 5UijsfQEMOcZilIN+Qg40Di90R/fSZL9Z7GjqN/46q51wkPM3MHuWcReMS9GxEwtYCAm teI1ui7sdg7IePp0BOd5Hpp+GVpSYrH1mbSut/4+9BMA+IeKQ75Y5SNG5DScLopSW0H7 qGZEsMWHyeLQjGAk4Cf483NJxJXZCi7ZB150b63RDC0wcNK14nQkjipsDqb3jb8kInq2 tGqraTVRdCpgcEJxrc3NRQAgPm3tOaCErX3WoPfo5FThEVohJO+mHJNvKdh+MSPSl/o8 jSLA== X-Gm-Message-State: AO0yUKUOUqEfBlBu6MRIH/NmyJtFLOrLASuQlsdbmex/hfnnhhfDZPAN 7FlTxL6+spLCreO0L1heVMMM7w== X-Received: by 2002:a05:600c:4fce:b0:3ed:24f6:1089 with SMTP id o14-20020a05600c4fce00b003ed24f61089mr19792280wmq.15.1679140006791; Sat, 18 Mar 2023 04:46:46 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id iv9-20020a05600c548900b003edb59096f2sm1115100wmb.36.2023.03.18.04.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 04:46:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EEA041FFBC; Sat, 18 Mar 2023 11:46:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 04/31] scripts/ci: update gitlab-runner playbook to handle CentOS Date: Sat, 18 Mar 2023 11:46:17 +0000 Message-Id: <20230318114644.1340899-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230318114644.1340899-1-alex.bennee@linaro.org> References: <20230318114644.1340899-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This was broken when we moved to using the pre-built packages as we didn't take care to ensure we used RPMs where required. NB: I could never get this to complete on my test setup but I suspect this was down to network connectivity and timeouts while downloading. Fixes: 69c4befba1 (scripts/ci: update gitlab-runner playbook to use latest runner) Signed-off-by: Alex Bennée Message-Id: <20230315174331.2959-5-alex.bennee@linaro.org> diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml index 95d4199c03..1a1b270ff2 100644 --- a/scripts/ci/setup/gitlab-runner.yml +++ b/scripts/ci/setup/gitlab-runner.yml @@ -48,13 +48,29 @@ - debug: msg: gitlab-runner arch is {{ gitlab_runner_arch }} - - name: Download the matching gitlab-runner + - name: Download the matching gitlab-runner (DEB) get_url: dest: "/root/" url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/deb/gitlab-runner_{{ gitlab_runner_arch }}.deb" + when: + - ansible_facts['distribution'] == 'Ubuntu' + + - name: Download the matching gitlab-runner (RPM) + get_url: + dest: "/root/" + url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/rpm/gitlab-runner_{{ gitlab_runner_arch }}.rpm" + when: + - ansible_facts['distribution'] == 'CentOS' - - name: Install gitlab-runner via package manager + - name: Install gitlab-runner via package manager (DEB) apt: deb="/root/gitlab-runner_{{ gitlab_runner_arch }}.deb" + when: + - ansible_facts['distribution'] == 'Ubuntu' + + - name: Install gitlab-runner via package manager (RPM) + yum: name="/root/gitlab-runner_{{ gitlab_runner_arch }}.rpm" + when: + - ansible_facts['distribution'] == 'CentOS' - name: Register the gitlab-runner command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" From patchwork Sat Mar 18 11:46:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 664734 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp245621wrv; Sat, 18 Mar 2023 04:48:05 -0700 (PDT) X-Google-Smtp-Source: AK7set/PTTd2a6r+9lZBjm9FzumRdy2AleALW7NtyldnNt1H1oFM8ctsIbZ54WcaPPUmy0ujB0LI X-Received: by 2002:a05:622a:58f:b0:3d5:9d2a:7603 with SMTP id c15-20020a05622a058f00b003d59d2a7603mr17074724qtb.41.1679140085056; Sat, 18 Mar 2023 04:48:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679140085; cv=none; d=google.com; s=arc-20160816; b=hw8ejhcm2ktUDMjiIMFJgW3/WkOltK1MzpUkwqS5jsJHut9i//cwUCA89Z3HGGHC25 jSSuydoJ8XE2veiN8S/dGrX9RZFyrLX+v1HKmyf30FFZf6z6kTzXvwjDzgsFCMrayQ// fLYJ6egwq5wZqteRlLAiEwYUfPCIC03+4e4mHRpGa3YQuDgtvPvgUmoqRK1Xwk5MzAfZ nvzSbJBPx3kEjW7ouzgNv5YO2Nw9xW2/Q7r0/J/VQ8TlUQAEtOl0Y3aTue0tgiTzn3og T0FPuqdYMsYFxlKpbcPLYOJyO5DiKBEhSmOrHRNAqVnnr11HqkemGLvbcLvPCIVGvviM CVKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Xgdicq7m/OJKJ1GMKu+lrn3dY/QnHxIJP5axTf8wSjw=; b=mVfOHVYryZDxIyQhBrBGQ7nwEAgeleboCN36Q5LA8r7qRAG8vLsqFaHWVWywK/v3Gw nIol2ZzYMPPx6zR3Aot1jQMXG04R/YcuRU9us4D5zhQx90fcBun9BmTOWNNbkvYphJ4v ZfQ4rH7YMED7qe116cO39Wqlg81YLdxftk5pEDPlwKW5KZIjR8grFNp9VSpdhyjpP17g cn02gVxAqPQzHo66ZDNUnT4TgZolpKfHtRkWKczbcqnuxCxRK2TNYAX3sq60FLxBtuYR zqW0YJf5mWUh82P7OBtEBJtN3ZOnc/SlnAwe1SJNsUsIsF5kNY4IZ702Lg2kWSdoejnW Du2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DRcTX4g0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t71-20020a37aa4a000000b00745cd9dc8dbsi3099892qke.671.2023.03.18.04.48.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Mar 2023 04:48:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DRcTX4g0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdV1S-0004ng-Jl; Sat, 18 Mar 2023 07:46:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pdV1P-0004mE-Kr for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:51 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdV1N-0007Cr-68 for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:51 -0400 Received: by mail-wr1-x433.google.com with SMTP id p4so6495872wre.11 for ; Sat, 18 Mar 2023 04:46:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679140008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Xgdicq7m/OJKJ1GMKu+lrn3dY/QnHxIJP5axTf8wSjw=; b=DRcTX4g0McYSWp+AS2LtTsPkVafAgZH81rgQGiH4vfIKTgdLhfK6dXophF0+vZfcRz dOpv5i8f3QwgcRb0nqA48t8GndI4ARVu8Pj4/xRzfcNQx5UMMEszq5qFn8s+K8wwO3O+ KRMvDMBfQGHjV+PZvD8nIlkB2BbMuxHBapP63nv5DkJYNHc6h83E54cXvYhRtLAfYGqZ PU7kN/vbk0I5bZVnNhCeUWjyUGytg1fCNhZCmgmeRVOnINAVm2w6DSRV9DhiMG8TLM4b Vnt9tvEyH1DKRik0dkgKglIG4LR21oEse8u0TA/P3YbIgch7hvPr6EEi1NnwVaOuimtt aIzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679140008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xgdicq7m/OJKJ1GMKu+lrn3dY/QnHxIJP5axTf8wSjw=; b=2F+J1lfndQKn3xzctdfuWADVfAUiQxkQ1X8x5PdA1fIh09WrC5tkujeWY+5TnYBOTq Pi4cl2jGzWjEuGdHb0CGr+QuwoimmCUwzHn3VzeazeIWZLdEWFDOjWMUpthAcBpwxV6p r+Isdzho0w+9sb57RIHINI1HxD4khYQFFlOGQUVnsc14R9VS5HOpkqDf/FFvb/KNkqid DA/d0ujvo80vxBY7w+bnCtobhAQKR2qvL2xvEh22/6YutX1AYgEavlaLldDk/7zcGHhe zma9jG+EDPsGkPk/piflQ9TVpBM9ApOWQl13elEG9M9NkLM8aP2yNCcibtOdbgrLRqYo zG0g== X-Gm-Message-State: AO0yUKWfvPwzNEv7J/6gE5h0YQqSjxjyrmsdT1EVXYBiMadoyBtRk6aV X81LeiSJgpzIQguPcj+vIDoIXg== X-Received: by 2002:a5d:40c6:0:b0:2c7:1e43:e578 with SMTP id b6-20020a5d40c6000000b002c71e43e578mr9561626wrq.41.1679140007742; Sat, 18 Mar 2023 04:46:47 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h10-20020adffa8a000000b002ce3d3d17e5sm4194509wrr.79.2023.03.18.04.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 04:46:46 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 105C21FFBD; Sat, 18 Mar 2023 11:46:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 05/31] gitlab: update centos-8-stream job Date: Sat, 18 Mar 2023 11:46:18 +0000 Message-Id: <20230318114644.1340899-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230318114644.1340899-1-alex.bennee@linaro.org> References: <20230318114644.1340899-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org A couple of clean-ups here: - inherit from the custom runners job for artefacts - call check-avocado directly - add some comments to the top about setup Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20230315174331.2959-6-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml index 068b0c4335..367424db78 100644 --- a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml +++ b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml @@ -1,4 +1,9 @@ +# All centos-stream-8 jobs should run successfully in an environment +# setup by the scripts/ci/setup/stream/8/build-environment.yml task +# "Installation of extra packages to build QEMU" + centos-stream-8-x86_64: + extends: .custom_runner_template allow_failure: true needs: [] stage: build @@ -8,15 +13,6 @@ centos-stream-8-x86_64: rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: "$CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE" - artifacts: - name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - when: on_failure - expire_in: 7 days - paths: - - build/tests/results/latest/results.xml - - build/tests/results/latest/test-results - reports: - junit: build/tests/results/latest/results.xml before_script: - JOBS=$(expr $(nproc) + 1) script: @@ -25,6 +21,4 @@ centos-stream-8-x86_64: - ../scripts/ci/org.centos/stream/8/x86_64/configure || { cat config.log meson-logs/meson-log.txt; exit 1; } - make -j"$JOBS" - - make NINJA=":" check - || { cat meson-logs/testlog.txt; exit 1; } ; - - ../scripts/ci/org.centos/stream/8/x86_64/test-avocado + - make NINJA=":" check check-avocado From patchwork Sat Mar 18 11:46:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 664743 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp246026wrv; Sat, 18 Mar 2023 04:49:24 -0700 (PDT) X-Google-Smtp-Source: AK7set83om7yi12UUwQKAcsneGXE6sS3o/vxRAP1pOu0h2+22Q7C2iUwMW2FXJgujo5P1KkuNGMY X-Received: by 2002:a05:6214:1c06:b0:5b8:c53:3a9 with SMTP id u6-20020a0562141c0600b005b80c5303a9mr13335160qvc.36.1679140164082; Sat, 18 Mar 2023 04:49:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679140164; cv=none; d=google.com; s=arc-20160816; b=t7A6IOPLBgn1K0NyJcHdaOkl2GxBJyRllgsilmTTldat58b147+mj3R4vlWI2gxpzo rAgq5CihQgNZYe1/YJYTXH+g2ZAozdO23sXl50MiDVA7tWLahfKnYIu4BEB0Qgb/RZBs FkzUQBlXYlKtVH6a7PSUO2411bd7ALzLL4arV2d4/914rq9VaSp+tdNIZxO+4PXQMLyS Uqyu7LO1XhmoPwPgrhJ5bQiDiGoI3D8QWJv5+aZQTEp8fgYMVteUAv6Z4UPaTXoZXtv3 Xwf5fq2tvWS3iB5LexB6MpGXKWtLU/W70CXsuikDcEoYPuAvyYm4HABrcJz2vwbrPyiM tHow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fBYk5bGVNcz+Cm3QC0lbKHCg7DWMcmjX+dS/dafzz5k=; b=ppTbrzc8WBKdB9u8g1xmjt5KwgqgIMq4JyzX2gFnHvaeiMD+ehtwneiHh660d/pl0f Ae2fdAWOcNd6S74Dsuain9xbStrpwUM1cEXC1ECkbC63kyd/sJeVeF9ohGfOo1NBNq5D VgUsuEdf2jdo6d7Lm8S/4yuvB1u0rcYX74MIeO6rLENNLz908hcDBb1FOh9Y9gyMt+4Z oNnCgU+BtO30iRREoKblZkX8cDSLbjj6zElVX3V/+vjeid0SyYptfYtZ3A5ExnjQUk15 3dJ07ZarkB1xdh5znMVf2gyHZYWPx2EJ4kmFHvgcsKNMMlz55rHI+ob3GLuxzl8mM70W 0QRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VsSFWHlY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 104-20020a0c8171000000b005ad18b4d5cdsi2927204qvc.476.2023.03.18.04.49.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Mar 2023 04:49:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VsSFWHlY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdV1W-0004oc-Ch; Sat, 18 Mar 2023 07:46:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pdV1Q-0004mm-QA for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:52 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdV1P-0007Db-0k for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:52 -0400 Received: by mail-wm1-x333.google.com with SMTP id m35so4748673wms.4 for ; Sat, 18 Mar 2023 04:46:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679140009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fBYk5bGVNcz+Cm3QC0lbKHCg7DWMcmjX+dS/dafzz5k=; b=VsSFWHlYpziQ/+tP46C3S5dBq0DjOGjgiKxjp1Lxou1C/Px8y2nGtyi/bENTPhNLrD eDowkwLvFpeqnAa/G20pOrKvMF5R7nhwVjvleVuQbb+s7bvn6Idrvtw+6j9ZPRtw975u fLYhzlnJcxC5BgHTQp6ZI5e+j5P2b94h2fbENW05EMdeh9y3kcwtJc1pRiHmp14rmV5y 0FZBBn4SdK8Z8FENOuNhFxtgnSBJEyoWa9uEeP0he0485eBd8jSe3LdJotMMM3GY6eJ9 jcRlex8xUzeqKKL7fWq1F67XsXaOndfrJj7uUtp+KgKMwr4gTulnpUBLTMgbfwL+jL06 szxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679140009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fBYk5bGVNcz+Cm3QC0lbKHCg7DWMcmjX+dS/dafzz5k=; b=J0BUwKIf/6vwPI9wi4xJO5yXg1cJJkUyX44l+Bm7wGjE06C7j9d6dLoO8tl/bbnz8L LD1nhf9tYumsGpjQlMZPQe1gQ5ImDTpJOCxuv3ocHWatmB9jNx2FfnXV8BhmV/wRhP29 4XuhUDG4vgrZSpr9YFeHQCG+LwJ9n+4seBrmZHdk2cDF35NggmlkJmcn0yQ+PSO2MLa3 KLoSB9LDfpJutDvmpPMZznXo70VRW2iMVaiHcHioy3L7qiPiZ7khi/y0QBNZTIxtgC1S jQaoqYokDqD22zJsdlyeHjzwSSuoyCKz1bsfgyp8zr5zGhG126SM/ER69mCjcLowF+JC 9qSg== X-Gm-Message-State: AO0yUKVIqb37Us5g3xR6nL9ZnMdu9+9TVJgnFvc9cGB4cEdDxmdwslkt eG6HpHP7KQ3M4Xe3WcW1i4DvYw== X-Received: by 2002:a05:600c:19cf:b0:3eb:2da4:f304 with SMTP id u15-20020a05600c19cf00b003eb2da4f304mr25867313wmq.17.1679140009719; Sat, 18 Mar 2023 04:46:49 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4-20020a05600c028400b003eb192787bfsm4582187wmk.25.2023.03.18.04.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 04:46:46 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 275151FFBE; Sat, 18 Mar 2023 11:46:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Thomas Huth Subject: [PULL 06/31] include/qemu: add documentation for memory callbacks Date: Sat, 18 Mar 2023 11:46:19 +0000 Message-Id: <20230318114644.1340899-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230318114644.1340899-1-alex.bennee@linaro.org> References: <20230318114644.1340899-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Some API documentation was missed, rectify that. Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1497 Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Message-Id: <20230315174331.2959-7-alex.bennee@linaro.org> diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h index d0e9d03adf..50a9957279 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/qemu/qemu-plugin.h @@ -481,17 +481,56 @@ uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr); */ const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h); -typedef void -(*qemu_plugin_vcpu_mem_cb_t)(unsigned int vcpu_index, - qemu_plugin_meminfo_t info, uint64_t vaddr, - void *userdata); +/** + * typedef qemu_plugin_vcpu_mem_cb_t - memory callback function type + * @vcpu_index: the executing vCPU + * @info: an opaque handle for further queries about the memory + * @vaddr: the virtual address of the transaction + * @userdata: any user data attached to the callback + */ +typedef void (*qemu_plugin_vcpu_mem_cb_t) (unsigned int vcpu_index, + qemu_plugin_meminfo_t info, + uint64_t vaddr, + void *userdata); +/** + * qemu_plugin_register_vcpu_mem_cb() - register memory access callback + * @insn: handle for instruction to instrument + * @cb: callback of type qemu_plugin_vcpu_mem_cb_t + * @flags: (currently unused) callback flags + * @rw: monitor reads, writes or both + * @userdata: opaque pointer for userdata + * + * This registers a full callback for every memory access generated by + * an instruction. If the instruction doesn't access memory no + * callback will be made. + * + * The callback reports the vCPU the access took place on, the virtual + * address of the access and a handle for further queries. The user + * can attach some userdata to the callback for additional purposes. + * + * Other execution threads will continue to execute during the + * callback so the plugin is responsible for ensuring it doesn't get + * confused by making appropriate use of locking if required. + */ void qemu_plugin_register_vcpu_mem_cb(struct qemu_plugin_insn *insn, qemu_plugin_vcpu_mem_cb_t cb, enum qemu_plugin_cb_flags flags, enum qemu_plugin_mem_rw rw, void *userdata); +/** + * qemu_plugin_register_vcpu_mem_inline() - register an inline op to any memory access + * @insn: handle for instruction to instrument + * @rw: apply to reads, writes or both + * @op: the op, of type qemu_plugin_op + * @ptr: pointer memory for the op + * @imm: immediate data for @op + * + * This registers a inline op every memory access generated by the + * instruction. This provides for a lightweight but not thread-safe + * way of counting the number of operations done. + */ void qemu_plugin_register_vcpu_mem_inline(struct qemu_plugin_insn *insn, enum qemu_plugin_mem_rw rw, enum qemu_plugin_op op, void *ptr, From patchwork Sat Mar 18 11:46:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 664739 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp245762wrv; Sat, 18 Mar 2023 04:48:40 -0700 (PDT) X-Google-Smtp-Source: AK7set8ClhfNadN8U1JHAY+MHHqkcALG4b+FQ+Lo5Vpx8ZNx8+GdJ4ShWGOOlemtzdFtjcXp7uiR X-Received: by 2002:ac8:5fce:0:b0:3da:8315:6bb4 with SMTP id k14-20020ac85fce000000b003da83156bb4mr8284070qta.4.1679140119967; Sat, 18 Mar 2023 04:48:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679140119; cv=none; d=google.com; s=arc-20160816; b=TvzaV/jm3Y5eiyQpjPa8bZkOm7Sr/b/VFEDSsXoqf0RiqOnthYVkswv/YzKDTLCaiP BUAs+iwfNwXABDBr+of6TtcHYBUUEvQL3vQJx8BTimUidmPhG1TMcNEdNWxN5FjxOJWi EVjgb9QYcBFdOXswbC+Fu6wvH44rWUeG5+kjKliwhgPvkbgbhVoVj3/3PTyFTeWZfy/n tM8pD8OP8JworoVSSeXBLNQ9FRvYgkW4tGvwfrwXel7PdAq6M0GCMWdcYs3kbq7V2+8m rsu3uO2JF+YxpqYJJP85C75to1EHjyZTxKjXVZ1jmhHcPOpXst3RIw4zgaAshchu/tJU RmPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=l3IWUt4qXm1Qaj3/bmr93AtpCAQ5kYqJ6y+KW2Y6E4k=; b=x8xU8vs5H56898BnPIBvHsL+OQW3wE5LSRRM1m6e/tCJ9/jfw+5VKRKelFqD+7t8cD OVCi1KYW/EHs+RugV44gV4+U3pwhHnNr2CTKGQR82RgTepXhDfsYDZaJU6dj5UgZ5rKZ rm+gWWeDH4rK/K1fjwSlKsYRq+9TTAQKSIkP9pfaCIvwVgjq6mDv1UR+NsicRw4UsN4S 93+eRMwriPsJ3o9zTStdvSQoe5Ve6J9RXPxbVFXMLYPZIfIDZTbx7neDmiEV4LHP1D0K v0ijBAy8gV5N1PlBvd0RP+n9Cfl2XsT9G1KQBGra2KXOSuUmCGlyYaEmAAPj9Q9R5bEn FldA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vySbmrfD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t5-20020a05622a01c500b003b63cc0efabsi2978120qtw.510.2023.03.18.04.48.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Mar 2023 04:48:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vySbmrfD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdV1S-0004nU-6d; Sat, 18 Mar 2023 07:46:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pdV1O-0004lc-KU for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:50 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdV1N-0007Cp-2s for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:50 -0400 Received: by mail-wm1-x32d.google.com with SMTP id bh21-20020a05600c3d1500b003ed1ff06fb0so4797892wmb.3 for ; Sat, 18 Mar 2023 04:46:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679140007; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l3IWUt4qXm1Qaj3/bmr93AtpCAQ5kYqJ6y+KW2Y6E4k=; b=vySbmrfDjFNg0WWgjJfClY/ekDHLwLttsXYQ2xXvhHoLTs2nmh2i9IMM3O0URi3gy2 OMZ0aE9J+Fq5sCXfRKPN9j9CXTgQ6f+LL2z5RX9A4p1KWDsw0IIgWYBsdTn/tmKB9p1n nSRdpO0tdDuCY2YWtyzZmVpuQoLo370yp8TVkZCAK9DTk/naFKcQHZeTDhtEtVj6M0+5 yBKKV57rHWDn1cG5CLHcdZ+S3hWduDj8d1kP9wYCumav2TaEEWkcQ93S7Xc4sMnm/seQ dkvtt1ffepOp0RXzR/ziL1V9pdptnp+TsosFJdRoOxQOxUm496uk+4FD0A+xTSoiDzZm 2kWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679140007; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l3IWUt4qXm1Qaj3/bmr93AtpCAQ5kYqJ6y+KW2Y6E4k=; b=OgX22EFu/dvqTppQEKYaTbdq1tgBQYZtHqYV18WiBo6wWhPKYGaBuYDl3eNCvYiJ5+ PbKifPbisoCVDsxSIkwtGVIpLFyBpe2NaAILbYfYdT3ZHmJEyI7Cv0EwjslOW+TORvgP GRBV0Etj3u6d78OcjL0DaLswgGwpetK+Om8PtRVF28R94IOTwIekUM7L6d7IIPcHrFnk 8yPNr96ZfnnURqqH6sKaVWC3I/OpvAhJmGMmmyavpDyV6M6+88ZYHyZWyom9pWizLPQf bDQaiIShgrePKxAvTLTrkAvaiDNjG/uhB+Z3ZmPOKDc7kcPtDliDkiO4GO4QtN3kd0TB EsHg== X-Gm-Message-State: AO0yUKWfQhinT+xUj405KKyzzEs4xWc3xDqs8yl2CaH+84zsZK+MQVUn tLCU7jN2FssGdAZ8+DTkrRpzlQ== X-Received: by 2002:a05:600c:a41:b0:3eb:9822:f0 with SMTP id c1-20020a05600c0a4100b003eb982200f0mr28757221wmq.30.1679140007574; Sat, 18 Mar 2023 04:46:47 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o22-20020a1c7516000000b003ed2357f7f1sm4568656wmc.37.2023.03.18.04.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 04:46:46 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3FD411FFBF; Sat, 18 Mar 2023 11:46:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 07/31] tests/tcg: add some help output for running individual tests Date: Sat, 18 Mar 2023 11:46:20 +0000 Message-Id: <20230318114644.1340899-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230318114644.1340899-1-alex.bennee@linaro.org> References: <20230318114644.1340899-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org So you can do: cd tests/tcg/aarch64-linux-user make -f ../Makefile.target help To see the list of tests. You can then run each one individually. Signed-off-by: Alex Bennée Acked-by: Richard Henderson Reviewed-by: Thomas Huth Message-Id: <20230315174331.2959-8-alex.bennee@linaro.org> diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index a3b0aaf8af..8318caf924 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -201,3 +201,10 @@ clean: distclean: rm -f config-cc.mak config-target.mak ../config-$(TARGET).mak + +.PHONY: help +help: + @echo "TCG tests help $(TARGET_NAME)" + @echo "Built with $(CC)" + @echo "Available tests:" + @$(foreach t,$(RUN_TESTS),echo " $t";) From patchwork Sat Mar 18 11:46:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 664736 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp245620wrv; Sat, 18 Mar 2023 04:48:05 -0700 (PDT) X-Google-Smtp-Source: AK7set9mo0+46k9fhbZEtTeCAe7JZEhrSJsR5T99Q4Ea//msx5w2KahsCy2BHrmscBNqSG3UZO19 X-Received: by 2002:ac8:7d0c:0:b0:3d7:b045:d39 with SMTP id g12-20020ac87d0c000000b003d7b0450d39mr15122637qtb.62.1679140085001; Sat, 18 Mar 2023 04:48:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679140084; cv=none; d=google.com; s=arc-20160816; b=NXyxaepAunM1Ml/mBLVhwyv8GoyksqNw1oMtsA3x/zmL/vs1I9X1LFeDBB5pZ7Swpa HC9LB1Lq4XVGD3Eg2X+kkkD0nXkrcqHJ0d6SUeXyw0bLqKfdGv2ARJ6acwKIGa8zRlPN DOQQCqmhHlpRBox/RO05GqIRmYupHa8R5Jp7+G7orERLzrOjxIL5GeYLN0j629MjkxyS 42928RmezGzIWTfxVaAPNFxPCcGJ+/H2QgnSBkHVhWdhTGu/L732KkWzTQ5bBc9EkK7h neRUweURjLO6pmCkHsNi5D4oSYG7D+t/LPi6zAqYfSAqGW+/a8YOLc50H5J4kHLhu+zm 2cgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Lrnd6eEaW3DiG1pL1bza2gGCYw8PLKTpHJs+4omwMRQ=; b=eZxfe+AAkwFJwPzEVfXWbNra/GpQSaeGfVh2aOMRlh9jyKiLJlkq47VDQstd6mnXM9 GtbxyHg60LXi6Q//RhwLgoqh6nthBuSFImqOrVo/9Pt8nAUcz3Ok8yjip2ntqSWNIgtb JmS6TwIvZY3t3AQOjHOjgKTjT2ZCKx5RROb+DO0JqekDGXXWbzcZYb3UQaP4+uEy6bzn fmlHsMcG/K/gTSjLCo+LG7Z18ZuE2424U20NOxYqgjHnofxHIKN/gRmsFRG4fHi/KpOO Gi+l3/Fkm8utym6B2yEIYB+TeZPaTY4PTAY727XtoIvxthSkjaGmabgkSWLh9NU4bZn/ rgUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wG3l8ifg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o15-20020a05622a138f00b003db39101abdsi2467398qtk.264.2023.03.18.04.48.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Mar 2023 04:48:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wG3l8ifg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdV1S-0004o5-U3; Sat, 18 Mar 2023 07:46:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pdV1Q-0004mQ-6m for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:52 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdV1N-0007Cs-8I for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:51 -0400 Received: by mail-wm1-x329.google.com with SMTP id t17-20020a05600c451100b003edc906aeeaso20924wmo.1 for ; Sat, 18 Mar 2023 04:46:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679140008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lrnd6eEaW3DiG1pL1bza2gGCYw8PLKTpHJs+4omwMRQ=; b=wG3l8ifgE8LIePdiL8PJhQ8Yxy2WYs5K3e+cWvbafOImRsG2dJ3atr0QP63a8tAV+r AUQUIbvQPyKDjHp2xdladcxL4tZNaR0dHXzOskmUzYa898bZkIOJ4UCLiIJeZQ/jdl9w 36yURSZYkhVkOBnFibSW1L2amlFDxnyrjHipsIaIVO6klDhESsguTKERutuGSeyPevNz ygd5ZOtffCTGBqFgsODNlphbAEeZQf852JM+OFtwirs4XZN4YO7kygh2q4WLx46Dfol6 TFhZH09XXP00xiizVW7bwzEC8Vi5e5qkieedNM54UZpxhuS/pYiEByocjiOZk1VM5Mcw bo0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679140008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lrnd6eEaW3DiG1pL1bza2gGCYw8PLKTpHJs+4omwMRQ=; b=u1KTtjiHWfguRLjS03RCNDeobC1RItfzGKzhVbfPkSZ5PWBgASL47ebBw9Xuoa+mzh 8CjUHKvwmwuWCHMgosiXBC4/tENFXcuZdLAxhAZKM4F+Bs3NPCLlcf0m7502V7Fl2+ol Zhi8FU57kO5EjPcWs8ZOI9n9Ua87LGJnSPomm33FpBkIDfxQp8AgQwsQm0I44Ik7H3dZ xWbojmR7DK1KOdBZAZZDj7ijxZ8jAUqfMwFC0u/6NZ7VAjMD4quKP/7yYM8vpiLGI2cZ tzEvfH8Ul3+1wEMid6cRZOEzJXXAeo/UA2B5feA8cDJqiKygTfHkQgzJEZ35bc8R1n6Y rEyQ== X-Gm-Message-State: AO0yUKXaGsQr4/WPVt2ST/lX9tMlaVHEgk7alospzDGUvC4iGtZ1JqvF qPRv2bhJ5KzvhVZTHDdvhL84kQ== X-Received: by 2002:a05:600c:354e:b0:3ed:377b:19cc with SMTP id i14-20020a05600c354e00b003ed377b19ccmr10456458wmq.0.1679140007919; Sat, 18 Mar 2023 04:46:47 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id fc19-20020a05600c525300b003ed61b8fcdfsm6959205wmb.17.2023.03.18.04.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 04:46:46 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 575621FFC0; Sat, 18 Mar 2023 11:46:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , David Woodhouse , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Cleber Rosa Subject: [PULL 08/31] tests/avocado: don't use tags to define drive Date: Sat, 18 Mar 2023 11:46:21 +0000 Message-Id: <20230318114644.1340899-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230318114644.1340899-1-alex.bennee@linaro.org> References: <20230318114644.1340899-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We are abusing the avocado tags which are intended to provide test selection metadata to provide parameters to our test. This works OK up until the point you need to have ,'s in the field as this is the tag separator character which is the case for a number of the drive parameters. Fix this by making drive a parameter to the common helper function. Fixes: 267fe57c23 (tests: add tuxrun baseline test to avocado) Reviewed-by: David Woodhouse Signed-off-by: David Woodhouse Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20230315174331.2959-11-alex.bennee@linaro.org> diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py index 30aaefc1d3..c3fb67f5dc 100644 --- a/tests/avocado/tuxrun_baselines.py +++ b/tests/avocado/tuxrun_baselines.py @@ -67,9 +67,6 @@ def setUp(self): # The name of the kernel Image file self.image = self.get_tag('image', "Image") - # The block device drive type - self.drive = self.get_tag('drive', "virtio-blk-device") - self.root = self.get_tag('root', "vda") # Occasionally we need extra devices to hook things up @@ -99,7 +96,7 @@ def fetch_tuxrun_assets(self, dt=None): return (kernel_image, self.workdir + "/rootfs.ext4", dtb) - def prepare_run(self, kernel, disk, dtb=None, console_index=0): + def prepare_run(self, kernel, disk, drive, dtb=None, console_index=0): """ Setup to run and add the common parameters to the system """ @@ -121,10 +118,8 @@ def prepare_run(self, kernel, disk, dtb=None, console_index=0): if self.extradev: self.vm.add_args('-device', self.extradev) - # Some machines already define a drive device - if self.drive != "none": - self.vm.add_args('-device', - f"{self.drive},drive=hd0") + self.vm.add_args('-device', + f"{drive},drive=hd0") # Some machines need an explicit DTB if dtb: @@ -154,7 +149,9 @@ def run_tuxtest_tests(self, haltmsg): else: self.vm.wait() - def common_tuxrun(self, dt=None, haltmsg="reboot: System halted", + def common_tuxrun(self, dt=None, + drive="virtio-blk-device", + haltmsg="reboot: System halted", console_index=0): """ Common path for LKFT tests. Unless we need to do something @@ -163,7 +160,7 @@ def common_tuxrun(self, dt=None, haltmsg="reboot: System halted", """ (kernel, disk, dtb) = self.fetch_tuxrun_assets(dt) - self.prepare_run(kernel, disk, dtb, console_index) + self.prepare_run(kernel, disk, drive, dtb, console_index) self.vm.launch() self.run_tuxtest_tests(haltmsg) @@ -206,11 +203,11 @@ def test_armv5(self): :avocado: tags=machine:versatilepb :avocado: tags=tuxboot:armv5 :avocado: tags=image:zImage - :avocado: tags=drive:virtio-blk-pci :avocado: tags=console:ttyAMA0 :avocado: tags=shutdown:nowait """ - self.common_tuxrun(dt="versatile-pb.dtb") + self.common_tuxrun(drive="virtio-blk-pci", + dt="versatile-pb.dtb") def test_armv7(self): """ @@ -244,10 +241,9 @@ def test_i386(self): :avocado: tags=machine:q35 :avocado: tags=tuxboot:i386 :avocado: tags=image:bzImage - :avocado: tags=drive:virtio-blk-pci :avocado: tags=shutdown:nowait """ - self.common_tuxrun() + self.common_tuxrun(drive="virtio-blk-pci") def test_mips32(self): """ @@ -257,11 +253,10 @@ def test_mips32(self): :avocado: tags=endian:big :avocado: tags=tuxboot:mips32 :avocado: tags=image:vmlinux - :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 :avocado: tags=root:sda :avocado: tags=shutdown:nowait """ - self.common_tuxrun() + self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0") def test_mips32el(self): """ @@ -270,11 +265,10 @@ def test_mips32el(self): :avocado: tags=cpu:mips32r6-generic :avocado: tags=tuxboot:mips32el :avocado: tags=image:vmlinux - :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 :avocado: tags=root:sda :avocado: tags=shutdown:nowait """ - self.common_tuxrun() + self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0") @skip("QEMU currently broken") # regression against stable QEMU def test_mips64(self): @@ -284,11 +278,10 @@ def test_mips64(self): :avocado: tags=tuxboot:mips64 :avocado: tags=endian:big :avocado: tags=image:vmlinux - :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 :avocado: tags=root:sda :avocado: tags=shutdown:nowait """ - self.common_tuxrun() + self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0") def test_mips64el(self): """ @@ -296,11 +289,10 @@ def test_mips64el(self): :avocado: tags=machine:malta :avocado: tags=tuxboot:mips64el :avocado: tags=image:vmlinux - :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 :avocado: tags=root:sda :avocado: tags=shutdown:nowait """ - self.common_tuxrun() + self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0") def test_ppc32(self): """ @@ -309,10 +301,9 @@ def test_ppc32(self): :avocado: tags=cpu:e500mc :avocado: tags=tuxboot:ppc32 :avocado: tags=image:uImage - :avocado: tags=drive:virtio-blk-pci :avocado: tags=shutdown:nowait """ - self.common_tuxrun() + self.common_tuxrun(drive="virtio-blk-pci") def test_ppc64(self): """ @@ -324,10 +315,9 @@ def test_ppc64(self): :avocado: tags=tuxboot:ppc64 :avocado: tags=image:vmlinux :avocado: tags=extradev:driver=spapr-vscsi - :avocado: tags=drive:scsi-hd :avocado: tags=root:sda """ - self.common_tuxrun() + self.common_tuxrun(drive="scsi-hd") def test_ppc64le(self): """ @@ -338,10 +328,9 @@ def test_ppc64le(self): :avocado: tags=tuxboot:ppc64le :avocado: tags=image:vmlinux :avocado: tags=extradev:driver=spapr-vscsi - :avocado: tags=drive:scsi-hd :avocado: tags=root:sda """ - self.common_tuxrun() + self.common_tuxrun(drive="scsi-hd") def test_riscv32(self): """ @@ -365,10 +354,10 @@ def test_s390(self): :avocado: tags=endian:big :avocado: tags=tuxboot:s390 :avocado: tags=image:bzImage - :avocado: tags=drive:virtio-blk-ccw :avocado: tags=shutdown:nowait """ - self.common_tuxrun(haltmsg="Requesting system halt") + self.common_tuxrun(drive="virtio-blk-ccw", + haltmsg="Requesting system halt") # Note: some segfaults caused by unaligned userspace access @skipIf(os.getenv('GITLAB_CI'), 'Skipping unstable test on GitLab') @@ -380,7 +369,6 @@ def test_sh4(self): :avocado: tags=tuxboot:sh4 :avocado: tags=image:zImage :avocado: tags=root:sda - :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 :avocado: tags=console:ttySC1 """ # The test is currently too unstable to do much in userspace @@ -388,7 +376,9 @@ def test_sh4(self): (kernel, disk, dtb) = self.fetch_tuxrun_assets() # the console comes on the second serial port - self.prepare_run(kernel, disk, console_index=1) + self.prepare_run(kernel, disk, + "driver=ide-hd,bus=ide.0,unit=0", + console_index=1) self.vm.launch() self.wait_for_console_pattern("Welcome to TuxTest") @@ -404,10 +394,9 @@ def test_sparc64(self): :avocado: tags=tuxboot:sparc64 :avocado: tags=image:vmlinux :avocado: tags=root:sda - :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 :avocado: tags=shutdown:nowait """ - self.common_tuxrun() + self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0") def test_x86_64(self): """ @@ -417,7 +406,6 @@ def test_x86_64(self): :avocado: tags=tuxboot:x86_64 :avocado: tags=image:bzImage :avocado: tags=root:sda - :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 :avocado: tags=shutdown:nowait """ - self.common_tuxrun() + self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0") From patchwork Sat Mar 18 11:46:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 664742 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp245983wrv; Sat, 18 Mar 2023 04:49:17 -0700 (PDT) X-Google-Smtp-Source: AK7set9waTDLONggn5s7kGm2Sh6TjQR5lcOwKGVlu+MkuUR4MP5ER+BKKX/Q6cA6Fusz6Xy5uSdo X-Received: by 2002:a05:6214:2467:b0:5a5:7acf:c29f with SMTP id im7-20020a056214246700b005a57acfc29fmr38766913qvb.52.1679140156868; Sat, 18 Mar 2023 04:49:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679140156; cv=none; d=google.com; s=arc-20160816; b=vOwmUf8SIkm1CpgexWqllz4T6fUFXsJgV750Wcl6/9FSGtPy+c6ZD3zGdfzaKXqmAR 0WfAAGk+Hmn+nD9NWY0hPOeqbYWihnPy6ZGm2dk8KCJ16AzEV9vxt839kCtkZk7NsZgy jBmYmT4+jc9a62kR81nU/Lk5uA+CbnnkK2MfEmag8BeFReiRRJ1DCozBGlFG98AitEKo TrNTsB2CHmy/9rX1bKfr2oIV4EU5gaqyAL8V5l2Ud4eaRUFrP4Uz8MXjAZyh+F0ngrgi nBm2lnolA+8dJgiYaLWQ4OZZ+S9jIYVC+k/QGzs5wr0d3IZH7Qtri8AVStqiBDCsTzb3 2haA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yzwVPyl6zFffVcbALWo6RAkex0HcIAEnoyVVy8mFUiU=; b=buRtnMfr8rCbXAisZTvWWcZSDZN8WEME+EoW1TYibVwxUV0TmcROQQu2vYPAJpAMjc 6oX0OIJQw7JWotdxr3nkw7oiLe40NR4f+Q4W0vcp0vhavA04PP6uTrZjteVjs5P4tzh9 5sknXBjmU2NmvddCGvketQI2AGCe82ApzXatfXWKAwTMT2rXPh2JUE/eH7uHNNhLR/Zg 900AI5RFKb0n7vHb2lwWRjIYbYINERUR6nHOrwpG9/S/kept42rbzz7vEeqzDtVCqFXY g4fZSZDqeKgPvB+dtKBWL6tLnAuzu+bZ2o8ubWHeqPcBPOBcbDywNCmKBDo/nrdODXTz bUAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ka3e1sDU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k2-20020a0cfa42000000b005b383071f98si2939156qvo.113.2023.03.18.04.49.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Mar 2023 04:49:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ka3e1sDU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdV1T-0004oY-UD; Sat, 18 Mar 2023 07:46:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pdV1Q-0004mN-6e for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:52 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdV1N-0007CN-IO for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:51 -0400 Received: by mail-wr1-x42b.google.com with SMTP id i9so6503439wrp.3 for ; Sat, 18 Mar 2023 04:46:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679140009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yzwVPyl6zFffVcbALWo6RAkex0HcIAEnoyVVy8mFUiU=; b=ka3e1sDULLWog8EgTaZllvHZ94IZfvs8l9gYkgEQGgbfo+Zgnb0wY9CsBP+MmRVqU1 1u+Phzw8DDEQcacwbf79Br2NNpTtBVg9pk8m7R53tzxAb244mKVZt3Np7FIt0CJM9QYM /mk+5VOkFl47FzhW6q+rIQVQhYFXGj3mIelhfIqXgOzgdn8YnUUTeLb5NAww6fLU0xQu Lm30EtOnMP9WIQAzZX4GdiYfzH14aZsqp/p73K11n8Y0FjOvYKVDCwJEI0wHkqg7mp34 L1frCQKlZZOrCXNaXSoPPfkpGlLAj9Ci6uMCeMP405KBcbbTaYjPtWy+H0IJziTiqICi ITow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679140009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yzwVPyl6zFffVcbALWo6RAkex0HcIAEnoyVVy8mFUiU=; b=jDEI2SQnTeh+MaTp87VsdJFej+VyyUP4y39bHoPKq8OYRbZCTfGKrjUHLzuQ/16i/k 3EtkBO02YRTLURG3u2DVBZa3hc/83tTFszRGjWpRXdL9OCj5S2rBMjHRxN0zKOMkrzza EQTfz5gRlVCbO46KbNQVC1XvsMJAWECx0DBIPUulkjcojp7E4LrLzE6uqmDPyjJXt0hf Hvqd1ooKPuxvboasyPN/mz20swMOWfqZlJtDqkYTek0Bwo9pic1wK1x/BYDKWOdh5TCG 0KAxNRiwkniV+Gh3YawwmdohUCOUmI48iFSohFv0oP8eI9829YY8GnX27eQ2dNaOBc0+ LKKQ== X-Gm-Message-State: AO0yUKV47gfOf/rSr6GF5/ByeixFuCxGVOsocVtUHs7Gm0AG9lndz/dE nRT6SluUv6kdfikSBtTopZTwew== X-Received: by 2002:adf:f5cc:0:b0:2d4:4f2b:965d with SMTP id k12-20020adff5cc000000b002d44f2b965dmr2032190wrp.51.1679140008852; Sat, 18 Mar 2023 04:46:48 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id e8-20020adffc48000000b002c8476dde7asm4120308wrs.114.2023.03.18.04.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 04:46:46 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 708B01FFC1; Sat, 18 Mar 2023 11:46:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Paolo Bonzini Subject: [PULL 09/31] tcg: Clear plugin_mem_cbs on TB exit Date: Sat, 18 Mar 2023 11:46:22 +0000 Message-Id: <20230318114644.1340899-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230318114644.1340899-1-alex.bennee@linaro.org> References: <20230318114644.1340899-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Do this in cpu_tb_exec (normal exit) and cpu_loop_exit (exception), adjacent to where we reset can_do_io. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1381 Signed-off-by: Richard Henderson Message-Id: <20230310195252.210956-2-richard.henderson@linaro.org> Signed-off-by: Alex Bennée Message-Id: <20230315174331.2959-12-alex.bennee@linaro.org> diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c index c7bc8c6efa..176ea57281 100644 --- a/accel/tcg/cpu-exec-common.c +++ b/accel/tcg/cpu-exec-common.c @@ -65,6 +65,8 @@ void cpu_loop_exit(CPUState *cpu) { /* Undo the setting in cpu_tb_exec. */ cpu->can_do_io = 1; + /* Undo any setting in generated code. */ + qemu_plugin_disable_mem_helpers(cpu); siglongjmp(cpu->jmp_env, 1); } diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 56aaf58b9d..c815f2dbfd 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -459,6 +459,7 @@ cpu_tb_exec(CPUState *cpu, TranslationBlock *itb, int *tb_exit) qemu_thread_jit_execute(); ret = tcg_qemu_tb_exec(env, tb_ptr); cpu->can_do_io = 1; + qemu_plugin_disable_mem_helpers(cpu); /* * TODO: Delay swapping back to the read-write region of the TB * until we actually need to modify the TB. The read-only copy, @@ -526,7 +527,6 @@ static void cpu_exec_exit(CPUState *cpu) if (cc->tcg_ops->cpu_exec_exit) { cc->tcg_ops->cpu_exec_exit(cpu); } - QEMU_PLUGIN_ASSERT(cpu->plugin_mem_cbs == NULL); } void cpu_exec_step_atomic(CPUState *cpu) @@ -580,7 +580,6 @@ void cpu_exec_step_atomic(CPUState *cpu) qemu_mutex_unlock_iothread(); } assert_no_pages_locked(); - qemu_plugin_disable_mem_helpers(cpu); } /* @@ -1004,7 +1003,6 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc) cpu_loop_exec_tb(cpu, tb, pc, &last_tb, &tb_exit); - QEMU_PLUGIN_ASSERT(cpu->plugin_mem_cbs == NULL); /* Try to align the host and virtual clocks if the guest is in advance */ align_clocks(sc, cpu); @@ -1029,7 +1027,6 @@ static int cpu_exec_setjmp(CPUState *cpu, SyncClocks *sc) if (qemu_mutex_iothread_locked()) { qemu_mutex_unlock_iothread(); } - qemu_plugin_disable_mem_helpers(cpu); assert_no_pages_locked(); } From patchwork Sat Mar 18 11:46:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 664738 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp245759wrv; Sat, 18 Mar 2023 04:48:39 -0700 (PDT) X-Google-Smtp-Source: AK7set9W6eI6oP++mrCczUX+iRC0UL4N1yybENHidipgC79fk689lEJEvVkrJx8mfhtM6OZzyDsl X-Received: by 2002:ac8:5d8a:0:b0:3b8:118d:83d9 with SMTP id d10-20020ac85d8a000000b003b8118d83d9mr17384057qtx.4.1679140119514; Sat, 18 Mar 2023 04:48:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679140119; cv=none; d=google.com; s=arc-20160816; b=mXkbPfo6JWG4bLgSC6C4C92E6IXp0AcWUe8leKVGy3775nvh07MlD6E4jYP+TJXBwd 8roZWp6Z3CBZ4AEyoObzZQXMT99q7JQQnQ7NK8QmR6AEExPXHSX1endjp42fC5IVAidg SKZbX4gsWgPVsUDjpCpSOXtFTvzTImx1WK7y8eM+ZBDnatH0p564ylV6W9Ux4k9QIeW3 INhZiQ3x39fsgJpHBqaafrux5/2o46aiOxebKSvi1ArMOomFpSOIDESpVfFXVgJBSLMI YGblgqNMz2Bf3BrCBTm0lyUN7PkV+4hCf/HManM6ydqnToO8u2f/dXKmlbQkwv411dU8 C17w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xJOw9krfcPlJ6wcYXSThrOaozHtoi6cPC6GULZW68Zc=; b=hBLAU+GNftJ6MXwbBYKBNE8iy34HGDCh++/n/opJoh51e30p2mOr8p7qc8WxtCG3Yz HYX41qdVy4f5UxZQnvS7MbxwFM36Gg7csgwUjAn1bm1JbSBWyudiGaOHO8ofw/AfEncW 0M0sG/qiPlStjvzE8CKGQbLm/DiNyiEtDgi2XLROSs+TeG+T4UP4JsFomirvB4Qu/riE bqgKUw4GRNz4UMwSef9xAAk+7zaPKNsiapnsWg7kUiNlITK0GCgGFA7yea2r3PuvOkt+ JZQn0cwDNrQVVjZLWY/rc3dbOOPMv86qZ8f3JNqYctOACNMl7p2DZdnRQIrxsuTkQ9w4 Tb6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DdsgKN+s; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o2-20020a374102000000b00729ed548e27si2938765qka.214.2023.03.18.04.48.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Mar 2023 04:48:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DdsgKN+s; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdV1X-0004oi-64; Sat, 18 Mar 2023 07:46:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pdV1Q-0004mK-4y for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:52 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdV1N-0007DA-UH for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:51 -0400 Received: by mail-wr1-x430.google.com with SMTP id v16so6525789wrn.0 for ; Sat, 18 Mar 2023 04:46:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679140008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xJOw9krfcPlJ6wcYXSThrOaozHtoi6cPC6GULZW68Zc=; b=DdsgKN+siFhEyfm2oklxJTizJdKc2Y98JnE4edeNcrPKsDv8IqJr+gVJk9lwxBnfGs +3wEyx+OFx5cxNx9FDpeCD+6UkzexD8CCrdIlynY3JBExh85Mg2URLpxvWwDdU9xmjQs BGNidFtMJSGclKdmgCZ9K+0XC4jHCPQbNb318l6U61BAHKo/lWz7QImj4Ks2GYA3lO6l z01ARIiF8Y0XN+NP1pbFNL2c1AiAVy7iTvZUYKxhsSYMpu72YlHhUX6jHOqEXxBYrGra 2VyKESPfQ0PMT01kVJJ42TG0qT2pGcT+K8gsVPgGDIxry/riqvXXDkQE+pSYvsRxn5yY z1yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679140008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xJOw9krfcPlJ6wcYXSThrOaozHtoi6cPC6GULZW68Zc=; b=GvO8gz7hAx+GBIL6LNiR/9126s5MTHjJrTVQKRR8OVVo1vUzHgSCckJhfECsOED1Ps CnhiA9c3AQsOiXpMCiywjDMhjriETgnieydS7tP0p/5lHamLo15kU7a7Cn0jwuBoPhec DncLJl1NTyG8NITOuSWLFnBfq4qmlhVEkSvazbvNxXpHtXnFKZ9qCU0blsqZFSMVp3iz texiRacz62bsG+KEywS5gD0pa8yABTz5ynEhOcr3Ndhp90wHlXhK5feb/g8Re7NeKA14 GuZArcyEIT7W+HagU/44MKmOMhcnc71Pb2QTP74wXgSMM5Bpva/Qpyv+sQPp1TAF+GYP FiNQ== X-Gm-Message-State: AO0yUKVHR3m+FCtArkjTVREovM5l3P0WNF/Lu5JITf1W+KBo/uC+2Uie JsIrM+cZAV1f44vaGmUnkeL/zLhe74O/NvjK/MQ= X-Received: by 2002:adf:cc8b:0:b0:2d0:776:b766 with SMTP id p11-20020adfcc8b000000b002d00776b766mr8556571wrj.8.1679140008652; Sat, 18 Mar 2023 04:46:48 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u8-20020adfdb88000000b002cff06039d7sm4162153wri.39.2023.03.18.04.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 04:46:46 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 863991FFB7; Sat, 18 Mar 2023 11:46:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= Subject: [PULL 10/31] tcg: Drop plugin_gen_disable_mem_helpers from tcg_gen_exit_tb Date: Sat, 18 Mar 2023 11:46:23 +0000 Message-Id: <20230318114644.1340899-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230318114644.1340899-1-alex.bennee@linaro.org> References: <20230318114644.1340899-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Now that we call qemu_plugin_disable_mem_helpers in cpu_tb_exec, we don't need to do this in generated code as well. Signed-off-by: Richard Henderson Message-Id: <20230310195252.210956-3-richard.henderson@linaro.org> Signed-off-by: Alex Bennée Message-Id: <20230315174331.2959-13-alex.bennee@linaro.org> diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index ddab20a6a6..3136cef81a 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2808,7 +2808,6 @@ void tcg_gen_exit_tb(const TranslationBlock *tb, unsigned idx) tcg_debug_assert(idx == TB_EXIT_REQUESTED); } - plugin_gen_disable_mem_helpers(); tcg_gen_op1i(INDEX_op_exit_tb, val); } From patchwork Sat Mar 18 11:46:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 664733 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp245618wrv; Sat, 18 Mar 2023 04:48:05 -0700 (PDT) X-Google-Smtp-Source: AK7set8lXM/lA0tSesY6YTG5FoNuD4oJ/6AcQ0jlp2Xv/FTDa1mu7fLlEwO12PZpy+dekSQP3MoI X-Received: by 2002:a05:622a:8:b0:3ac:fba0:cde with SMTP id x8-20020a05622a000800b003acfba00cdemr15949830qtw.22.1679140084924; Sat, 18 Mar 2023 04:48:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679140084; cv=none; d=google.com; s=arc-20160816; b=AsH2nyLWb6wkgbNmAcXbKIvVV3FHH610G+afFoKN6WuhKDCi4EO8nlsN5sSfJzehsG P+h4E/KVPWBkFfDpM7wduzdZpB0bzy8a3e3V1drabTsA7Lcc2XorXKKeYJt+1FLyl286 jdEwC0LA58zfdSC1ZMYU5h5dkG+wjkI7wMj31vjGJQdAOYC8KWn6MiJUL4FutzPDSpCd joUCXqEFkVK88J/feVi67yAwx/ES9XbCYtBIP37fYvNjZGXEg71DsMciuCe1zpalNSaE wiA8dfKxWojdKpQL/QlvRMnr2ndXhCYTbuVzYBEhBsiFxNTVIEfmFieU7zSe6ufSIuaC dzEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uwD10IBSBuDnwjBnoapwHdpuo5Tp+viqzXnrVV7efY4=; b=JAGC5Ab2lzoF5yfeVfxwFG5YggY6KiSg/CQ3lvvXvV3to1ACWOgRJLzn93V4JAyO1P w30BFQFsVYaARBuE8CKYPWkWDCJ6oVNOjR9k9NEHtQv1O23goDJfrxJP3BLlRVh6wJV3 JcfRsnFNZLHGKaaoa+rkZ79Dtx9omjgM9VanaO9gkNPZ0i+VF47I2O8eKamudWYtdABU 77rY6sd0JqQ+wNzm3MjV5KZ9ZR36mjZC3jeL+nynmbGFTPULsk/ihPEU4Nx0vQrMI+SE PCumao1EEgA3Tj7nPpg3NRfLdgBrH/LvmsjbQfqQ6Mj9Vv+5oBMrwtwQxkoCoAlTIUC0 fXFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kbqMXqnP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c7-20020ac85a87000000b003b6309f82f2si3063339qtc.627.2023.03.18.04.48.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Mar 2023 04:48:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kbqMXqnP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdV1Y-0004pN-4Y; Sat, 18 Mar 2023 07:47:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pdV1R-0004my-8k for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:53 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdV1P-0007Do-D9 for qemu-devel@nongnu.org; Sat, 18 Mar 2023 07:46:53 -0400 Received: by mail-wm1-x335.google.com with SMTP id ay8so4762023wmb.1 for ; Sat, 18 Mar 2023 04:46:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679140010; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uwD10IBSBuDnwjBnoapwHdpuo5Tp+viqzXnrVV7efY4=; b=kbqMXqnPJNW7KprzTLzfW4N+TSy+aj39DE7wpBUCdEt6sn08oPKhC+CtS33WKa029+ ULvouFZnk+jO1M1iUxpIbscdoQog72TEt6WC8hgMcrvLQ2gwqECfUvtlexPSs8MjmDXW gnzIdmEgaoU0Zvf5QntsAiuFNlRDR+/w2TOC5ymQfsTszaeom2nAQ2n8Pj4hNEskx3i4 01BmHfiMqObzXIz3Brd13SeJrzfqzCmNy4nVgPTaJIb3S9bxMCvnK4TiCDUNK1kR7rGy o6ySepJReFofQcHdrceAVAJA7bX8IMTJfsVzogJhkwsW4Ln+B2D01ljXmDtzqcDL0zuR 0lyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679140010; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uwD10IBSBuDnwjBnoapwHdpuo5Tp+viqzXnrVV7efY4=; b=Y6CL5iuA5g/vJZC1ovv4soWcl4Hc78xpuCJQuiioZnvazMNkyExQTpjHDxCdq00Pi+ AxwaGP2CKwd057BrcPo3DykXdMgZ0j6UJCLYm0rxzhdeolA7LVVkY1wupDCL0ndjfqEq nE0S0wTsJayGBiE68yymdIcWjDZm5ebnrjUkKhQhWNfKOsvjBJqMk5QmS4s/H6GPa9tb xTATCLcAecByIiVR5cYL9eka7IWUlbCRd7GPg8Da5qbg5IpsbU1wkB0t1DxiDAhAzlCe W/sGPaMT20dzRoiTMW6dBmTp6Tloa7TJpDqc9vSHvYzfQjBWLl4Zd5+/Wli8Z6nlf5+j JR3g== X-Gm-Message-State: AO0yUKVdIlD2kHbfUKhULuOrqK7ADIeGXS+bvwjJrg1DABdCaJQ66vl0 3udv9cwLaW6kzY03m8+/IsTxIA== X-Received: by 2002:a05:600c:202:b0:3ed:ba4d:f081 with SMTP id 2-20020a05600c020200b003edba4df081mr807096wmi.23.1679140009973; Sat, 18 Mar 2023 04:46:49 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z11-20020a05600c220b00b003ed3034698esm4908634wml.9.2023.03.18.04.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 04:46:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9B96A1FFC2; Sat, 18 Mar 2023 11:46:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= Subject: [PULL 11/31] include/qemu/plugin: Remove QEMU_PLUGIN_ASSERT Date: Sat, 18 Mar 2023 11:46:24 +0000 Message-Id: <20230318114644.1340899-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230318114644.1340899-1-alex.bennee@linaro.org> References: <20230318114644.1340899-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson This macro is no longer used. Signed-off-by: Richard Henderson Message-Id: <20230310195252.210956-4-richard.henderson@linaro.org> Signed-off-by: Alex Bennée Message-Id: <20230315174331.2959-14-alex.bennee@linaro.org> diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index fb338ba576..e0ebedef84 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -59,8 +59,6 @@ get_plugin_meminfo_rw(qemu_plugin_meminfo_t i) #ifdef CONFIG_PLUGIN extern QemuOptsList qemu_plugin_opts; -#define QEMU_PLUGIN_ASSERT(cond) g_assert(cond) - static inline void qemu_plugin_add_opts(void) { qemu_add_opts(&qemu_plugin_opts); @@ -252,8 +250,6 @@ void qemu_plugin_user_postfork(bool is_child); #else /* !CONFIG_PLUGIN */ -#define QEMU_PLUGIN_ASSERT(cond) - static inline void qemu_plugin_add_opts(void) { }