From patchwork Fri Mar 10 10:31:13 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: 13169154 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 252AFC64EC4 for ; Fri, 10 Mar 2023 10:35:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paa26-0007V6-8u; Fri, 10 Mar 2023 05:31:30 -0500 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 1paa24-0007Sd-3U for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:28 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paa21-0004F5-QL for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:27 -0500 Received: by mail-wm1-x32e.google.com with SMTP id t25-20020a1c7719000000b003eb052cc5ccso5644659wmi.4 for ; Fri, 10 Mar 2023 02:31:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678444284; 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=Zi6VB9UypSQYVjsaNXXR4LjTYb9nNfCWY76hjcqaqgY=; b=Z6yYhL3hIORdDWNBitdAJVrjg7yvotYXxm8ewRsSa7tXUUdL45Di0LN9CgV7XJfQDN N9NzgpisMfjX7mDDHkGXpgaAgB7gWmjkugTh3D5SCDzjG8Rkmqs4+YPxciCbXdt2EdNS aefKJxRBoTt0paYpRCbAHB2auruNWtaY6tEvcCenpXrmwF7jAxvbhoNV/bxDTFP2md7M rFmJ2qplaAEFrwxlZ9kaOQ7QRCIRkN1tH37Xa/01MuRSZ7hqKlA3l7bT5KOiyyaJwtl3 cV0W+jQHOd1bX8h/yhFfhuMPDr7NmGMGxFYFj7k6YyqSI0N8j2dOrS7iTcJuBG/7wj4d cBvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678444284; 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=Zi6VB9UypSQYVjsaNXXR4LjTYb9nNfCWY76hjcqaqgY=; b=wom9OiP6sylzUglGzOYCIdrzsdauEO7iIM6YTrEgVoyZ3or1FtA2V7X4tdE4sVl+iD k0kD3ZPfOaUmyj4WGLuV1dRmZ8RChDDSe/CCVQsk+EfJI3bhp1QYcaO4J0BJXSPdOCTc 51YPwEBuWd+pVNz7+Udi10VJrSkAVQ+SkAw+2rkCueTSWiItt29JQV20o/4vVLZUnYwZ RQAT26uEQyGR6AejrebLwFA5UwqbVo2h12X4D6rRKhVMU9cQB0sTPb34PVAtumAbib2T vUVTrF0KRIcI7B09wrKkdPfXQmoi4BaIOF+SyYzYczXDrnj11U5qfQfuTa6zetbSrFw+ I1OQ== X-Gm-Message-State: AO0yUKVrFf8XNC+odaPH1Z0NywyRuSzqc/d7cVjUZ8FK+llNid2GW5Dx tckQKIgInoTvYV5vo7bQpFopNw== X-Google-Smtp-Source: AK7set/eN4cnMfNSzDVCHylDbzGgUMD0wNulXbvsH++eHM+vVLibYjb2+M/enytdnLdwfklPGWJ2ug== X-Received: by 2002:a05:600c:354f:b0:3ea:f883:4f5 with SMTP id i15-20020a05600c354f00b003eaf88304f5mr2100591wmq.17.1678444284347; Fri, 10 Mar 2023 02:31:24 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 16-20020a05600c021000b003eb966d39desm1848036wmi.2.2023.03.10.02.31.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 02:31:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9DC2B1FFB8; Fri, 10 Mar 2023 10:31:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Wainer dos Santos Moschetta , Richard Henderson , qemu-arm@nongnu.org, Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Marcin Juszkiewicz Subject: [PATCH 01/11] tests/avocado: update AArch64 tests to Alpine 3.17.2 Date: Fri, 10 Mar 2023 10:31:13 +0000 Message-Id: <20230310103123.2118519-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103123.2118519-1-alex.bennee@linaro.org> References: <20230310103123.2118519-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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é Message-Id: <20230302191146.1790560-1-marcin.juszkiewicz@linaro.org> --- tests/avocado/machine_aarch64_virt.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 Fri Mar 10 10:31: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: 13169155 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9DEFCC64EC4 for ; Fri, 10 Mar 2023 10:36:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paa25-0007Tz-EU; Fri, 10 Mar 2023 05:31:29 -0500 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 1paa24-0007Sc-33 for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:28 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paa22-0004FE-07 for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:27 -0500 Received: by mail-wm1-x336.google.com with SMTP id m25-20020a7bcb99000000b003e7842b75f2so3077728wmi.3 for ; Fri, 10 Mar 2023 02:31:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678444284; 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=+9R+WJAtyA8SeJ/1as6Ou9Go9GUXAmG0Tw994EVyLcw=; b=f2o9vKZra78HWQnWncPu7hbGH9C93KTNsRZiibAVPngUCGKgCekmYIz8W4NrUYWQra fRBBPZ5QBwc9SkNEnB1jyrytWZhLqKWqBbztk6C5mXgYOXQFgnLIaXaVlhWqwYgRjLEJ anlcRZq40uhFBejT8uiH7TPOQ+iepTchPoF6xCpBCrQIutcmZhnVsANe24rel2D8eM6o aSETlUCcLJyVNZa/3s4J2DYySwOukRED9apGN+3Muw8nJUnDNx4Nor0S76LHRCHJsIP5 J3SZq6I+qTLax8LEtKEfvT/cDFxmGcB+JmuQQeNKGdewTmrFmOIedKWpiwtflFnfsHKf M5uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678444284; 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=+9R+WJAtyA8SeJ/1as6Ou9Go9GUXAmG0Tw994EVyLcw=; b=Iepd35vnBXzVSSBF7ECKbWGYFMgDKP5ZP9diBgkeWgBRy/9xPk6KFKH3lcbPCiqXqz 7tPdi8NW5ZSZgR7LbuQS5MuiQ5CUL55ZQSqP5Sfj3cNKtP2G5jy8D/R2RvP3uKbLlCCl /ShMjjZJE1c58wzfXd2BKxeo3D/YkE1b3ohSkCC5AOX2zQA9KRGAjNGfgxSYYKu0Nt7n NFfI273tcVHAkP2vzllyCC8zNPqeGXFRBGpP94ynmSQLw9Lf/QlfKukjSdJauTfUhPDY qC33DzYwR79wx9MhV34xIuep0Wc+0hHcy1qT696K74dPONS54AxxfNc3iaVthFqiXvba mBfw== X-Gm-Message-State: AO0yUKXTtvrCr6IUTSClizg8w4yqty80AwgpV1RC5eME4DiI0pEQKgta iNJ7Gkkvj0+/KNNtT6DTvuFFSQ== X-Google-Smtp-Source: AK7set9slgWQ7Wl+rxoQBIC9j++KjpoQ1I8aBhzPVkpSBStTN6dq9Bpg+JM6ByH2ZO2Ib3qF0JRS2g== X-Received: by 2002:a05:600c:3113:b0:3e2:24a0:ba26 with SMTP id g19-20020a05600c311300b003e224a0ba26mr2141410wmo.16.1678444284587; Fri, 10 Mar 2023 02:31:24 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 20-20020a05600c22d400b003ebfc075eaasm1748419wmg.16.2023.03.10.02.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 02:31:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B493C1FFBA; Fri, 10 Mar 2023 10:31:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Wainer dos Santos Moschetta , Richard Henderson , qemu-arm@nongnu.org, Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Fabiano Rosas Subject: [PATCH 02/11] tests/docker: all add DOCKER_BUILDKIT to RUNC environment Date: Fri, 10 Mar 2023 10:31:14 +0000 Message-Id: <20230310103123.2118519-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103123.2118519-1-alex.bennee@linaro.org> References: <20230310103123.2118519-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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 --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Fri Mar 10 10:31: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: 13169147 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 924F5C6FD1C for ; Fri, 10 Mar 2023 10:33:40 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paa27-0007VM-F6; Fri, 10 Mar 2023 05:31:31 -0500 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 1paa25-0007Tq-A9 for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:29 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paa22-0004Fc-RU for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:28 -0500 Received: by mail-wr1-x435.google.com with SMTP id h11so4577036wrm.5 for ; Fri, 10 Mar 2023 02:31:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678444285; 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=y4cpR7vA6XSXxWS6bHag8gq4h8YFalbW/SrKcN6qWB8=; b=yJD+YSTuz7vpoXXmot7VlxR2O2T+u4PWtvW3AkDHAg3WffohrFj9zA53L6QHpcSPGS SbZ6OaMR+KMNEL/cwYD21Lp+5vg3xqX2Tu/l+OCbHpjT5vxQrsuF8z3bxhj6VU2RcJ1L H8mALYMfxKHkn3jXbp6T9RSB6m6UDB34oj6Wed31yRunnvPSMrbAyjanM16k2ev2tQ0H pi/R31Y59NjphHKeppWnYW4bwoEsx4wdq4M3Qfok8rxxpAEwv97XawcYk0WCNN+tx3vX Qut2VQggnmVe5XS8YZxxvtr6Gofk83ct1B8NFrVD/+G1Jt1dzrkgwU2UHw9ZhbUz8A6X MYTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678444285; 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=y4cpR7vA6XSXxWS6bHag8gq4h8YFalbW/SrKcN6qWB8=; b=n6vl72kX8f4l8LyQpPXuyYeuBngkB3ux32/vrHhg4JEDYP7fFwP4iDgS6DU9A6nKVP XFKqCzzL/lvqy0a8gv8ageZyQlj5m2HIiHpIwPqvSDqBo8nUfhqJgRgW/BMWTSt3yOX3 GI8XoifAGBAofTQv6Nf5tqfCR5I3Px2ugIJQj/ZT345nVY9Ebv3iT5owMVnlUXusIP+l s6CEuH4WNEsDyeuB3nHv21mGntgdcoLkGbtnCFbcTIZTSMimU2BSqe2m3Osa9ezs0+pn poWiaLWVzeYH/NgTl386RbGZL3CbclLG2O6F7J9FPQrjl8QUV8G5eBsOrOZir/cXg2EA crcA== X-Gm-Message-State: AO0yUKWFI2V/eFbBCQOgGJTPbZ+rrfSQcEcZvnEX6RFzFWnsNJ2TRugM QfPBWPj7nndfIKETgvaBptcGqg== X-Google-Smtp-Source: AK7set9ayF5vM3mvRdTydN3/SKLZaR+ng7texETRhuRMM1m1q/O8hAE8EDHCmTo5HVoMXkjNgI083A== X-Received: by 2002:a5d:4c52:0:b0:2c9:5675:7def with SMTP id n18-20020a5d4c52000000b002c956757defmr16189578wrt.2.1678444285375; Fri, 10 Mar 2023 02:31:25 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l10-20020a5d4bca000000b002c705058773sm1764094wrt.74.2023.03.10.02.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 02:31:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CC8F91FFBB; Fri, 10 Mar 2023 10:31:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Wainer dos Santos Moschetta , Richard Henderson , qemu-arm@nongnu.org, Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal Subject: [PATCH 03/11] scripts/ci: add libslirp-devel to build-environment Date: Fri, 10 Mar 2023 10:31:15 +0000 Message-Id: <20230310103123.2118519-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103123.2118519-1-alex.bennee@linaro.org> References: <20230310103123.2118519-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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 --- scripts/ci/org.centos/stream/8/build-environment.yml | 1 + 1 file changed, 1 insertion(+) 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 Fri Mar 10 10:31: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: 13169108 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CE64CC6FD1C for ; Fri, 10 Mar 2023 10:32:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paa2B-0007dz-OO; Fri, 10 Mar 2023 05:31:35 -0500 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 1paa25-0007UL-K1 for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:29 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paa22-0004Fo-Sj for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:29 -0500 Received: by mail-wr1-x429.google.com with SMTP id f11so4565134wrv.8 for ; Fri, 10 Mar 2023 02:31:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678444285; 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=6cCbPXzWfjZFi2jKGovhuePGEghRzJegWJl5AEsiLWo=; b=FE/crdNH/S0XkLgeFBbHk628l7rnVEcYaKcHhMWXhWGt9MB+nqBHrxZtXE5ftv91pb TussFRCZbF8KuOoAzGxx5Mk9j18j9l2IjjuI8S+DgxvYlRnK7eU7zft1M3AnR08ncheO p7DEEwKohW2gGOROT79x6DaTV6jVNMki4RuBA25PSr/mOzHXoa4YBU48idMWNBKeRFsa fnz0CUzyRqPnX3XtZ7Dzgl2L/cdl4gXCi6nN+xReykbIr4c+n/dZCyeXqEOA+4W8rAGv EAE6X6bE0xK5OPJ+88vKEQujN01EMsdVH24NSKpx8afdi65bqOnUHTDp4pKwNijrK8Ea HUiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678444285; 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=6cCbPXzWfjZFi2jKGovhuePGEghRzJegWJl5AEsiLWo=; b=buON81KcpNf0t8F22IuxGj1je+jWmAVDUJUFodpOlpVTH8ftjAUenigSp8s53KFNo2 GRwYd5ekbO73yHBZXIaFiHNe7npUm/XUvIy+1SWDvmj7/V7Z+mJn1iQ5UZ9ms7j3WdHB 3/yn5khYkDyKyn0g7roysOp5BCQa9JtUkigYXtWOglq6ZKPyJsDr0wWLF3PutKnGNInK Dt+Nn9C8WR7Uok2emJ0nF8IXz+0gDVofRlfZgXGJKEn24uPK0ezU3CCeuOtpr95J1OKC CsB2MQ1qiMonx7bJIsqMiMMPHIh2A7hIbGItRxUz6c+/P4ybrh6QIBCe8R9M6VcqR7UE rn0w== X-Gm-Message-State: AO0yUKUSFc058xVgirQlBrcoLlKy2eZE7ddOUy5GJX5eNaT5ACyp8db0 eL1XMNZKLq1UjPXzWIpgWuBRtw== X-Google-Smtp-Source: AK7set8XLtmMul9M/M9wM1U7CxBTSjhA6yLYulIep3SphrxNDHfLfMSkL3MrYPcayq+T/LNVS1Y3XQ== X-Received: by 2002:a5d:526a:0:b0:2c7:1210:fe5b with SMTP id l10-20020a5d526a000000b002c71210fe5bmr17110053wrc.49.1678444285572; Fri, 10 Mar 2023 02:31:25 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id d7-20020adffd87000000b002c59e001631sm1845103wrr.77.2023.03.10.02.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 02:31:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E448E1FFBC; Fri, 10 Mar 2023 10:31:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Wainer dos Santos Moschetta , Richard Henderson , qemu-arm@nongnu.org, Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal Subject: [PATCH 04/11] scripts/ci: update gitlab-runner playbook to handle CentOS Date: Fri, 10 Mar 2023 10:31:16 +0000 Message-Id: <20230310103123.2118519-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103123.2118519-1-alex.bennee@linaro.org> References: <20230310103123.2118519-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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 --- scripts/ci/setup/gitlab-runner.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) 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 Fri Mar 10 10:31: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: 13169148 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 454B9C6FA99 for ; Fri, 10 Mar 2023 10:33:40 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paa2F-0007gQ-Pg; Fri, 10 Mar 2023 05:31:39 -0500 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 1paa2A-0007bo-Al for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:34 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paa25-0004Hf-RM for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:34 -0500 Received: by mail-wm1-x32b.google.com with SMTP id c18so3055164wmr.3 for ; Fri, 10 Mar 2023 02:31:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678444288; 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=ZvCAx4F7D2VDKqlV3zkasos0ltqlJHomALeskNF44vQ=; b=fWnNK8ZPZX4N/lr+FRO5rGeuQfQAt16wAYFCpePT5ET5UctT/bOY56MJ2gE3gOwfs+ IIOB+Ezp/vNp/Y8hbjdFAcAdBWYJz7FbBghnruqvFD8cCoGVBiP31OLJitl8M0eltl/s rKojPKgzz1a+pstm7YjWtMJ6/O60C6BeJl8V8AH8ZXUPjBZ5ldqYSZjxvTEZlb7KCkqE U0ulvi5rjuXIYwCJpxCeI3D2CInciV+mgefsPySI1MTUhjVoq5zeFpNRXagEnjJYAMVb GNYGxgf4pMBgEDdLN1wfp91VacxvtrZWovQ5rwf60/5HJfwFFXn7Guw1z1UiSrqzt3SC weuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678444288; 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=ZvCAx4F7D2VDKqlV3zkasos0ltqlJHomALeskNF44vQ=; b=D+3lkcxFe2r7+KKzvoLhx9rIEtWbtzvgF2KCWGZqsmDfWZjKiAoi4Q+3IEDcgE0UEi ZcSRxvJlq/aSn1mKVHsGZcA1rCLlAK4H9yLxiVVMzW0MDL/4Ke+Bp6GikfEJTl29CYm5 y3tozUkMeIemiODxBedOFWiXbMZGtnmvm/xW3GsVL8g9zt5BIcF/kw/wZOWMYE/g60Rh JT3c0xbo0WCs+F25vnmh5PyJR/5LyLGtAzFONf8HODzvi0uq+AnQE7CDqmiv6qkbTma9 HLF9wMlPEiij8xHmJw70kB6Sxe0cIs6mGdikN6O9wAZh5Grm9AI9djECiSnhr+DH/9FS lwbA== X-Gm-Message-State: AO0yUKWlgnROuGIaV7jFILUwO+XofaL8wJocCWdfh3+FKF20wf6I8lIL otqwimdQ5uaNB77iPuCqRBvTKA== X-Google-Smtp-Source: AK7set/O/UjoatoCRlRS3U2/ZL5naXZP/SPh2bnAv3Qkpjdzqx785rMmC1aVviuuIi9miwsfceTgDA== X-Received: by 2002:a05:600c:4751:b0:3ea:f0d6:5d36 with SMTP id w17-20020a05600c475100b003eaf0d65d36mr2209549wmo.29.1678444288056; Fri, 10 Mar 2023 02:31:28 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 18-20020a05600c229200b003dc4a47605fsm2617132wmf.8.2023.03.10.02.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 02:31:25 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0C2331FFBD; Fri, 10 Mar 2023 10:31:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Wainer dos Santos Moschetta , Richard Henderson , qemu-arm@nongnu.org, Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal Subject: [PATCH 05/11] gitlab: update centos-8-stream job Date: Fri, 10 Mar 2023 10:31:17 +0000 Message-Id: <20230310103123.2118519-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103123.2118519-1-alex.bennee@linaro.org> References: <20230310103123.2118519-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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 --- .../custom-runners/centos-stream-8-x86_64.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) 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 Fri Mar 10 10:31: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: 13169106 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D2A7EC6FA99 for ; Fri, 10 Mar 2023 10:31:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paa2F-0007gM-GO; Fri, 10 Mar 2023 05:31:39 -0500 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 1paa27-0007Wf-UV for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:32 -0500 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 1paa24-0004GK-3D for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:31 -0500 Received: by mail-wm1-x32d.google.com with SMTP id bg16-20020a05600c3c9000b003eb34e21bdfso5678292wmb.0 for ; Fri, 10 Mar 2023 02:31:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678444286; 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=MDK+aMGOP0xpM2yh43emDI7/ZdusXKwC3yy2K8RboBM=; b=pbx30FAU1PHXBeDRBdzLPqFzMPxlMt5gj3ogc1Z/VGq27I2UQct9NCH/L22rIsnIOF x1gjJ9iHkhG7YLRHy0O8hu19Rcq16rMFt8qq9ZzvSoLJQz9qrSoTizKgPl1RGegdFLb9 HNJN9zj5z0LZubaPHXGI2OPYOGUMvjmcVCYAC2YnmZVpJmszACo4axdTsdCNOhMY5+Iy rMrYC3/On+EQGjjdsgt5yJT0dk/uD1Idf0uX4S+K5iChosFpzhxiXf7OgFY7HInxNK1Q xmMykO4i1MwOYziQcimdLBtKLj6uxH9nf/jGYJIY62OHZrJHk6vm+wVLpyliZ4OrIuKR x77A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678444286; 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=MDK+aMGOP0xpM2yh43emDI7/ZdusXKwC3yy2K8RboBM=; b=O+9sVNA9XXCtJMrWqUtgX6nlNab3T2TM+XQC3jewy1Is/62c+DA2fm71BzRgERYMXR Gf6FOdFybS/9VRjRWfA3nDFrZj8WV0APxWEPlS2q2QkRxQ7i/9Iq2IobSgVCxFZs1E3b toqGMAL+l+vljdxmi5idzV74bR+cdOIj4xW4yIpU/xdaXSVML//e8s69GDdDkmUJJhL9 Ik+YZEs0+L8ybvSFx23Nyvab2ycfLtKZKkb9pEXd0bgywkCAbRTe2fjNiOvsj82/FEDj v+g0EX6kqjKrYG7TL5YtZ5VdMuhFHRh5Lw9vpsb0MBtQE4EWlg9GDuYWZzuQnm2+InJK sBZA== X-Gm-Message-State: AO0yUKUu8CcmY4Q+1owK+J+aW+J+rj7h5I1XVSxvXfnIGzVBGj/EsAKj y7mzEnGJNKXFGWHP1KuWGDrnVA== X-Google-Smtp-Source: AK7set/WTBvF7WMMhEIErsfVnZ3+2/DD2gy8wnNnnKcFXHvN6xWv1/6wchv7FB99q3aWpNaDNBNlPw== X-Received: by 2002:a05:600c:3b99:b0:3df:3bd6:63e5 with SMTP id n25-20020a05600c3b9900b003df3bd663e5mr2235604wms.12.1678444286355; Fri, 10 Mar 2023 02:31:26 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f21-20020a7bcc15000000b003e20a6fd604sm1675768wmh.4.2023.03.10.02.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 02:31:25 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 23A101FFBE; Fri, 10 Mar 2023 10:31:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Wainer dos Santos Moschetta , Richard Henderson , qemu-arm@nongnu.org, Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal Subject: [PATCH 06/11] include/qemu: add documentation for memory callbacks Date: Fri, 10 Mar 2023 10:31:18 +0000 Message-Id: <20230310103123.2118519-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103123.2118519-1-alex.bennee@linaro.org> References: <20230310103123.2118519-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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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 --- include/qemu/qemu-plugin.h | 47 ++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) 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 Fri Mar 10 10:31: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: 13169150 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 19CDDC64EC4 for ; Fri, 10 Mar 2023 10:35:17 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paa2D-0007fC-3U; Fri, 10 Mar 2023 05:31:37 -0500 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 1paa29-0007aQ-F5 for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:33 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paa25-0004HP-95 for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:33 -0500 Received: by mail-wm1-x32a.google.com with SMTP id j19-20020a05600c191300b003eb3e1eb0caso5649460wmq.1 for ; Fri, 10 Mar 2023 02:31:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678444287; 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=BZ6HFIIZGYyqYaj8Vony/3+KKuP79LxepubYtEH6JNY=; b=kbeGCVUP7qNEetV5PYIqxJXznSX7ynlMAv7ikxsgxTmiP/tZl7/FjsFMKePy/uVQOt ut4h2DfB9VxArsPBObBxjnRL7LhySNAGFn8NZBLPnZ+YefiQqF8bL/zSsNxj432QKo4+ rmjT8ZG1Oiv3gLkmXvtdcQNFOVGQP7UGNtzaZ+gYfNxMSZ0pTgIGEUls3aUJy/XYo1oL o6s0nrCc4gkdNsMSu5z7ylJlm+2npVBHcyZjtxi/UmXCAa0Urscd8tzszDvrpT4zMt17 TFSu6sUEkqDSCmp9cGPewCyd3zU08hmCwgKI+26TOpYRqLJbzmGmMkcHeC4gULC89Dfu FN4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678444287; 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=BZ6HFIIZGYyqYaj8Vony/3+KKuP79LxepubYtEH6JNY=; b=uEEwipw6UX63SZfHX5822mAPqxqS4/DvERjKC5sEAsd5VlyIziHT3hUkTqlz6Z3khp FHCEvwVaBkWozQUj89YkN2qg03DRlkmDq+iaXV0/4OR38zIWFYllRFhkdu8NMCRuwqQy B9FUeY4ZHeJM+tllT580GR5OnJsvlc3QTe7328nP0KPOX6oqi1s0vBo7lD8nFl3SFdqz b/ksQlrZ6euk6psX9bpY0BDVmD9Qwnipf1IEw3zvjAPHdP2AyR8wxdJcPLe4qcMMsdDk RXfqmproFaCbe5R0hp7qpD05GRqa8X62BzUuUDtuOGlmpjSEUJe/V8uFwnFVLK/pQcuN ao7g== X-Gm-Message-State: AO0yUKW8wcMUFpjsuJMBnt7Yg/5oe/yJ1upQUgY6Eidh+++ifIRdycyT cKtxq+aQuLeR6T6sKt0zS/KmNz0VT0R+4E+Syps= X-Google-Smtp-Source: AK7set9X0CRFxnvj0w9eGVq9YG8FszgT5Wn86JqwaFoHCer7q1na5PIDKuZTsg4f2043JaS7YyTroA== X-Received: by 2002:a05:600c:190e:b0:3df:e4b4:de69 with SMTP id j14-20020a05600c190e00b003dfe4b4de69mr2190618wmq.27.1678444287666; Fri, 10 Mar 2023 02:31:27 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ja4-20020a05600c556400b003ebff290a40sm1701125wmb.21.2023.03.10.02.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 02:31:25 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3CAE61FFBF; Fri, 10 Mar 2023 10:31:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Wainer dos Santos Moschetta , Richard Henderson , qemu-arm@nongnu.org, Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal Subject: [PATCH 07/11] tcg: Clear plugin_mem_cbs on TB exit Date: Fri, 10 Mar 2023 10:31:19 +0000 Message-Id: <20230310103123.2118519-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103123.2118519-1-alex.bennee@linaro.org> References: <20230310103123.2118519-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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: <20230301024737.1210851-2-richard.henderson@linaro.org> [AJB: use plugin_gen_disable_mem_helpers()] Signed-off-by: Alex Bennée --- accel/tcg/cpu-exec-common.c | 3 +++ accel/tcg/cpu-exec.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c index c7bc8c6efa..e5847e9731 100644 --- a/accel/tcg/cpu-exec-common.c +++ b/accel/tcg/cpu-exec-common.c @@ -21,6 +21,7 @@ #include "sysemu/cpus.h" #include "sysemu/tcg.h" #include "exec/exec-all.h" +#include "exec/plugin-gen.h" bool tcg_allowed; @@ -65,6 +66,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. */ + plugin_gen_disable_mem_helpers(); siglongjmp(cpu->jmp_env, 1); } diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 56aaf58b9d..e8a48dbd93 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -39,6 +39,7 @@ #include "exec/replay-core.h" #include "sysemu/tcg.h" #include "exec/helper-proto.h" +#include "exec/plugin-gen.h" #include "tb-jmp-cache.h" #include "tb-hash.h" #include "tb-context.h" @@ -459,6 +460,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; + plugin_gen_disable_mem_helpers(); /* * 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 +528,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) @@ -1004,7 +1005,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); From patchwork Fri Mar 10 10:31: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: 13169149 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 155BAC6FA99 for ; Fri, 10 Mar 2023 10:33:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paa2H-0007gy-5V; Fri, 10 Mar 2023 05:31:41 -0500 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 1paa29-0007ZO-3Z for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:33 -0500 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 1paa25-0004HX-IO for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:32 -0500 Received: by mail-wm1-x329.google.com with SMTP id j3so3060280wms.2 for ; Fri, 10 Mar 2023 02:31:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678444288; 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=OrymPH9qdF1LbwV8gLjsNCVK43k9DRaIqJfuQ5UvnQo=; b=eGDG5V/k5OWoqa9NjqrjAyMWuYMBT1mND1PGrXxqo8D8V2UlYSUUDtHE43eifG5wLE IXKhq3LBvmV26Pil1OAIaX/qOPZnaTFQQfYOggqjI+9lHRzAjud+Dd9jQaez5SvuNrfS G20r3a3oB17NEg7ViQI6M7zasONpv+hXoRY4mua8nALWU+jdsBc8/IzcBGQZP9gGGApx 7Hfu1o5zMTTdtDXMuTI27+7A1bKbV4zaFH9RNw/ACSRPok98oTZS8+SmN40M0xuIxP4X D9wgNbMVywbA0shwZVAq5Pha+Qubru8JpxOcTWIUcJ+Kp0q6X4EGHU+1qYAaEue8Xkj0 8YNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678444288; 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=OrymPH9qdF1LbwV8gLjsNCVK43k9DRaIqJfuQ5UvnQo=; b=Qt0wpFalkUWpxJZSKdLZRk/KUYxutwevU8Gcypu6/NbQ6I8mMh6SXJs1qNcLYBiHpE hIycFzOcCxcWVIscZeM4ODhWp58jcIJuN2WCa6croun3XzAujGVqSla3T5kZ2VoYzQCC C8Nuxeh7O2a2Vt9FfqZh0TOF4b5uM/BhxkPtefwNXfd5+QJs19zvaUqMTu1JsYJaZjv1 w6mMbGc4eeqRyR+JwRKA7MPO6HFvb8kSdMfag0OFJfOqFakkknN4bRJZG+ujMv3Dh26j 2Tc8huT/9Wt+lT4/CS2uH4+/hI0jRCLkrRdN849JHInApWjpCi9fMYt34qickK8PgCVE kgYA== X-Gm-Message-State: AO0yUKW5yK0l9hUmP5+YhHAV3dUo3dy/nZz21Mw5g5kyoNKVFT4uUQjo fD1WSoUQdhRD81YAZXVD6SGHwQ== X-Google-Smtp-Source: AK7set8+8dCFAK6CxWp/s+nH5v0Dq0oj6whU3FwXDhGRPmpFqI4z/4/orm07k4XnHrEPuyxHNZEfhQ== X-Received: by 2002:a05:600c:512a:b0:3eb:55d2:9c4c with SMTP id o42-20020a05600c512a00b003eb55d29c4cmr1471579wms.16.1678444287882; Fri, 10 Mar 2023 02:31:27 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v16-20020a7bcb50000000b003eb192787bfsm1715958wmj.25.2023.03.10.02.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 02:31:25 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 542941FFB7; Fri, 10 Mar 2023 10:31:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Wainer dos Santos Moschetta , Richard Henderson , qemu-arm@nongnu.org, Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal Subject: [PATCH 08/11] tests/tcg: add some help output for running individual tests Date: Fri, 10 Mar 2023 10:31:20 +0000 Message-Id: <20230310103123.2118519-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103123.2118519-1-alex.bennee@linaro.org> References: <20230310103123.2118519-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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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 --- tests/tcg/Makefile.target | 7 +++++++ 1 file changed, 7 insertions(+) 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 Fri Mar 10 10:31: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: 13169110 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DD7CDC6FA99 for ; Fri, 10 Mar 2023 10:33:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paa29-0007af-HT; Fri, 10 Mar 2023 05:31:33 -0500 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 1paa27-0007WW-Rj for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:31 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paa24-0004GU-7R for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:31 -0500 Received: by mail-wm1-x336.google.com with SMTP id o11-20020a05600c4fcb00b003eb33ea29a8so3108881wmq.1 for ; Fri, 10 Mar 2023 02:31:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678444286; 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=Y+4gkXbSF06VxG3xn+IuzpbgKEpx6d65esqQNCW4H4o=; b=KNX7Mbeod25KJlILc0yivp6x9yO3jcfp8u47ur9lSqzOCGV+f0K+DEDBov2wR9CaPR 5MUOSfqii4u/YMC+7RSx6Lmjsue5J6lVhhESqMZPsYI/SbZzh/hwLTW6TZJxyXz+vK5n N46e0exftLXbOwOfAOsRHA/qYz8Xh2yqfFevOPxXMIUpLRYbLpASCvt5Ut9ykSMziXGJ U7sHYmtgZMFiJwUnZkCfxUU7YQ6lbzN0bOJtE8TA/2kvN6F4C1nWQH3QxIgdjoeahiu+ AOZLWcnc2OaNW/31WjKku2IiDsUF6sUemjUsA6d7qPcw/7wRjnScx5b182YfvuhJN7T5 qnsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678444286; 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=Y+4gkXbSF06VxG3xn+IuzpbgKEpx6d65esqQNCW4H4o=; b=q3V7ARnQdNtUnMJZH/TzNlKMAI2MKmKiR0TRxFD8DaAIOsbwvXKTXZhLJ3VwcvDLou CCFNDKYdI1S6koWQZl3ppX2g36GR3jh9mvIklwIMr84SdjetJvm0dPu17ZcwCWLbKP7U K/AvAJxFYAD28rVYWyHUxDw4DyQoIUseJywsBC3kF3CQBiwI0oNwDb73Sb4ko+iVju6r oZuGpVdlzQc7stiQbFF8uRJSb2iGMOJi3RckrBhF0I7aRRRZGxsuFHCZRlxT93kHF8qa MGNkIDwN7ykKGHYYEYgGzC/tTteiKa5enFJz1W/hpgJfnj6GQR/2gC8iU2MEL8ZRHgnU 2CwA== X-Gm-Message-State: AO0yUKV4QE4GPKZAW5dj5eMCWPQAFHHlZ1xem8t5zViRYmbZQH0eLihf 2qFVyjAUN/s6egHMDRCCJx0R3IYO9H7A4/RQgPI= X-Google-Smtp-Source: AK7set+XL5Uj80PJycK8yYdRcp9qO95Ufs+aC7zHrKzfqdswtn6CtizzeTjF6PMWvqZKBfIx9YG26w== X-Received: by 2002:a05:600c:3ac8:b0:3eb:3f2d:f237 with SMTP id d8-20020a05600c3ac800b003eb3f2df237mr2211404wms.6.1678444286698; Fri, 10 Mar 2023 02:31:26 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z26-20020a05600c221a00b003e6efc0f91csm1686773wml.42.2023.03.10.02.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 02:31:25 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6BA6D1FFB8; Fri, 10 Mar 2023 10:31:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Wainer dos Santos Moschetta , Richard Henderson , qemu-arm@nongnu.org, Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal Subject: [PATCH 09/11] tests/tcg: disable pauth for aarch64 gdb tests Date: Fri, 10 Mar 2023 10:31:21 +0000 Message-Id: <20230310103123.2118519-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103123.2118519-1-alex.bennee@linaro.org> References: <20230310103123.2118519-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org You need a very new gdb to be able to run with pauth support otherwise your likely to hit asserts and aborts. Disable pauth for now until we can properly probe support in gdb. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/aarch64/Makefile.target | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 9e91a20b0d..8ffde3b0ed 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -84,6 +84,8 @@ TESTS += sha512-vector ifeq ($(HOST_GDB_SUPPORTS_ARCH),y) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py +run-gdbstub-%: QEMU_OPTS=-cpu max,pauth=off + run-gdbstub-sysregs: sysregs $(call run-test, $@, $(GDB_SCRIPT) \ --gdb $(HAVE_GDB_BIN) \ From patchwork Fri Mar 10 10:31: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: 13169111 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A768C64EC4 for ; Fri, 10 Mar 2023 10:33:07 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paa2F-0007g7-6Y; Fri, 10 Mar 2023 05:31:39 -0500 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 1paa28-0007Wi-0J for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:32 -0500 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 1paa24-0004GZ-7f for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:31 -0500 Received: by mail-wr1-x430.google.com with SMTP id r18so4593164wrx.1 for ; Fri, 10 Mar 2023 02:31:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678444286; 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=7fq5EVdfHfpp6lGs6caGYbPvDM6mvk0QNUVhbY/HNCs=; b=nIueiIYy0eFa3Bwl+UTfhahlGp3gelLYfdfGzYCq4oS9Pw7ud3DEUCiGY1WMBw32Lt byvLQNMymw4JsKB6N8kZmQwXpBouA09WLKVK3Wg4ThZVyCXcAOlScYgYTqguhnSiOTCU oQXOdjkNPfPf6Q+LzJKe2aHzs1+yovMQu5CTxoYjZii69lYJD8lVavZ90jbazUSP1hH7 jWKcYgjMFKZS6ls7XqcTqvEfjDhUKaeii8tLGKKeArtqaB2z62b/bcOZG4wZ6O3MC7KF o/I5J/gjlzBo2jNyz9uhiZKEDwnMB7ANFKGddHg9brQUpSQ3mySJ35oRvtVIhnYvz/CC tGhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678444286; 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=7fq5EVdfHfpp6lGs6caGYbPvDM6mvk0QNUVhbY/HNCs=; b=gTGzKZZsHu6nIf/NG2h1ypMKrQD/KI8wFrxL2FQWJozIbC6RgdygSWI7IXRK5huXbx ENSmSM9v+05w8c61WDZvixOcRv4LX4JIqrJTDZj2ADyhLMztpk47CJ402AdeIyUeJVO7 8fo9FJ6MAwwhV/rrWSh2UR2X2sRrQLLfccmDvQG67nPLdZ/js19OPRG36GygYXcCNfJd RUC97BSHlvR6fTE5pUrSPTy2mofwBIsyi7/6vWrd/MLqkAQYMMfJ5SmJhCRlB9mZ9xTX 0RMUD9kApbAW//hrSllqqZYV3uXROVgPzPw1ov3uyNwHj1yLgbJrRmQXOXCjbsqbg4R6 SJbg== X-Gm-Message-State: AO0yUKWwBBS77Lyusbw9WJfiqfE0hicXxQmo2zgK+toO6kbrukbYAcNj 7W60LPsmNHMBePsU+KRmn4BNsg== X-Google-Smtp-Source: AK7set+tdVMMNg+UFUW84XFbOiY8VPhEGqwiLCtLtFLRBUdONv/322GRFJtZyBr93/NLFyhHahbcpQ== X-Received: by 2002:a5d:5042:0:b0:2c7:1a86:aecd with SMTP id h2-20020a5d5042000000b002c71a86aecdmr17574249wrt.2.1678444286658; Fri, 10 Mar 2023 02:31:26 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id s11-20020a5d4ecb000000b002c55efa9cbesm1779916wrv.39.2023.03.10.02.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 02:31:25 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 859DA1FFC0; Fri, 10 Mar 2023 10:31:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Wainer dos Santos Moschetta , Richard Henderson , qemu-arm@nongnu.org, Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal Subject: [PATCH 10/11] include/exec: fix kerneldoc definition Date: Fri, 10 Mar 2023 10:31:22 +0000 Message-Id: <20230310103123.2118519-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103123.2118519-1-alex.bennee@linaro.org> References: <20230310103123.2118519-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The kerneldoc processor complains about the mismatched variable name. Fix it. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- include/exec/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 6fa0b071f0..15ade918ba 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1738,7 +1738,7 @@ void memory_region_notify_iommu_one(IOMMUNotifier *notifier, * * @notifier: the notifier to be notified */ -void memory_region_unmap_iommu_notifier_range(IOMMUNotifier *n); +void memory_region_unmap_iommu_notifier_range(IOMMUNotifier *notifier); /** From patchwork Fri Mar 10 10:31: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: 13169152 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5A0AAC64EC4 for ; Fri, 10 Mar 2023 10:35:44 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paa2D-0007fU-IT; Fri, 10 Mar 2023 05:31:37 -0500 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 1paa2B-0007d4-0C for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:35 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paa26-0004IH-Jb for qemu-devel@nongnu.org; Fri, 10 Mar 2023 05:31:34 -0500 Received: by mail-wr1-x42d.google.com with SMTP id j2so4562097wrh.9 for ; Fri, 10 Mar 2023 02:31:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678444289; 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=FetjILDiJ9MYJMNfyzvSa3HdWAqlF1zpEkgwiMXEb9M=; b=nYZ55Ucp2C+joa9i54+jZxgDMogjLOLzo9z4FEmg50phFlThGYyn7Lj/a9xMbapc+r e2ITMTG7OnzOkctP3Pw5CdCeSCSLg+22CPU51SryXg5rbxvj7iq000VT7jJnZT4sSgCk 3tjblMSD2rK+XZOLCazu+UHapGP7bLkeqCY51Gsa029yEdS6iBuiAS99E/htOrBORdlD TWGa+iJQLsqMjAUD5aSUlzXPlEss2WaFHopuYFDYKXpqqkOL/SBinWukDettPCEg5Bdf VVZHD5LdPILBUbYecym40SaVUjh30OyvJsOtHX7hFRAJOkP0RT7EVZr7ySfGz9rHd8uX 1yDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678444289; 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=FetjILDiJ9MYJMNfyzvSa3HdWAqlF1zpEkgwiMXEb9M=; b=I8ElkmDA552GiyRQFvvKcCtIWEgGTLKconpi5XbZcDI7P+Y2R9J9hNJQzKqzXe9hFE v43fFaRdO+H6+5WfskeIRq9r43ewd6ELeRYGesASb1hFskIB7xCT2/HhGsieZ1gBWXmy daTnTHWC46H15g0GIeUQt3M3OyhHVA6RUKQt79exE4Mn+LjF+wKvyJjXh1XgAaayDujm /14UGoh9ymCeuWFpcdet0r8q1Ibu6Z2/tnyo00tFnNjM7FcCQ+/jJPVIUOvVlIF5BGc0 TcjiyBfCQawZqHOZWpgePMBykaKxMNWSC1WXcB0guimlfEeuc+sJaYNAOnQT7KFYjFsy rLGQ== X-Gm-Message-State: AO0yUKWSwQxCv8DtzCGPXJPtVzcuhbmT+krSZnesW9FvXQ5NQn0fuxtH EFblUdt7yR5eTOSMmH2psu8sbA== X-Google-Smtp-Source: AK7set+Gun1ov8DNXmf+ZvOWD3/YjLyL160Qkv/aA3Bl2wkSkBJTjhBk6+ivdzbwWiPPv+9xCWcVGQ== X-Received: by 2002:adf:cf0a:0:b0:2c9:e713:7889 with SMTP id o10-20020adfcf0a000000b002c9e7137889mr15648427wrj.14.1678444288837; Fri, 10 Mar 2023 02:31:28 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id d4-20020adfe844000000b002ce37d2464csm1791919wrn.83.2023.03.10.02.31.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 02:31:27 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A15891FFBA; Fri, 10 Mar 2023 10:31:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , Wainer dos Santos Moschetta , Richard Henderson , qemu-arm@nongnu.org, Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , Cleber Rosa , Thomas Huth , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , David Woodhouse Subject: [PATCH 11/11] tests/avocado: don't use tags to define drive Date: Fri, 10 Mar 2023 10:31:23 +0000 Message-Id: <20230310103123.2118519-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103123.2118519-1-alex.bennee@linaro.org> References: <20230310103123.2118519-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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) Signed-off-by: Alex Bennée Cc: David Woodhouse Reviewed-by: David Woodhouse Signed-off-by: David Woodhouse Reviewed-by: Philippe Mathieu-Daudé --- tests/avocado/tuxrun_baselines.py | 60 +++++++++++++------------------ 1 file changed, 24 insertions(+), 36 deletions(-) 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")