From nobody Fri Nov 14 22:18:07 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838300; cv=none; d=zohomail.com; s=zohoarc; b=eFbhce/djOr5zVmWf/yF/1PrbY0zizcHIl0EQydu7wreu4zaWcGGKcH+pOWnsC1iEpuWeMnkJgUh6kgHPUui9XSmtisxLODG+pow2rCyt6DdFlBtHIBv34iraINP8Z5E0P1hGxjTjHZGEVvr0Y1koVQew6Rptk4lfCDEyvaTjxw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838300; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LC8sseS4YRt7zbmXv0lrK/8l6VQS3lJqjjF1eJnDljk=; b=f6jG7vIwH8tEPe81l+3IxSP/qGXwkubH1/XU9d3Z/dyLTNK+O7SWn1JVYOP0VcBi7uJOjodZFKJa0spelZvDtdSp4ruQ2FYfZOt2nQ9fhh0pX9jA0biDxdYbG4LOn9UUWQecHNqs5nJ5D+itrRFVfAwYhUehcInMgq9OLGl/CSM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838300784846.7674506595091; Tue, 7 Oct 2025 04:58:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66IR-0002XJ-MD; Tue, 07 Oct 2025 07:56:01 -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 1v66IH-0002We-GC for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:49 -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 1v66I3-0001Iu-M5 for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:49 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-46e6c8bc46eso40256175e9.3 for ; Tue, 07 Oct 2025 04:55:30 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8ab909sm24662275f8f.19.2025.10.07.04.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:26 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1A4B95F87E; Tue, 07 Oct 2025 12:55:26 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838128; x=1760442928; darn=nongnu.org; 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=LC8sseS4YRt7zbmXv0lrK/8l6VQS3lJqjjF1eJnDljk=; b=hXbPS2U3hL83szqKlsD3YdMysyDpNhijZp7CcNOfzyBh91x4wfafnC8qc0WLppzSSU H7TyOiXm1j3BPagvM43vnxmib69bDQv3fhIlILtcht0dBvlYTP/XBuiqAVkLH/7V8kr4 3l/VOlrc5gRtEBJE8oyvtnYXQYtblCQ14lydvy9ewadPwYnNJ8VrtBFlxOMzncPfp0K/ vyBRXFBoDOy++FGbgKdhknXIdvZ+lI/dmK9RC+uCarpt6hAeCoG+sA2/RAbeGD4/gexV VijQXEU9siBn5n65+/9gKdy8JBaTrNMhwiY09wQJyiqF+JiCNpFAKdMwXClR44wRQ4Ms B+6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838128; x=1760442928; 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=LC8sseS4YRt7zbmXv0lrK/8l6VQS3lJqjjF1eJnDljk=; b=cHawKLMTFnzkD3uX4GlqUSesS6Qbshr8hnpjzXCcSE0HyMd7xHken6HgZ0FK2+1lGN y1Koyma32TtFf3czb/ARYWQRFzmmMTs9GrPcBJ663wanYqZSIbY1Gv5Up5s4wusY8NwD VO4pr8p9faAFbKyCcOALGzIfqIGj/+LTzAp1lCuobfNN/Wv8RNxhdo2S0O99JUksTE+s oJjNbcPKnhvWdO1/3CUru1WufbOOwTaTpdR67IwgklhHcTQW2ZTsuCFyCAhujaTGUjOX LckyObe3LmYsGkVmFvy3icfoDS/tX2jhwdvPzepzDTeseBAgM2FcvgrLPYXDPmSJy0Ah RpiA== X-Gm-Message-State: AOJu0YwKSt/3I8s6dmTwjh0QmGLlDrj2VSw/RjG912/5ugIcyHmylaTz L9CuXVj2tryYHFl7K36e90WbTxk06oVKbNul7nmL2uZlDPvxyW0bN8fuTGqJ7uXgrDU= X-Gm-Gg: ASbGnct+oKUiSBmyH0elzOo+4JcHCgwWYlYNDKVRXfVef0Z4vrB1PfBgn+9wjebgi+9 QksD0NmMbUkyDm8zR3ZtWVntTh9PDH3zBpz8/UU9GVJSBIR5fp31pV1NIB0JobU8eTu/ORzvQLD CIEESOaPmDP5KMnIDk/PDBES1ZemjNmR4nLjG6oUuee+3YTxjhoMQXkA+k480HMXhaGMe15D0PH wmWKWQocJeJ+SWim8vVFVQt6q9tS9Gq+RHkC6mD4hhC70awGjdHZCFHqucrzJDgOD1XTTDRmWO1 9SvVEsHeQJWrk2UdBfvFlkl8s0H/KpvEH2GmG3KZZ4eyDOcrRK8lQbHOoZYXdsEyQcJ5lDoUPuD 0mS+6FkxryVNpERTvPARB2rtUlqm5dAYWoJocAt5x6DYjbZnxaXM= X-Google-Smtp-Source: AGHT+IGGc4qPojs97/k7gopcaMYZt2y2UMdc+GcXLh8NWVKD4A1mFELLoCN1G3jjZM3tSBAnlods6A== X-Received: by 2002:a05:600c:3b27:b0:46e:3edc:2811 with SMTP id 5b1f17b1804b1-46e7110f0efmr96481115e9.14.1759838128304; Tue, 07 Oct 2025 04:55:28 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefan Hajnoczi Subject: [PULL 01/17] .gitpublish: use origin/master as default base Date: Tue, 7 Oct 2025 12:55:09 +0100 Message-ID: <20251007115525.1998643-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838301221116600 This is very much the result of my recent fat finger but I think it's safer to assume that origin/master points to a recent commit (or at least a commit a given branch is based on) than master. Acked-by: Stefan Hajnoczi Signed-off-by: Alex Benn=C3=A9e Message-ID: <20251001170947.2769296-2-alex.bennee@linaro.org> diff --git a/.gitpublish b/.gitpublish index a13f8c7c0ec..a3adb21ffa1 100644 --- a/.gitpublish +++ b/.gitpublish @@ -4,48 +4,48 @@ # See https://github.com/stefanha/git-publish for more information # [gitpublishprofile "default"] -base =3D master +base =3D origin/master to =3D qemu-devel@nongnu.org cccmd =3D scripts/get_maintainer.pl --noroles --norolestats --nogit --nogi= t-fallback 2>/dev/null =20 [gitpublishprofile "rfc"] -base =3D master +base =3D origin/master prefix =3D RFC PATCH to =3D qemu-devel@nongnu.org cccmd =3D scripts/get_maintainer.pl --noroles --norolestats --nogit --nogi= t-fallback 2>/dev/null =20 [gitpublishprofile "stable"] -base =3D master +base =3D origin/master to =3D qemu-devel@nongnu.org cc =3D qemu-stable@nongnu.org cccmd =3D scripts/get_maintainer.pl --noroles --norolestats --nogit --nogi= t-fallback 2>/dev/null =20 [gitpublishprofile "trivial"] -base =3D master +base =3D origin/master to =3D qemu-devel@nongnu.org cc =3D qemu-trivial@nongnu.org cccmd =3D scripts/get_maintainer.pl --noroles --norolestats --nogit --nogi= t-fallback 2>/dev/null =20 [gitpublishprofile "block"] -base =3D master +base =3D origin/master to =3D qemu-devel@nongnu.org cc =3D qemu-block@nongnu.org cccmd =3D scripts/get_maintainer.pl --noroles --norolestats --nogit --nogi= t-fallback 2>/dev/null =20 [gitpublishprofile "arm"] -base =3D master +base =3D origin/master to =3D qemu-devel@nongnu.org cc =3D qemu-arm@nongnu.org cccmd =3D scripts/get_maintainer.pl --noroles --norolestats --nogit --nogi= t-fallback 2>/dev/null =20 [gitpublishprofile "s390"] -base =3D master +base =3D origin/master to =3D qemu-devel@nongnu.org cc =3D qemu-s390@nongnu.org cccmd =3D scripts/get_maintainer.pl --noroles --norolestats --nogit --nogi= t-fallback 2>/dev/null =20 [gitpublishprofile "ppc"] -base =3D master +base =3D origin/master to =3D qemu-devel@nongnu.org cc =3D qemu-ppc@nongnu.org cccmd =3D scripts/get_maintainer.pl --noroles --norolestats --nogit --nogi= t-fallback 2>/dev/null --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838230; cv=none; d=zohomail.com; s=zohoarc; b=ZQeW5GrmZSNdszW6PY/82LphqYKcQoM3omstQEhqb2wPfpP5Ymkbv0+Xt9h2aYG0e+RUKMD/DQ0NVIj2Wjc1gCMJgUCZXT0Wf3sB0aKRZ0tXLOUNWhzThmJo1pV/sFdJ2ldc9z1fhJgqvuPXvy4OUMCbnkLnp5ukezoH8S2xlhg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838230; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tfKzT3g7Sn7qm7b/Z3n563XJAu3grg1Gx+XkESNMRc8=; b=i7NewXXYR2izRs/KjlJ3GnxWNKlvdOhnAzoSlHvx6DQ7e0j5Q8dfOxbJwrNBkWl16jRBBFghqFaWOPHRzIcEFrzKToN6TBxnBhUJ046bxiYpZwF3ZVKpQu8M9owdLOGNoJWmvvHsE8EBmg5zn78oVS7SCyuZw4iAflfylzhNAak= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838230400126.75934763099053; Tue, 7 Oct 2025 04:57:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66IC-0002Vq-H1; Tue, 07 Oct 2025 07:55:44 -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 1v66I9-0002VJ-Ic for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:41 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v66I4-0001J3-Cd for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:40 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-46e2e6a708fso40542245e9.0 for ; Tue, 07 Oct 2025 04:55:34 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e61a25dbcsm323942845e9.19.2025.10.07.04.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:26 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2CCA85F8B0; Tue, 07 Oct 2025 12:55:26 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838130; x=1760442930; darn=nongnu.org; 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=tfKzT3g7Sn7qm7b/Z3n563XJAu3grg1Gx+XkESNMRc8=; b=K0tUye3sP6qw+QpvMS0Wn++OAOwNX2JNIbLfLLI/1vVA0zQfcuqFEJl07FRl9Bv0BD ZN+YDmXIBohyM1oLQZiEHGZnnP91Xw6QgfbliVlQ64pl2HctEwr6ODet8XI1b8cPsz/Q mhOO49kyKm9G+ZOniRRxzqKdryQkz97Tp3Tc0xlyG9Y905jkkdDr09yEU2LZi1lWKymP MZ16jQ61RC/3T7F/CAiZS7HzgugstsZbTVBtkOuqToKG4zCf+1kPriEtfVh1WQIm8fmh wST90HR/xDw9QK/WRIoZpgT+1I04dg7P2p85N5WtahmKv8PnBzg8el6DGeNIyo+T9ZVk dVUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838130; x=1760442930; 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=tfKzT3g7Sn7qm7b/Z3n563XJAu3grg1Gx+XkESNMRc8=; b=CnOqRtey1xdZjEIroMZUHHd42M3camjoGrwOaOXnMuvIjW4xJU7h6QW0WJLVyywmRb QTNH1jT0kbyvHvQjxsXjDhLkPw3t3tCFsdrSSTNZcLjUfOyQlasce7Fep6cPzIW5oEUX RiVYfby3QXyVhUyKnqRISCncZyWXmVd7qhtROLgIfbfJnelxvjPvDVFMvYokXNnkrqKI 4MBpEyaXlaS0Ay/ku2N0xHHQp1NjTDceBf2h6gBBsWdPGnkFhuNR1rQjPGd/1aAUNz6e B29mj7GJ4bkyMjHCkPJ4+H/ttky4E2jGtYAD19jzWH8YniNCbE9odxUG2AnxKKFM7pLi P+KA== X-Gm-Message-State: AOJu0Yz7cpCJ/d72n+cdcTxMcQsqtJddLAPwD7HLrapYONEyVr2pExFn Jde17hvG4Ejpm8PG6KvA4jIUQfekMDqJALIYHwt7/vNjfN+g+J9E+cm1Xvuq4yg1PwU= X-Gm-Gg: ASbGncs2Qzk5FdnLQtcJnrHQ/lvETU9b1yBtRXJRmafEx2eGP4TqdEgMgerye8IhgDd RJOtzSC2fYKdKhGjF49JISje2pL6qudyPKtVY2hm2TH1i5qRHBfOd/A+JaTl4n8h4FAEUn8qlFx crELHiaOu7drXTqt2SAjnb75N/KdO7neVWtD4SgVNaXe7820UbeD8zVYDXhHnqUroi6KzDwhJT+ QZVHMHJJrUQJIWzncFTwKW5LdV7sUaK7wQC5FVby0/U/fK+3iQlaLx7GXvIlQ3N3yCeGuyzYB+T 1C/oJjBjEILQaCU9M2kcrHSDtuSAz3EsvT6UvVSptuj/fblXes9vhyho2rKmQSN7K4i+jA8QEz7 3rXqOkm3KypnHJGXtaCJx4pT1DL+yljliwVtZf0/wrZRm4RczdX0= X-Google-Smtp-Source: AGHT+IE8D0gOVtcXzNM933+TuUEyd/ukvbijt2lbFY5cmEuyR3ISzu0yNdz9iazXlIsHTs5RsQSvKg== X-Received: by 2002:a05:600c:1f16:b0:46e:345d:dfde with SMTP id 5b1f17b1804b1-46fa81cd1e1mr4558435e9.16.1759838129726; Tue, 07 Oct 2025 04:55:29 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 02/17] .gitmodules: restore qemu-project mirror of u-boot Date: Tue, 7 Oct 2025 12:55:10 +0100 Message-ID: <20251007115525.1998643-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838234322154100 With this change also reference the upstream repo. Signed-off-by: Alex Benn=C3=A9e Message-ID: <20251001170947.2769296-3-alex.bennee@linaro.org> diff --git a/.gitmodules b/.gitmodules index e27dfe8c2c1..e51abe65258 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,7 +15,8 @@ url =3D https://gitlab.com/qemu-project/qemu-palcode.git [submodule "roms/u-boot"] path =3D roms/u-boot - url =3D https://gitlab.com/qemu-project-mirrors/u-boot.git + # upstream is https://github.com/u-boot/u-boot + url =3D https://gitlab.com/qemu-project/u-boot.git [submodule "roms/skiboot"] path =3D roms/skiboot url =3D https://gitlab.com/qemu-project/skiboot.git --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838376; cv=none; d=zohomail.com; s=zohoarc; b=Gd3x+iWmZtZOvm+1vuCsxYdgdg7zN8bVOqurpuJfTGN1VqXs0EKHztliQ2EiWiAHvbmrDZWTu3tOD3cVeF6G5eqLpimbI10EjCDHFVywhjXcxMST70fOINfvMmH6GbF1EeDOlup7readhlL7dmRYRj8U4E77aP0agEvghtufJnM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838376; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FUMZanu+fNDUlmwUPlkORZjFmvkzwi0xxbzJ7zLpfd8=; b=XWzM9CWLeSgh9c0/AFkcr7I/314JhkHxR+1XIaENGaLhxeQhvnAS4apKT9kkVv1SqTh/bxlgRGIc91/UWzozkfHI4FiOpCdEewDmMsZUhzx+sUJKKFKRJUNrcVp7+IbOJtQ7Rs4dCwtWXSrd6qHGJjvqJ9xIlq60rdqnnFEa7Fw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838376784693.0127273122204; Tue, 7 Oct 2025 04:59:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66Im-0002jS-9Q; Tue, 07 Oct 2025 07:56:20 -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 1v66IO-0002XM-05 for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:58 -0400 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 1v66IA-0001J7-0f for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:53 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-46e42fa08e4so58171925e9.3 for ; Tue, 07 Oct 2025 04:55:33 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e675b557fsm301406395e9.0.2025.10.07.04.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:26 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 3FF825FA33; Tue, 07 Oct 2025 12:55:26 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838130; x=1760442930; darn=nongnu.org; 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=FUMZanu+fNDUlmwUPlkORZjFmvkzwi0xxbzJ7zLpfd8=; b=SeB49+VtU7hDNxTI9sQ2L89jw+7pU+VD/Kl3zi/nIaKWXcRNG0OWmH8QSFWD8jtjLW +gzfDAlBY57zlq5HiWuhWrIkAlDLDdMd52budato+ep9jQJvh53Z0SvthVkY7ueeDpHp Z/c5tronsVoCtio1hvDPjwYyTJrImeHn8Z/XbT8YMDocLFMjP1+SUMVf7E8Q4XfVoWF9 fD8MtJs6s022VK/VmLU+SYwY/o54ACpM3nbYH+HS1mP/Pylh/dXZHqOJThGXTdeeKHy1 uulVHgvONvXSUlMqNmtUbSv5cjz5KGT4BserDvEffjkIHedhwPbvmR6amnk7nzGP2bRX TYMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838130; x=1760442930; 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=FUMZanu+fNDUlmwUPlkORZjFmvkzwi0xxbzJ7zLpfd8=; b=feWqgWpGa97kDQWW+xeJEAGOaoGifuQ3U9np2tAoTZ62GRdkaE0c4bw22mWsLvkb6G oOXEa09vrxiHnarQJ5UE5II3FmJlINzSDq/PKu5myr4FRxdylwCx7dibJNoFUYLA7Z1k 0HhwJI1Dn1lWCo4tz25XDre0JqeSOpnH8j5cYl+bGYui4eoBx7jgPVc18CXxAaW/pZol q+qz7K4uXYm6Y+IMbjEK/bfOW19Kr6iQvsrqIT79oIYSDpKiAwqq5iaBf7b+PyrBtm+D HsQjfEw+VJnwelglkFWUxGtiHnGeyuqrtBuTcwbnXDD69TfGbRxytHQRW5eQUhFwfhTl 0GVw== X-Gm-Message-State: AOJu0Yw7hOWajzJKGP1urlg58KI6iUxhM+4eNTvh1t9qc2acuksc1OVY qF6432rJ306bXPrUr3SZHjN/D+3T/Nk5GDs+NwecdQQBs8CS5IL7Vu3vnnVc7srl6+s7hjlobqQ qBCgN X-Gm-Gg: ASbGncsjRYyUUcbqx5fADiYCsqqGB1NuDzKBjsaxnixVkxMx3exm/0qM5DQpjlkJsp3 fSWVJ9QBufWt3WHKN/MjnjfOAvuinTqVJZGadlUXwHsvSn6leY1pW4xD3dRhvgjRv4qWwB8u0uf IRTzjUFSDzT/qdoDg92MGaG7KAEikdO6ivtPqBPZDvR/JGJsQbIvZD8UEv8ZqqVJiSMwa/z2Qd9 f8SqixQdJV7YmUVbNCrnpvRXKKYCOxXLfSLHBfHS/FLUCunY8d48Br4MJGGUt9iPEJid56VFBNS KKjlCB6bTFILxps5wH1Vc8BNxNxeUUadtyiUTehOibNylbfFWZ0o9ffSG6Ddp/0E2o292c0CXiz vFJiZ7M3aoYZaZf8QkLI8cfjSE/M/1JTjQvqmfwmqHoG4bMymQfg= X-Google-Smtp-Source: AGHT+IG+NDIKAhaQgWX1QoCh3PJ0Sn/Z5H3bGK2aXEH1n1p7fZiSFn8pAk/su3yVCufivW15ElTvvw== X-Received: by 2002:a05:600c:1384:b0:46e:4580:c6c5 with SMTP id 5b1f17b1804b1-46e7115cac6mr90558025e9.35.1759838130475; Tue, 07 Oct 2025 04:55:30 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 03/17] .gitmodules: restore qemu-project mirror of u-boot-sam460ex Date: Tue, 7 Oct 2025 12:55:11 +0100 Message-ID: <20251007115525.1998643-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838381548116600 With this change also reference the upstream repo. Signed-off-by: Alex Benn=C3=A9e Message-ID: <20251001170947.2769296-4-alex.bennee@linaro.org> diff --git a/.gitmodules b/.gitmodules index e51abe65258..c307216d173 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,8 @@ url =3D https://gitlab.com/qemu-project/seabios-hppa.git [submodule "roms/u-boot-sam460ex"] path =3D roms/u-boot-sam460ex - url =3D https://gitlab.com/qemu-project-mirrors/u-boot-sam460ex.git + # upstream is https://github.com/zbalaton/u-boot-sam460ex + url =3D https://gitlab.com/qemu-project/u-boot-sam460ex.git [submodule "roms/edk2"] path =3D roms/edk2 url =3D https://gitlab.com/qemu-project/edk2.git --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838348; cv=none; d=zohomail.com; s=zohoarc; b=axpsPfhRp87WMvD1Rd0htI3f4xKBPvZP2SBhf0KtSKc0yMNSsFjuRjvqUgjeI1tiPnZcm3VLGPrIYIfFlF68KVxlYuMaTKld0A4CLcord/ySUGOT1HVJrgmrMh6ZA8ttKqv2sZHWjjQYiw30es5LWOltOeOav+h+HjRDyN5k9+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838348; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fDCwQK3HllcZn/oLXm7cm4a9yrjhRqqLzaYppWTL0io=; b=ZR9Zh80AwGEwuAC3Gg5qEjBImhymcnnXZZL9Y6sncjZJlD7Rh8qqmxMbgbv1hbKW+7yOZ1L1jecJigofjt/OMrukn0DfT03US9yhuOuFFEEr7vch/hK3OZuYbiIrwXfz0zDVT6FzXWEJnqp5keJXTVO2G+ZER0Ln2MpV+34iBsc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838348375999.928603993178; Tue, 7 Oct 2025 04:59:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66Im-0002kp-Jp; Tue, 07 Oct 2025 07:56:20 -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 1v66IE-0002WG-QV for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:48 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v66I6-0001JA-KX for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:46 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-46e52279279so41390845e9.3 for ; Tue, 07 Oct 2025 04:55:34 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e723614c9sm199491695e9.14.2025.10.07.04.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:26 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 535125FB06; Tue, 07 Oct 2025 12:55:26 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838131; x=1760442931; darn=nongnu.org; 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=fDCwQK3HllcZn/oLXm7cm4a9yrjhRqqLzaYppWTL0io=; b=X9MjW5810zkdy3cL5Bx5LK+fqEleuM6wSJYNFa7Z3QAw+laF6B30h5M1JrtH09qVRA rBsEtAIF67CKsnBqhJedjAFhz0c783giwV7HWnBgol5/QtN8ySN38V+oFaK2ypNvxPr9 /l9Ze2ueiQk0sYhCqe+ou2aKKcNjVSVE58frRaBq2SECGeE1Cyk9OORam6GdTjaNljPe vAssQTMSPxLJ+5Hz44G9yTW57Vp4oiuhYCI9mG/aQhq2h5J/j4JbOWYlsBIOMoGGsa/T N4fCOF+bJLy1e/f4y3jz//n1pQoOcrEyuNNo76l89dEGjOoy7arPH79egblnvD6l7SsU eeDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838131; x=1760442931; 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=fDCwQK3HllcZn/oLXm7cm4a9yrjhRqqLzaYppWTL0io=; b=PKb1YH2bAzIgwWCwbu8Buh+p8Ia/hy6/OCs6eXg3ylzi9q34N/Dod9o+Nb0M+ftK3N ko3qNeKKXqZvf95iqgfQexZkxxCRVfLCQFpvGK9mLZJeHCbKXS2EMnzhkA3zgcD/Umxi wVLEADQyUlDXtZf3MvngoJOyLy4FoiXMfArpGBjeVv8KoYso9v8vkCcXqQ/EQooanfVz ddvnxQq05Vceb/Rz/32biMON8iGhe+1OwJbmuNuTAQko5sfrJWic2JwDJVaHYTVvevc+ MD8R+grtF+FT5Xtg0c4xlifZJ8iXw3dPo8eO4GmppgQY/iRizrhK9K8WPnSApx10UY/o lEYA== X-Gm-Message-State: AOJu0YzjOZ9cCvAP/m8a5A8tVUULhCGwbJ5jLDe9dlgM9nRqD9ukZkqM xnkNAoavdlUlpNCLmVEBN2+SOWUSib9+/nyt6gVR9rqsYcM54fykYDFhJg+U5j1Vy7LmtScvK41 Yt0cs X-Gm-Gg: ASbGncuzk93ueZtopGdbI7GNMnZVlu2Pjc0irOW9bkfSDm0dz4nf4s6Qwr0ZfGhSNjI D8QKq6GzUIv6abP0i0h4KaGK308SvxN6UURf0wG+XZikCIOmo7ZihD/YpwnrjrN065jxFL+e6rb FNMl1vyMU3FZkUAX7WKiZJKxMEzwY9/QS+vgcDkBis0yxEMMPxY6O9A5ThwZRB3gXDu8GDAZeZD C4bGQFGNft4XkShgMBqx1uKEAkV7G3NI3u5ACcZsIFSN/lBprXRbD4uP6t5bvTbSh2eFO4Amkqq +fYBIQ+3K1DZZ6cPbz9qUGeonPT0Est9Cf6VVkELYy5uBk7faJxWLV6dgPsGr2aUJYCyIqsHgNj O/7f0edQhPoSSnEYqOYoiqJqf949uxF+M4KNqjNWlyxkZSG8SStU= X-Google-Smtp-Source: AGHT+IGRxgHhgLZgBgOzMEuVoMQ9RMwYuZykkw2XfkIJgIGUONJPOsaO2Po66uM0aZbUUbbGX606Jw== X-Received: by 2002:a05:600c:4746:b0:46e:506b:20c9 with SMTP id 5b1f17b1804b1-46e71109f22mr113233555e9.12.1759838131307; Tue, 07 Oct 2025 04:55:31 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 04/17] tests/lcitool: drop 64 bit guests from i686 cross build Date: Tue, 7 Oct 2025 12:55:12 +0100 Message-ID: <20251007115525.1998643-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838353539116600 With only TCG available we can't support 64 bit guests on a 32 bit host. Fixes: 5c27baf9519 (docs/about/deprecated: Deprecate 32-bit x86 hosts for s= ystem emulation) Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Richard Henderson Signed-off-by: Alex Benn=C3=A9e Message-ID: <20251001170947.2769296-5-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/dock= er/dockerfiles/debian-i686-cross.docker index 4e8b3a8293d..2998764065f 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -178,7 +178,7 @@ ENV ABI "i686-linux-gnu" ENV MESON_OPTS "--cross-file=3Di686-linux-gnu" ENV RUST_TARGET "i686-unknown-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Di686-linux-gnu- -ENV DEF_TARGET_LIST x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-lin= ux-user +ENV DEF_TARGET_LIST i386-softmmu,i386-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 645959318a3..185a47cebe6 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -216,8 +216,6 @@ try: generate_dockerfile("debian-i686-cross", "debian-13", cross=3D"i686", trailer=3Dcross_build("i686-linux-gnu-", - "x86_64-softmmu," - "x86_64-linux-user," "i386-softmmu,i386-linux-user"= )) =20 # mips no longer supported in debian-13 --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838335; cv=none; d=zohomail.com; s=zohoarc; b=kKCXyV773JxWMHGD/8LiZknawk5um1cNRQ+gLwDvsELIv6zQV8X1OBwBfjbU/5zlOvt4vwEjzHHZt1KVOq1AfVZiSdyF4a7lL6KHnEXAphaAyfT8lM0vErWg5Z3u8I5ycplBGfv2ze9hpcnyUC53Skjr5Q208grjuXT3FDnnLyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838335; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Mko4K0zkdxia3qhWvOZZbpi+U6tsddkCZqMxkCCGGX8=; b=MGdt+OVERmWbC12IDBZWhziquQh/skTNCdUSvRADjm4d4bQZKHwAsjQWTAiQ+9RFCA5A8XPlpkgw4VLF+25ji/F8GLzZC5PB9+0gyA+3ASm8gSJmgf4xLG1LK1LO8q1nMrM4q+qW7jgDF6zCMM9I/ugedTKAqnre5TxsNBkRLJk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838335500473.1170163090434; Tue, 7 Oct 2025 04:58:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66Io-0002lx-Sm; Tue, 07 Oct 2025 07:56:23 -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 1v66IR-0002Y5-Qk for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:56:01 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v66IA-0001Jh-Vo for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:59 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-46e42deffa8so61954205e9.0 for ; Tue, 07 Oct 2025 04:55:40 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fa2cfa2dcsm16932865e9.0.2025.10.07.04.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:31 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6BB235FBDF; Tue, 07 Oct 2025 12:55:26 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838137; x=1760442937; darn=nongnu.org; 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=Mko4K0zkdxia3qhWvOZZbpi+U6tsddkCZqMxkCCGGX8=; b=lJjMSQMXqIsG+qBPPjaTZN76jZjnl56+4bDfEYfg6usZ5XkpMmo0ilnRIxmWXkYmEL 5Gcr0PmOKVy6Jt773QpBPQL3pS4Y+A4jKowf/cfsMAw6octu1wDWZHDuVoyVbBLytgv4 LkSbQOAyoxyzBdulQNISnSqgcXmK6N5fsJrWA0PdvGd664NHm/BNagzMPdXAIJOTe/Bx W2Yc45cJKmMeVKVrXKElFd+vkrRqRQczXIiorbQYSO2PFMGUBCWU/O/SGJzz+dw4GrYs Z9UOSPePdXXrFiBpaDf2VXcqS9BXNdKe4p6JXlDXna24HYwcH4iO4KlV1BNJWLH0ca7i +AHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838137; x=1760442937; 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=Mko4K0zkdxia3qhWvOZZbpi+U6tsddkCZqMxkCCGGX8=; b=Pmzvks1/rhy9h1Jq1qY2nxtY8bdQ7u8jMHV1R/NGyEMqQVsI8MrqOEQlrQRSa7Ibc9 iuG/KUcwzClZ6n6bu3EIJKMf0j59gI2ZQ5jQZPyAulI3bml6IcmmDo3b6qgnCCGbOu3+ x4NnkAAZ6EXxShboMFA912oEweX0ZiX/AJu60LAkT4eBymfFtN/MW2Mt75LUnXo77g2W 1ycS2FcnlY+M52Ao5TAmMmi5E/+S6BwS5DkioPeM4ddeVCce6A/yF1QM5bdpO+9dWsA6 feYjO2frCBNHwaMxE7tx0w9Wcx1qWcDAoOKUHhjtE/+fy+21PPxoAdYWmGuVx3CARD4m HrRw== X-Gm-Message-State: AOJu0YyzHEz9khRigeAkxIVxWsXK/YsB0D6l2pXG0Axd/qt9Flah+ebj GVwlT6Qd5MdglqmTyjztqbFGQY/bzu8EX1Cd6kPJaUgetytkzSia4M39xZlTDYz/nMVM07FHP4+ E38RM X-Gm-Gg: ASbGncv294qJO7E0bq8ezlED3938jG7mxrbgJ38MhdJ1yx76UTAeyeqUMKpS4/snJbd HeiJ0nxHwh5+HrApnmkx7I47C8+uSAFueUFclp9WS/Ifcwtt07AzkenO6kIRRXQN2WKbvRkT8EP /3EQTF3VQMeqO5CJnnan4qf2nOtA8ykZx+yg5etRdpIC4eM/IGevmrWBRrPdvJusHnqIBQqqTNZ F72Ibnyw4g4Pf04xDQXV48WENyOeEPqscOXBTOMBx7W+XA0BeOu7GyUk6KWJ1eyvzU5GTOjboA6 omxl08sQa4kHVc0baJdSr1bAIjgYv5YWYv0Os5pzRG2IcPMt4FQKz2ymUZuIX0Co+fgpOuYgZSm 7ihHYRb7Lv4XmmBmq630CEaIxhtZ+GpBIPlEm+yEPG/R6J4aQue0= X-Google-Smtp-Source: AGHT+IFzCYYGQkcWvKrenLGAnkBGnD0AAbkrbmEitQDDrRAscuj4usxvWsqHar0hoArdHa2GuSgurQ== X-Received: by 2002:a05:600c:524f:b0:46e:2330:e959 with SMTP id 5b1f17b1804b1-46e7115cb96mr123710545e9.37.1759838137530; Tue, 07 Oct 2025 04:55:37 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 05/17] tests/lcitool: bump custom runner packages to Ubuntu 24.04 Date: Tue, 7 Oct 2025 12:55:13 +0100 Message-ID: <20251007115525.1998643-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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, T_SPF_TEMPERROR=0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838340399116601 In anticipation of new runners lets move to a newer Ubuntu LTS. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Alex Benn=C3=A9e Message-ID: <20251001170947.2769296-6-alex.bennee@linaro.org> diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-r= unner.yml index 57e7faebf10..7350f6cff4a 100644 --- a/scripts/ci/setup/gitlab-runner.yml +++ b/scripts/ci/setup/gitlab-runner.yml @@ -103,7 +103,7 @@ when: - ansible_facts['distribution'] =3D=3D 'Ubuntu' - ansible_facts['architecture'] =3D=3D 'aarch64' - - ansible_facts['distribution_version'] =3D=3D '22.04' + - ansible_facts['distribution_version'] =3D=3D '24.04' =20 - name: Install the gitlab-runner service using its own functionality command: "/usr/bin/gitlab-runner install --user gitlab-runner --work= ing-directory /home/gitlab-runner" diff --git a/scripts/ci/setup/ubuntu/build-environment.yml b/scripts/ci/set= up/ubuntu/build-environment.yml index 56b51609e38..6042750cb4d 100644 --- a/scripts/ci/setup/ubuntu/build-environment.yml +++ b/scripts/ci/setup/ubuntu/build-environment.yml @@ -35,19 +35,19 @@ # the package lists are updated by "make lcitool-refresh" - name: Include package lists based on OS and architecture include_vars: - file: "ubuntu-2204-{{ ansible_facts['architecture'] }}.yaml" + file: "ubuntu-2404-{{ ansible_facts['architecture'] }}.yaml" when: - ansible_facts['distribution'] =3D=3D 'Ubuntu' - - ansible_facts['distribution_version'] =3D=3D '22.04' + - ansible_facts['distribution_version'] =3D=3D '24.04' =20 - - name: Install packages for QEMU on Ubuntu 22.04 + - name: Install packages for QEMU on Ubuntu 24.04 package: name: "{{ packages }}" when: - ansible_facts['distribution'] =3D=3D 'Ubuntu' - - ansible_facts['distribution_version'] =3D=3D '22.04' + - ansible_facts['distribution_version'] =3D=3D '24.04' =20 - - name: Install armhf cross-compile packages to build QEMU on AArch64 = Ubuntu 22.04 + - name: Install armhf cross-compile packages to build QEMU on AArch64 = Ubuntu 24.04 package: name: - binutils-arm-linux-gnueabihf @@ -62,6 +62,6 @@ - zlib1g-dev:armhf when: - ansible_facts['distribution'] =3D=3D 'Ubuntu' - - ansible_facts['distribution_version'] =3D=3D '22.04' + - ansible_facts['distribution_version'] =3D=3D '24.04' - ansible_facts['architecture'] =3D=3D 'aarch64' =20 diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml b/scripts/ci/= setup/ubuntu/ubuntu-2404-aarch64.yaml similarity index 96% rename from scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml rename to scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml index 2ca4a5392f5..ce632d97108 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml @@ -1,12 +1,13 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables --host-arch aarch64 ubuntu-2204 qemu +# $ lcitool variables --host-arch aarch64 ubuntu-2404 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 packages: - bash - bc + - bindgen - bison - bsdextrautils - bzip2 @@ -92,6 +93,7 @@ packages: - libvdeplug-dev - libvirglrenderer-dev - libvte-2.91-dev + - libxdp-dev - libxen-dev - libzstd-dev - llvm diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml b/scripts/ci/se= tup/ubuntu/ubuntu-2404-s390x.yaml similarity index 96% rename from scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml rename to scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml index 7198fbbcbb7..f45f75c9602 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml @@ -1,12 +1,13 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables --host-arch s390x ubuntu-2204 qemu +# $ lcitool variables --host-arch s390x ubuntu-2404 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 packages: - bash - bc + - bindgen - bison - bsdextrautils - bzip2 @@ -91,6 +92,7 @@ packages: - libvdeplug-dev - libvirglrenderer-dev - libvte-2.91-dev + - libxdp-dev - libzstd-dev - llvm - locales diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 185a47cebe6..056cfb6e9d7 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -270,8 +270,8 @@ try: # # Ansible package lists # - generate_yaml("ubuntu", "ubuntu-2204", "aarch64") - generate_yaml("ubuntu", "ubuntu-2204", "s390x") + generate_yaml("ubuntu", "ubuntu-2404", "aarch64") + generate_yaml("ubuntu", "ubuntu-2404", "s390x") =20 =20 sys.exit(0) --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838403; cv=none; d=zohomail.com; s=zohoarc; b=QelaOVRNuVS9JFXCoa2roX3V2Xa7qPeBO8khZly1OT2HeibkDndhCyiE7ADOVB0EzougJPehWs+arF/gjPZFp2J23U7t89SOhP48ifKsr7Q4TD1g9qBGuLc42wJAgJd7jm6q0lacx5jyaPd7x9c9/6D1APIXOwELC2P225LKuQQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838403; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Echx4uRqwkJqs/Dj8ikICL6jA4XnDYHYFfWG4FU7iJ0=; b=allBrZBPd9dRgBMBvVXq2tyaGqcVLRqH4RS5w1Kbek4RVD2JhdqnuQlr5hHamhz2F3/4DIPPGXhp68wXpMg/oKnSY/zk46QvQk3oGF38UHjdpuHvOoX1RqCudFy0MIjb0u40qmNrMhE3/NKz8r6SnMxl1kBK9/Foheqbf+DzRhM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838403891611.9384931723102; Tue, 7 Oct 2025 05:00:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66Im-0002kr-Kw; Tue, 07 Oct 2025 07:56:20 -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 1v66IG-0002Wb-Pr for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:49 -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 1v66I4-0001JE-Vl for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:48 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3ee15b5435bso3654875f8f.0 for ; Tue, 07 Oct 2025 04:55:34 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8abe9bsm25445095f8f.22.2025.10.07.04.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:31 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 82F5B5FBEE; Tue, 07 Oct 2025 12:55:26 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838132; x=1760442932; darn=nongnu.org; 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=Echx4uRqwkJqs/Dj8ikICL6jA4XnDYHYFfWG4FU7iJ0=; b=Uq5m+5G41Wyfs7t7cNxZ46Zl9l9onSR2TPnX2+kT820IfQEkdKN+a4FCemLzUHcCYU hlLL0V5QSi7DIuG3hfvMZYVtz4/Zv3lz4f6WcwE2x/Oyk/8DmuROIsnYqhczowgveGu2 7N2X6pb0LyUgee3NIgPyzpxuk/t0VPYblMJNBYV8ybYvN/52VqhlPHV67jo0v1YVDzPT RKpmIqjHDcs4IdfRupQ9UapS7sG2ia20C2bdSPG2CG7yW3zddFxrlgmbHuspbWgwtfwh mmLV+w5t/gXKLcj/Y70X7rTY3n08fKNK6xy1LGWBs+zoXmhYbPjsiYgCHNPHJ560pqmM VJgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838132; x=1760442932; 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=Echx4uRqwkJqs/Dj8ikICL6jA4XnDYHYFfWG4FU7iJ0=; b=RiT7xupi/1rhUI5hPi7NEJxo+NfVBfExLM278ApSZCRz7S2H9DBCt1bt4dPOdKhWYb crBdRDlNWrvJ+wBJ0wBnxdREpJVmkXMQdXIiacP0zIg7G7P2+uJ10BogqGDbyL3HVzLc 8Kq7ljvQG36u9ljZ7PuGt1cCbxKo9zIj7dsfky3B8e2gXfvpx42rUdtIYmKWgoIiO8Yo VP0JME+Uvtq3sjMvuBv51wLGVkqiQ+S9VzYKd+NawDmMqvc3k5GhauRBo6Frg9mF7SsJ 48GAmHZjSpijVy395BYCFU31phwbq3GP7w+GcuFb+PSYOICPbriwpGQrckozUEpqGv24 v6/g== X-Gm-Message-State: AOJu0YzrqZjuY1kxm7H5oaHhJVIRiM+OBYuSUcQHTRN1iW2sNO+RBJNF mdJstxCOaNq5aesq6/NGY9mr9WJOXb/cB9JEgZZgeCFqNi/Q46sgJ+/pj6VK1jze2VtNedZmUYR KYlUH X-Gm-Gg: ASbGncvLQfAZwgcZ+s8VXPYiIm7B4b58jWzQ8go2YdNK2IgaeGJwEFA7z7nsIShwlKx c7wVdFE8Jzh4CgfMTFtzTdZukXKacSmFZnPMZN0E5p46od3JF0bcxjQleXRm1282Xh5dvR1j4MI 33TAeQjFVUad5x042a+13aeDaGxs9OmAkLaIFs6GSKTCGw4LBTBWJdMz8+TKPlPw04qY/VlOpLC 54k3ylV1PSkCuiwyMJqNTe+lSTXCBFNSxKQzZn9kB8dzZ3b2VANUnzEH3zozSqn5magHyZ1MZyO RTv1iecJtW5jjSMqyZC0bRMLFhQQzmizbyjQWiTluelxEZdMXj9pfUQ/KRl8BRcynUMtTyXwsFY rc5zCy6FemEgpP7vLJCMBb63rp6s9RlLlcve1uDDhKkgbjXqheFo= X-Google-Smtp-Source: AGHT+IFDaa57kCZt8PFGY7eiKzO2uSJZh9SwLhgql11nCKTo9OYjrFpvrxQGwImzumwMpWx61PKNdQ== X-Received: by 2002:a05:6000:18a9:b0:411:3c14:3aa1 with SMTP id ffacd0b85a97d-42567139debmr9962416f8f.3.1759838132223; Tue, 07 Oct 2025 04:55:32 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Thomas Huth Subject: [PULL 06/17] gitlab: move custom runners to Ubuntu 24.04 Date: Tue, 7 Oct 2025 12:55:14 +0100 Message-ID: <20251007115525.1998643-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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, T_SPF_TEMPERROR=0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838406940116600 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Alex Benn=C3=A9e Message-ID: <20251001170947.2769296-7-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.= yml index 2d493f70f7a..3eb8216d571 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -29,6 +29,6 @@ junit: build/meson-logs/*.junit.xml =20 include: - - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml' - - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml' - - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml' + - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml' + - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml' + - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml' diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml b/.gitlab= -ci.d/custom-runners/ubuntu-24.04-aarch32.yml similarity index 78% rename from .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml rename to .gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml index 8727687e2b4..75029c9187e 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml @@ -1,13 +1,13 @@ -# All ubuntu-22.04 jobs should run successfully in an environment +# All ubuntu-24.04 jobs should run successfully in an environment # setup by the scripts/ci/setup/ubuntu/build-environment.yml task -# "Install basic packages to build QEMU on Ubuntu 22.04" +# "Install basic packages to build QEMU on Ubuntu 24.04" =20 -ubuntu-22.04-aarch32-all: +ubuntu-24.04-aarch32-all: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - aarch32 rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml b/.gitlab= -ci.d/custom-runners/ubuntu-24.04-aarch64.yml similarity index 89% rename from .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml rename to .gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml index ca2f1404710..d26c7827f45 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml @@ -1,13 +1,13 @@ -# All ubuntu-22.04 jobs should run successfully in an environment +# All ubuntu-24.04 jobs should run successfully in an environment # setup by the scripts/ci/setup/ubuntu/build-environment.yml task -# "Install basic packages to build QEMU on Ubuntu 22.04" +# "Install basic packages to build QEMU on Ubuntu 24.04" =20 -ubuntu-22.04-aarch64-all-linux-static: +ubuntu-24.04-aarch64-all-linux-static: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -23,12 +23,12 @@ ubuntu-22.04-aarch64-all-linux-static: - make check-tcg - make --output-sync -j`nproc --ignore=3D40` check =20 -ubuntu-22.04-aarch64-all: +ubuntu-24.04-aarch64-all: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -45,12 +45,12 @@ ubuntu-22.04-aarch64-all: - make --output-sync -j`nproc --ignore=3D40` - make --output-sync -j`nproc --ignore=3D40` check =20 -ubuntu-22.04-aarch64-without-defaults: +ubuntu-24.04-aarch64-without-defaults: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -67,12 +67,12 @@ ubuntu-22.04-aarch64-without-defaults: - make --output-sync -j`nproc --ignore=3D40` - make --output-sync -j`nproc --ignore=3D40` check =20 -ubuntu-22.04-aarch64-alldbg: +ubuntu-24.04-aarch64-alldbg: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -86,12 +86,12 @@ ubuntu-22.04-aarch64-alldbg: - make --output-sync -j`nproc --ignore=3D40` - make --output-sync -j`nproc --ignore=3D40` check =20 -ubuntu-22.04-aarch64-clang: +ubuntu-24.04-aarch64-clang: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -108,11 +108,11 @@ ubuntu-22.04-aarch64-clang: - make --output-sync -j`nproc --ignore=3D40` - make --output-sync -j`nproc --ignore=3D40` check =20 -ubuntu-22.04-aarch64-tci: +ubuntu-24.04-aarch64-tci: needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -128,12 +128,12 @@ ubuntu-22.04-aarch64-tci: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=3D40` =20 -ubuntu-22.04-aarch64-notcg: +ubuntu-24.04-aarch64-notcg: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml b/.gitlab-c= i.d/custom-runners/ubuntu-24.04-s390x.yml similarity index 88% rename from .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml rename to .gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml index e62ff1763fa..45dbee17880 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml @@ -1,13 +1,13 @@ -# All ubuntu-22.04 jobs should run successfully in an environment +# All ubuntu-24.04 jobs should run successfully in an environment # setup by the scripts/ci/setup/ubuntu/build-environment.yml task -# "Install basic packages to build QEMU on Ubuntu 22.04" +# "Install basic packages to build QEMU on Ubuntu 24.04" =20 -ubuntu-22.04-s390x-all-linux: +ubuntu-24.04-s390x-all-linux: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -21,12 +21,12 @@ ubuntu-22.04-s390x-all-linux: - make --output-sync check-tcg - make --output-sync -j`nproc` check =20 -ubuntu-22.04-s390x-all-system: +ubuntu-24.04-s390x-all-system: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - s390x timeout: 75m rules: @@ -42,12 +42,12 @@ ubuntu-22.04-s390x-all-system: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check =20 -ubuntu-22.04-s390x-alldbg: +ubuntu-24.04-s390x-alldbg: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -65,12 +65,12 @@ ubuntu-22.04-s390x-alldbg: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check =20 -ubuntu-22.04-s390x-clang: +ubuntu-24.04-s390x-clang: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -87,11 +87,11 @@ ubuntu-22.04-s390x-clang: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check =20 -ubuntu-22.04-s390x-tci: +ubuntu-24.04-s390x-tci: needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -107,12 +107,12 @@ ubuntu-22.04-s390x-tci: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` =20 -ubuntu-22.04-s390x-notcg: +ubuntu-24.04-s390x-notcg: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_22.04 + - ubuntu_24.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838273; cv=none; d=zohomail.com; s=zohoarc; b=RgH7E5uZ4MFvbxNAr9iSSk/GY8EnFRzcuiZYs+ZdsI+Nos74zkHTFPvteQflJ9qLHMfRTGZ7yaGFK0PUdrkfut2SywncJjWuOu2Hie3BJE7QvJo/LwCzM+866FK76erpHaryIZFPQpKaBDh/wR1fA78QtNssRUfS/Sk/wjJbAVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838273; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dJyQsL+cPE5QXe8EQvQ1Pt6/OFgKx8gOarr9WgNRk7w=; b=Wq1O0BXcIAQEi0+S9fNYvWL8webwgNh6KJGeM9DJcpvW63crgZsl1zzX6HIcqgWefT5AmhKNG5xmY15ZuvBVPmYavhyt6gryGIWABwPm/rn4OAKKnLWt+3X6jDrZZ3x1hswjew+45rymQTmARtoFRpO8hLKfr5BG3LW9jKcGS1c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175983827396254.15064324836658; Tue, 7 Oct 2025 04:57:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66Is-0002oQ-MU; Tue, 07 Oct 2025 07:56:26 -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 1v66IX-0002Yz-4b for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:56:09 -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 1v66IC-0001JY-72 for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:56:03 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-46f53f88e0bso17290765e9.1 for ; Tue, 07 Oct 2025 04:55:38 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e723591fcsm201851575e9.10.2025.10.07.04.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:31 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 969AD5FCAA; Tue, 07 Oct 2025 12:55:26 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838136; x=1760442936; darn=nongnu.org; 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=dJyQsL+cPE5QXe8EQvQ1Pt6/OFgKx8gOarr9WgNRk7w=; b=pSSGUESdD3ZXQ24f8u2336DRdmZkok8sSAFtCfjWVEWYVbl9K4B2qn8Pp6jCbbEw8E bYA/gJ1sK4lJIESILKQ1H2MUNDJJArp6z3FrQRyQPKNVMRnON6tGHF/Y5rom9P4XB3Gn zxIQME6Q/bzjOXvBKL5ph6HwZ2o8H6iXSRfcnucKzI4nF+EgVyL4uqy3w/bOhXGBRTr4 Dee6q9GqJ/oFzXbmqr73w4BqPRsFSPAfzN4mo2mOh47EIy+zzZXMCC/H0W1gwgs+R7D4 M3Yq9ehjTA/+kxZJjySYsvXEhuX1mF4UIczoe9XpylDwMWI0OyvSfShbAIe+1/G90eaZ l6TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838136; x=1760442936; 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=dJyQsL+cPE5QXe8EQvQ1Pt6/OFgKx8gOarr9WgNRk7w=; b=kN9DUS6GxEH7ZakqBviAsZC2B7zdlabKT5MqjnOSAKmpQEKNQsMb1Pcb3wcUdNVn3v gvtGU6FMbHHNjIkC3D18wzwMqFOXwpzSGNbf7lQVy8XdzPyK5RGCwwX+OTwDNP2VQ0Pp ZK9xb+yE7P02BElxGtF3YQ7QZbCLv0wXMUyWaT0ED3SfNbPC0tmmyz6hdL1wYcB1eehu u7HDAZPjgVZDdADJNr/jpa67+JGAVG5LQXanJxscBdsPVpbPnkgycTKDUH3kqXG675LF vmbtz/EHtDuU1xOblwhQ6pd3Wyb4BZ0Og4TafQebI0lKhoSVs6K0qJ/chTPaNxeUE4Sn +33w== X-Gm-Message-State: AOJu0YyFyLNlAggP1oQF95OX0aURhsfl+dcVQeOL496GT8UO/SR69EiJ Wbpw1a4y7zA8/oVB8D1xS5yxbSomkU1TaIwpI2nApBebwROLvilP37NLZCq1Ibcoowqt2RiKw/I LJkv8 X-Gm-Gg: ASbGncuu0DN/71KpJl/pY+PO9UZL8he1BlFL3dNcvq9LBR2lMBEs35Z8R0YPHyh57ao KqUI3UCSdKLpQqSB0QQua29lZiOAAk36VLFkwx9VgOoZuZO5TEpgaVBRUh9+tZDfjeun8NLi8Ew GP/OL81aaIXdiz+nHsi8YQpucB940fxpRtHy2nIlSH+BYzU6Vr0McAOTam7VEICgaqgn3BQRDjl O8U6LKhUF13Lj4SSBcBsfdSuby2xCnCv9WvwU+27Vr3NXyNq+Z3ot21AQdSj4rbbVeLPjT7+sZy L1aULoyShJZK8b6AAO2p3sG9kruhC8a57e+CA6wYyhIULAPy4PmW4ZYHBa8c1WrSkJcfE3iB4db LQBnV6Af//zLB9cRr8mRrjHpAnYXFht887U+f7Aq/AOb49z8E4lk= X-Google-Smtp-Source: AGHT+IEcxwo6GFNiwVZ5WQlAe3ySYjfO0CJzQEtSuLAjGixjqVa+3xe2Bim49P1EBwtCSnGqInM5sg== X-Received: by 2002:a05:600c:3b12:b0:46e:4e6d:79f4 with SMTP id 5b1f17b1804b1-46e7110efbemr109119505e9.15.1759838135964; Tue, 07 Oct 2025 04:55:35 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 07/17] scripts/ci: use recommended registration command Date: Tue, 7 Oct 2025 12:55:15 +0100 Message-ID: <20251007115525.1998643-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838276541154100 The registration-token method is being deprecated: https://docs.gitlab.com/ci/runners/new_creation_workflow/ As a result we can drop a bunch of the descriptive stuff as that is entered on the web UI. We don't need a secondary runner if we just create one with both aarch64 and aarch32 tags. Signed-off-by: Alex Benn=C3=A9e Message-ID: <20251001170947.2769296-8-alex.bennee@linaro.org> diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-r= unner.yml index 7350f6cff4a..7025935487a 100644 --- a/scripts/ci/setup/gitlab-runner.yml +++ b/scripts/ci/setup/gitlab-runner.yml @@ -16,7 +16,7 @@ tasks: - debug: msg: 'Checking for a valid GitLab registration token' - failed_when: "gitlab_runner_registration_token =3D=3D 'PLEASE_PROVID= E_A_VALID_TOKEN'" + failed_when: "gitlab_runner_authentication_token =3D=3D 'PLEASE_PROV= IDE_A_VALID_TOKEN'" =20 - name: Create a group for the gitlab-runner service group: @@ -95,15 +95,7 @@ =20 # Register Runners - name: Register the gitlab-runner - command: "/usr/bin/gitlab-runner register --non-interactive --url {{= gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registra= tion_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"= ] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distrib= ution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{= ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture= \"] }} ({{ ansible_facts[\"os_family\"] }})'" - - # The secondary runner will still run under the single gitlab-runner s= ervice - - name: Register secondary gitlab-runner - command: "/usr/bin/gitlab-runner register --non-interactive --url {{= gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registra= tion_token }} --executor shell --tag-list aarch32,{{ ansible_facts[\"distri= bution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --descript= ion '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_= version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_= family\"] }})'" - when: - - ansible_facts['distribution'] =3D=3D 'Ubuntu' - - ansible_facts['architecture'] =3D=3D 'aarch64' - - ansible_facts['distribution_version'] =3D=3D '24.04' + command: "/usr/bin/gitlab-runner register --non-interactive --url {{= gitlab_runner_server_url }} --token {{ gitlab_runner_authentication_token = }} --executor shell" =20 - name: Install the gitlab-runner service using its own functionality command: "/usr/bin/gitlab-runner install --user gitlab-runner --work= ing-directory /home/gitlab-runner" diff --git a/scripts/ci/setup/vars.yml.template b/scripts/ci/setup/vars.yml= .template index 4b355fb80fd..e9ddc05f3b0 100644 --- a/scripts/ci/setup/vars.yml.template +++ b/scripts/ci/setup/vars.yml.template @@ -6,5 +6,6 @@ ansible_to_gitlab_arch: x86_64: amd64 aarch64: arm64 s390x: s390x -# A unique token made available by GitLab to your project for registering = runners -gitlab_runner_registration_token: PLEASE_PROVIDE_A_VALID_TOKEN +# A unique token made obtained from GitLab for each runner +# see: https://gitlab.com/PROJECT/REPO/-/runners/new +gitlab_runner_authentication_token: PLEASE_PROVIDE_A_VALID_TOKEN --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838317; cv=none; d=zohomail.com; s=zohoarc; b=Jl+dduTwMHcIVyQPfsgglGsZLrmtd+dF+tB7oD51tLDmyfsZ9sZ11Ats7kpgur12h9o2GcU++pFQhFJ+aEHvL+Olk7x/in1igHErLSVT7Kuz0wjVY1i4F6RunYTScUQl3Vtj5LcAPCCTvH8pD5tOtitZItV5JiAuSH1sAUzGTZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838317; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7hh5wO1RfL5KSdXJKuGPnKWIJ/aE4KakJ9tCubA8v3Y=; b=KuKxBU5qEnNQqwoTIx49+CDxiJdjS2h7tJV7LZlY0cT7eN3Ij3Th7ggELLrsdENBr1NxiKsfNVg/qr2fajCddT/yDO4THMdTIyt/Gu8X0NBrkuF6/1dFzhuz8y+vpxynXVxdRFmzwD6agJBHQmzqgXx/AkRxHz959sPLGigKISU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175983831743885.19397859153139; Tue, 7 Oct 2025 04:58:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66Ik-0002dQ-1N; Tue, 07 Oct 2025 07:56:18 -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 1v66IE-0002WA-HQ for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:48 -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 1v66I6-0001JI-8p for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:46 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3f42b54d1b9so1009740f8f.0 for ; Tue, 07 Oct 2025 04:55:35 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e72362344sm205743565e9.15.2025.10.07.04.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:31 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A9F8B5FCE6; Tue, 07 Oct 2025 12:55:26 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838134; x=1760442934; darn=nongnu.org; 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=7hh5wO1RfL5KSdXJKuGPnKWIJ/aE4KakJ9tCubA8v3Y=; b=OhTbI8Ke7WF7W1pDYjTXJC4QSZJb85D0txKjZuK9ePdJ/TFoEzNwLVWX1Q+qr0U9KW 9mabtHE4o7TatMNyUhL8+pOFqIzJ7Rpc8o2l9J8rL40pMY8KkiRwQr2+P+aghV8/rzsk yZVx5CUJAXbVw+3Drp/P7f7Kx//SOuGVkgtjADOXZjfQSR72TZ/R39Gb7+B46Q/eibWS f8biATCe+x0mr6mY5YtQUUY2cD/1sH3A4irKbqiyjW+x0+MLXAVhz5raPtV6RRC53d4J K+LjKXgS7DPRmq9gzPSebqLIpHUUbit1ngyI4v1I9ru7GljpLLAuuEep7BpFRs1RGjfu bTzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838134; x=1760442934; 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=7hh5wO1RfL5KSdXJKuGPnKWIJ/aE4KakJ9tCubA8v3Y=; b=nZhvPgiFk1StaxR+z5ooxk3HqZ9OL2AsloCJ4bE5NNgHdUFBhe1PQsX3kBVXmitiod DLnlutECA8ksd24dPiCHJ/CzZ9g4gLImEoU5IdyeRR0RVmIyIly++rvjbCf1kmr+K0Bi 6p2vz4PBCR9B/WTB0p/atj5krANlEnk/umaR8ApfDk66fka/RPQR8xBK+tlP/nmCgTCG YzVwLrUpjf92ovsGqc0sWVCmkDhDArGTR/83I7e4MfYmXv7IhomTq20voY3UfROYQPPF e/50j+kCeE0bnIxJfKikJxvIiLzHMN3sNvJB2kWrKMW3WVOSBlYPjE6dYzqPrSm7m2HC c8TA== X-Gm-Message-State: AOJu0YwSVtgPyCC7pEZ1sPmNts/fU7EsojOcYXUTCkG1k8XBXbX00mk4 a3ekdZLcLsVm4a1CvCj+oskyZAoW4XS6w+hA9Z6pVkEopKlcTjzr44oTQqO4BMGM1U8= X-Gm-Gg: ASbGncvG++DZR3EBP4V/VCAa1di0Slc09V7hrbjUEgVhZk2lZnWD9RyI51QfDx7t2rp zxm81uCZIQEuI1SZPVcbGMGK5oePT1uiSAmRLD85U1w8nz4ALVzEKUzEauPvW3tMmyjmTKjoi1T 3QOBITFFUdQ6LOV9PAwizD9RHMJEoHzOFUuqJHpfuqargAbWvNSw4n/HDeef2/IhUon6y7eddK0 UbjBuRJUUScPTDWGlMbU2DtfJclfBKYbKJAq57y5PDsY2sYsXUpfWs/HyDmjLOl2KYGBefQmik8 Pn3kAeln0ok22TJOuzJCoze9Gsd6fdBHVCW2Yp8TOnfSXbStUCARah3erE5wsPUX7GhJXtDRm6z ZYKQ7aUXtou9HimvENCEdYTnu90aNl/yT3DHsj+ZzoLF9C3rsdcZI6TqV/GyVkw== X-Google-Smtp-Source: AGHT+IHElV+OAvLnVoNxqZ0u9sz1OZL7ZULJNRCFoQWSm3lF8kgAKLIipIKW/JTh89J9PQaBmQA3lg== X-Received: by 2002:a5d:5f94:0:b0:3fa:2316:c21 with SMTP id ffacd0b85a97d-425671520a9mr9597353f8f.17.1759838133615; Tue, 07 Oct 2025 04:55:33 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Gustavo Romero , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Subject: [PULL 08/17] tests/functional: Re-activate the check-venv target Date: Tue, 7 Oct 2025 12:55:16 +0100 Message-ID: <20251007115525.1998643-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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, T_SPF_TEMPERROR=0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838319241154100 From: Gustavo Romero Add check-venv target as a dependency for the functional tests. This causes Python modules listed in pythondeps.toml, under the testdeps group, to be installed when 'make check-functional{-}' is executed to prepare and run the functional tests. Suggested-by: Thomas Huth Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Gustavo Romero Message-ID: <20251003141820.85278-2-gustavo.romero@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/Makefile.include b/tests/Makefile.include index 62a4fc8ed31..e47ef4d45c9 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -105,11 +105,11 @@ check-venv: $(TESTS_VENV_TOKEN) =20 FUNCTIONAL_TARGETS=3D$(patsubst %-softmmu,check-functional-%, $(filter %-s= oftmmu,$(TARGETS))) .PHONY: $(FUNCTIONAL_TARGETS) -$(FUNCTIONAL_TARGETS): +$(FUNCTIONAL_TARGETS): check-venv @$(MAKE) SPEED=3Dthorough $(subst -functional,-func,$@) =20 .PHONY: check-functional -check-functional: +check-functional: check-venv @$(NINJA) precache-functional @QEMU_TEST_NO_DOWNLOAD=3D1 $(MAKE) SPEED=3Dthorough check-func check-func= -quick =20 --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838238; cv=none; d=zohomail.com; s=zohoarc; b=gtZbhg/SyxP0/KJRmS5Jm4xjbxz85zzE+38w27JtLFv0UM2LZj63wjvnD2Jo4Q+ENYwfnO+c7Ho+MNChOGXDHpcLJ9rIHNEH20/vtC/i2YWA/fhbfKEOIxxjJO8D1RDSthEfY4/XbRg0CtXTuhdHCSZvdgCGC+30FoN8aSj8QLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838238; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=67l9jRuNrudg5KXPcmgxsYYNncfTr9vIbBY0RDskrEE=; b=IizQYUQUuIjK6FHQD+BDofvaWI78yvTHhJOhTo4AVTw65jqVPy4fQRwCKR72NfrZWBXI9KhfNjaDPl5nIAWcsiW2X7zjBLKupnnkMHUVLDybprQU1hP2+uit7Gng4dpAO/Se0Sb0Jugmb3A3lVk+vQSp9YcdSapNAVUD+fCeKEU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838238444105.06659051867155; Tue, 7 Oct 2025 04:57:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66Ij-0002a1-RI; Tue, 07 Oct 2025 07:56:17 -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 1v66IN-0002XU-Aa for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:55 -0400 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 1v66I9-0001JG-25 for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:55 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-46e326e4e99so37079475e9.1 for ; Tue, 07 Oct 2025 04:55:34 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e723593d8sm228422255e9.11.2025.10.07.04.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:31 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BDDF560031; Tue, 07 Oct 2025 12:55:26 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838133; x=1760442933; darn=nongnu.org; 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=67l9jRuNrudg5KXPcmgxsYYNncfTr9vIbBY0RDskrEE=; b=FBicFG/MbkOvA93rKeT3MPxENlgNldAkjU3X8DTWhLTwoV782xzWacm6BICurDIC4B viKDlYkdsnNDGt20mWPiSCZtyr32LT3JSoazAuwx2Svn0L7vp+vQzx870C2lOf/wMwfp VraipEVbmyFt3NKpYzwOca4XXcAqStgMPrMzFchBQNSa8mpYg5HBhdML7n4MLgEJIL6G VDQG9xq/OHKtLpvYCsXt1e8r7gdE2vj1vwj/bDASRc8oaF31Y24yegLmUNKDSL3RsWrM icX5PYv9gYFnoJ5Bn4ryNCUdCPBsLKUpSP7LeQOiQZ+nGkPxlXL9QHzZoYFPv8TdDl82 DS+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838133; x=1760442933; 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=67l9jRuNrudg5KXPcmgxsYYNncfTr9vIbBY0RDskrEE=; b=h3YMmbw1mhXisQsYE5w8+da+HY8Stno+yUquHSk/ahBZAn0tfReiaL2iBz/Bg/F8Lj wV5JsdQefuQvX9v/rr3COU8oQo07fV/B76XRSEEg17i9XeOpx5HFc+tvo5VSIBLT+qNV d54b2hZJe+O17pzGdjUuMB8xoPVTKsJfNo2cKMUk1bbANrNVKWfE7Qrg6SWnQ7lZy1yv DjGVVH1CD7xWqD6r407pCVRQgNHQlcMaGJg+5IprCyiPH6y6LHYmU1y20JnoSNdUy6+V d28NTQsI4nszZM28anJi0Ewp8HBAI4oNO/4YVm71cRGWXz93qtea1Ky6IUQdb3Yri1SZ y8ag== X-Gm-Message-State: AOJu0YwUCP2MuzVB0awlaiPaX/D7L84LMECJdviuf3BT0lHw0yrB7vCv wP3w29ex7dgIdM5N4vFUFLzV2OQezI4qkVfcNJb2ovV63T5TfqY9lwrqqCctcMV4zjc= X-Gm-Gg: ASbGncuRpNIfMruw4Lj6kpaJk6vOWDe63zmb56XE30mUbEbvd5uRls+/vgPNQfE5nZP Uyjb7Efl93BXirLgw+WUDBWUTrFMQIdMbTeqlBpHtGBJxDxqibkZVdQGaX/C4kDfr1Qz7Yo6LY0 RsjABbLi5br057CzzUsBpLekHcryR8o5+BbwvvmTCOlAyDy3Tk8OnsmkXx6vA1+RDEn3DDkbrOv JaqhOqo3a+RirLt++SosJyMQ0U4yXSoq4j5BQ3GZ2enILlsqe0sDfiHGpwofY6QSvSFzM/WhOs9 t+oLOp3UNZ7mizBUdOBf/n3Y9+tyWFmX5cKlcxG39OWTU8/2tT42ORJ1ZeYI8KaUHaQIF97X949 zIgqapSmynV4Awaxaai+jWFB+6x6qxDxHzRYQgX6bMWRHuHLyMls= X-Google-Smtp-Source: AGHT+IFlSTLpFcRaPLzUpyplfbzLbXpxeTm4Q+xMBMnWtSaiO9LF0LcL6Smo9f3eCn+ci15UcPV4Iw== X-Received: by 2002:a05:600c:c0d6:b0:46e:1b9d:ac6c with SMTP id 5b1f17b1804b1-46fa29ffeebmr15317475e9.17.1759838132816; Tue, 07 Oct 2025 04:55:32 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Gustavo Romero , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Subject: [PULL 09/17] python: Install pygdbmi in meson's venv Date: Tue, 7 Oct 2025 12:55:17 +0100 Message-ID: <20251007115525.1998643-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838241575116600 From: Gustavo Romero The upcoming changes in the reverse_debugging functional test to remove Avocado as a dependency will require pygdbmi for interacting with GDB, so install it in meson's venv (located in the build dir's pyvenv/). Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Gustavo Romero Message-ID: <20251003141820.85278-3-gustavo.romero@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/pythondeps.toml b/pythondeps.toml index 16fb2a989cf..98e99e79005 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -33,3 +33,4 @@ sphinx_rtd_theme =3D { accepted =3D ">=3D0.5", installed = =3D "1.2.2" } =20 [testdeps] qemu.qmp =3D { accepted =3D ">=3D0.0.3", installed =3D "0.0.3" } +pygdbmi =3D { accepted =3D ">=3D0.11.0.0", installed =3D "0.11.0.0" } --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838253; cv=none; d=zohomail.com; s=zohoarc; b=e6DXpz2I1quPEgG0+5cxVWiqxmkLVJkr411iw/JB3GLjQjKj4F5w5oXVHM3+yDAZLD81mvrYy/w2yDbC2BQpnQrYaS6jf/tR7hl6SYY7kkdgtwK1IpxREojfCv3aBaAV5vedZ5KxS873+gRbta++01ZHq3zJU09YbXr/BaAMplQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838253; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=a76lm/FvL+H9qR+yT/bygLJJanUbAcVb3PSUoyR2HNk=; b=CJcZo/6HEZAhRmudYgNEiz1rZ2FxcWqAwWMQabiUHIa2VchoO7ChDhU0dzUeQY9RthZH1fc6z40Jw5T8BP5gCwPrLEYDlD8GXjSVCFzIQrZyFnS7w4/L7DwtxcDp5U5bhvzsDDQqWEG4r9aw5GMjfzIO7/5G3rlL+/s33ANbBOM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838253872522.163698553202; Tue, 7 Oct 2025 04:57:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66Iq-0002mc-Jv; Tue, 07 Oct 2025 07:56:24 -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 1v66IU-0002Yc-5W for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:56:05 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v66ID-0001Jc-Qx for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:56:01 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-46e37d10ed2so54279635e9.2 for ; Tue, 07 Oct 2025 04:55:39 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8a6b8bsm25118036f8f.4.2025.10.07.04.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:31 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D4D6160357; Tue, 07 Oct 2025 12:55:26 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838137; x=1760442937; darn=nongnu.org; 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=a76lm/FvL+H9qR+yT/bygLJJanUbAcVb3PSUoyR2HNk=; b=IgF/vmog+qhbK5NFZeXM04Ul+PMPehVMtn2LeBlI5W1V7tCnAqFG1InLfkC5nXHuqx fHY0hT3/uMJrcrLEUb9sv7EROc7uyozRX2X1tf6u0FWCJsybIpg2FFRsmhdTaSM2yVcx TInjZXjwnK25tre/q0iXtWwzHFe3OVq00ipdmeISPW/ZjxP3RKA5eoG8DikhSDmYsFgv WX4pOyUHIzQe7U9ARI7RDjpO8dHf5LyTvdJBxTk6BWK/AtekjUsxzydY9LHRQAI4YEvB A7ZCULF9vjeUOm66eYzHR/Uh5e4pKJwzAWK6C4wsz9uCYFzTtbAsyiSC1foHnnLjXtDm qQgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838137; x=1760442937; 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=a76lm/FvL+H9qR+yT/bygLJJanUbAcVb3PSUoyR2HNk=; b=CqkpQuRpY+8PsAILNe2zAu5x3PVbJ/uriNzasUAMkwxj9wu7K9+ODfGfzdZI+b4h3C /iGy4eGJYlI3opIYpu6vAJA7glOUT3+bs7n8bpThnS7I7vuJIHAtmsBzhhP38li3ikgV 6qSzsLGNriYzkrDz+aWnJKQXnrY73rNBpyE077QTekCH6zLiSbh5o3aisbyssuerzALK cXbzrGnz+ZZ8AwXaIelbHuGzlVvnuF+xi8Gc3Qc6veMb2IE4wDiphT8n2KIvDb56UXc0 IURAuWBNrKo6+Zcnb5iWci3MTeBHCZzFe7tgN7MCHH4Ci3tspIqYMkAIQa51/LFe6bD7 0bkQ== X-Gm-Message-State: AOJu0Yzn/8QbHJCzEBIVKCRQmPJJ6MZQeITSg2tp+sgzxyiCxuzQvi0h C2MIJ/vkS+IOSHiglpqU3Qgr4jzFFmD9tBqkhCg2KReKA+jkCezu6d7y7ZjPEAzk4pE= X-Gm-Gg: ASbGncuJhVOU37qDtoLmI7scZON71qqwTJmxRFXJxbQsM/ZaJJiNJSHxJGuiVZFMsCc Lt2V1Sg7g946Bhwy1S34+mqAOSeYmQW47Kql4PbrbtGRrhBqtAa2OdzY5/9mZ0UrwEWjzpyVr/d OiUIJRkq1q2VIHz8CqD7ML9SxtJb3BgSquPIkYPiRadqp+Lq7P4lqdTuwOT0uFZTOWDtb+nGf7Y 2AIEp80XBk+gtQagVQ/oCFxS9RS22dc6k50CRYfepg8MDaZkiLebHUJbjGU9Jplv+DdD3jENlFs ovc3EsqAv+uVRvr8W2JxC/n0qr81jmVxzzY+tqWn+Oa/ucGhi8bYM4oXb3ZAuQxb9NR3nV2Mqaj K29J+xBdTdNLRofHU3aIiazPS9Dxpsuq81lm4u+UM7mQtqgJfftU= X-Google-Smtp-Source: AGHT+IHZ6uvgyCCTqDM7AzOg8sE4ky8DiHGJK0x4uVBCPJ90YMj++UDeTEpiar99SU4CesSjyvGvww== X-Received: by 2002:a05:600c:1f11:b0:46e:6d5f:f68 with SMTP id 5b1f17b1804b1-46e7110c4ccmr115685735e9.12.1759838136729; Tue, 07 Oct 2025 04:55:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Gustavo Romero , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 10/17] tests/functional: Provide GDB to the functional tests Date: Tue, 7 Oct 2025 12:55:18 +0100 Message-ID: <20251007115525.1998643-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838255580116600 From: Gustavo Romero The probe of GDB is done in 'configure' and the full path is passed to meson.build via the -Dgdb=3Doption. Meson then can pass the location of GDB to the functional tests via an environment variable: QEMU_TEST_GDB. Signed-off-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Gustavo Romero Message-ID: <20251003141820.85278-4-gustavo.romero@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/configure b/configure index 78445cbb4b3..21d1679f58e 100755 --- a/configure +++ b/configure @@ -2003,6 +2003,8 @@ if test "$skip_meson" =3D no; then test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engin= e=3D$LIB_FUZZING_ENGINE" test "$plugins" =3D yes && meson_option_add "-Dplugins=3Dtrue" test "$tcg" !=3D enabled && meson_option_add "-Dtcg=3D$tcg" + test -n "$gdb_bin" && meson_option_add "-Dgdb=3D$gdb_bin" + run_meson() { NINJA=3D$ninja $meson setup "$@" "$PWD" "$source_path" } diff --git a/meson_options.txt b/meson_options.txt index fff1521e580..5bb41bcbc43 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -36,6 +36,8 @@ option('trace_file', type: 'string', value: 'trace', option('coroutine_backend', type: 'combo', choices: ['ucontext', 'sigaltstack', 'windows', 'wasm', 'auto'], value: 'auto', description: 'coroutine backend to use') +option('gdb', type: 'string', value: '', + description: 'Path to GDB') =20 # Everything else can be set via --enable/--disable-* option # on the configure script command line. After adding an option diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 0ebe6bc52a6..f4bd21220ee 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -58,6 +58,7 @@ meson_options_help() { printf "%s\n" ' --enable-ubsan enable undefined behaviour san= itizer' printf "%s\n" ' --firmwarepath=3DVALUES search PATH for firmware fil= es [share/qemu-' printf "%s\n" ' firmware]' + printf "%s\n" ' --gdb=3DVALUE Path to GDB' printf "%s\n" ' --iasl=3DVALUE Path to ACPI disassembler' printf "%s\n" ' --includedir=3DVALUE Header file directory [inclu= de]' printf "%s\n" ' --interp-prefix=3DVALUE where to find shared librari= es etc., use %M for' @@ -323,6 +324,7 @@ _meson_option_parse() { --disable-fuzzing) printf "%s" -Dfuzzing=3Dfalse ;; --enable-gcrypt) printf "%s" -Dgcrypt=3Denabled ;; --disable-gcrypt) printf "%s" -Dgcrypt=3Ddisabled ;; + --gdb=3D*) quote_sh "-Dgdb=3D$2" ;; --enable-gettext) printf "%s" -Dgettext=3Denabled ;; --disable-gettext) printf "%s" -Dgettext=3Ddisabled ;; --enable-gio) printf "%s" -Dgio=3Denabled ;; diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 2a0c5aa1418..725630d3082 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -77,6 +77,12 @@ foreach speed : ['quick', 'thorough'] test_env.set('PYTHONPATH', meson.project_source_root() / 'python:' + meson.current_source_dir()) =20 + # Define the GDB environment variable if gdb is available. + gdb =3D get_option('gdb') + if gdb !=3D '' + test_env.set('QEMU_TEST_GDB', gdb) + endif + foreach test : target_tests testname =3D '@0@-@1@'.format(target_base, test) if fs.exists('generic' / 'test_' + test + '.py') --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838231; cv=none; d=zohomail.com; s=zohoarc; b=RzDD1+kvcpLOp1Zjt40GbZTGNx6yjaKnW7BgQC2OYWZNo5U8bmtnrY++JSF2Di1U/X6N2l9G7O5JzWiF9ZAMbwBA91Gw29DrdAdLVKp8TELU2kOxiS5Rajbx7y6pKUMg09m8miwc7ARsZgS5iVwRD4zQEd2n0CPJTgrhfqERxeg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838231; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HOYws5ztIvDTyeWr9H4GMoPFZs+WHiESwz7nO5pdJNo=; b=BYS01eEEAQvoGxV2UePXOxtaJkigikKg3it0nEUchmqI0dwFeMVn/pTQLxtSa6X6rFQ9QKvUjBFpIujHlxuQU7bZPzms4TtZk2n1fIis2k/8O0kS2Vtb0yifDK0+fumRi2WP6XV7c05ZaTqao4Lik6VXcpwyX2/sAyM4tLIh3Xo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838231909167.13867745355185; Tue, 7 Oct 2025 04:57:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66IT-0002XY-6b; Tue, 07 Oct 2025 07:56:03 -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 1v66IH-0002Wd-98 for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:50 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v66I8-0001JN-0S for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:48 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-46e2826d5c6so47833315e9.1 for ; Tue, 07 Oct 2025 04:55:36 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e6b23d4c5sm241800745e9.17.2025.10.07.04.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:31 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E901F60376; Tue, 07 Oct 2025 12:55:26 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838134; x=1760442934; darn=nongnu.org; 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=HOYws5ztIvDTyeWr9H4GMoPFZs+WHiESwz7nO5pdJNo=; b=DDjualMESd+Y2ZOuSHLL65aMOm6DJ+eoE7Eafexo8nh33AigTjgYdiXaBwToj5C+7K PVkQDHHYwGSlYdm7y5vnVUVQQ4X2ztVQed2otlW39cw44npy7unvIfPWIalHAl8zRA3f sl/knoLyrC9Zh3lO6x9+MC+FfSqZa2QRrKcHHNkbxaQ+6QObhI+SDTvyZoIIjz+aC6l+ u4ueoY8VTTpKTRzH62RGwMQd5OJJc1cVgmI3k/Bikl8oTSTf/eKz3590zIh2WvIDu9WS se7F6MbDJTA1pRPdfMsWtXLnMxkOGrtyk9Ik4gkpjhmTYv4j0pLO9SZ4bh3/AU+OUp8a jvbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838134; x=1760442934; 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=HOYws5ztIvDTyeWr9H4GMoPFZs+WHiESwz7nO5pdJNo=; b=DUPQ5cdonAMM6NMYesCwITXnH0CjF9ltBqFwkAo70pSAx/GHsZnYwb0n0Xqngj3H+z JEwRFESCp0P0l4WgeRg2DzxU1j+qJqQM02RDjuKcIpxXQB8rS9uvytF9lpT3ifoHaeNg BPybjD0qOqLl0DubhkHcDn9WINWZkPm5S7wWTn7v0netHxXwNc/VZ5+wJz5bW3cyBVvo QSA1RdG/4Hp5FJAzI/9NGYDSg209GMCdIlG4wUj5UXGLxnuzEbY8jrdzvh369B59AlVb 6bJyn8h6JVTi4BUSABmPjLttrtffRZxGiZ8qxZ8UTrWEyOUIgb3BCgQG2lxQrY0hzSEx /jtQ== X-Gm-Message-State: AOJu0YwLyIN6G/O1477dxCewNOJ5bynxhYiKX9+3+I2rkZJ4jJY2qVzV xmSTTDBofeyuIfhjk8vbDpC+KJILNYtvZuEmafUr8MN0CP7snVXLHXhiMigfDKKE5nxQPE6zbcw 1yFSh X-Gm-Gg: ASbGncuRCaDVYG+YGOfg7eDJDiixusbGcJeUTWfnjrSB//0rCCen3qdcj2l4izu7nnP BpO4JCSRckn9HUASWzU6RnHyn++zuTUVa8K1IAyMBLsqxpqdUKHaKg7iYPoTKaUAXScFRwDOjXR bvQ/9UH42nbSb2O+O1exQFzJr0eb1eylWQ1q9RoPS4MQBHkUTfSThwru3xYvz/q+UwmYo4KpLvA hI2AlquEZGWZZD4HX9I9uJBho3g7rNmHMFcLv7vxP1gVRoy2eZJvBD/GRKJ4VCNlJC7AZiSrbwC FSzZtV335cS5PBBQp4HorwrZAdo4pjkR10QLmBiPA/0EWLoHqssnrWLxndnLH0BCmKAeG/7OkHJ hjTjno05vyze24Vk3ICjnGV7gE0nJBVTCdCwEhO5zLwhSsax/0tE= X-Google-Smtp-Source: AGHT+IEuImiC1lFGxOxnzNMYUUyG3NjqOE6G2cztgRSxISQgSJjgqlJARhKH8qfBOCb5JZj9Q7pKNA== X-Received: by 2002:a05:600c:34ce:b0:45c:4470:271c with SMTP id 5b1f17b1804b1-46e711408b5mr114773115e9.18.1759838134355; Tue, 07 Oct 2025 04:55:34 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Gustavo Romero , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 11/17] tests/functional: Add GDB class Date: Tue, 7 Oct 2025 12:55:19 +0100 Message-ID: <20251007115525.1998643-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838236546116601 From: Gustavo Romero Add GDB class, which provides methods to run GDB commands and capture their output. The GDB class is a wrapper around the pygdbmi module and interacts with GDB via GDB's machine interface (MI). Acked-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Gustavo Romero Message-ID: <20251003141820.85278-5-gustavo.romero@linaro.org> [AJB: trimmed excess license text] Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/functional/qemu_test/__init__.py b/tests/functional/qemu= _test/__init__.py index 6e666a059fc..60d19891bfc 100644 --- a/tests/functional/qemu_test/__init__.py +++ b/tests/functional/qemu_test/__init__.py @@ -18,3 +18,4 @@ skipIfMissingImports, skipIfOperatingSystem, skipLockedMemoryTest from .archive import archive_extract from .uncompress import uncompress +from .gdb import GDB diff --git a/tests/functional/qemu_test/gdb.py b/tests/functional/qemu_test= /gdb.py new file mode 100644 index 00000000000..558d476a682 --- /dev/null +++ b/tests/functional/qemu_test/gdb.py @@ -0,0 +1,86 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# +# A simple interface module built around pygdbmi for handling GDB commands. +# +# Copyright (c) 2025 Linaro Limited +# +# Author: +# Gustavo Romero +# + +import re + + +class GDB: + """Provides methods to run and capture GDB command output.""" + + + def __init__(self, gdb_path, echo=3DTrue, suffix=3D'# ', prompt=3D"$ "= ): + from pygdbmi.gdbcontroller import GdbController + from pygdbmi.constants import GdbTimeoutError + type(self).TimeoutError =3D GdbTimeoutError + + gdb_cmd =3D [gdb_path, "-q", "--interpreter=3Dmi2"] + self.gdbmi =3D GdbController(gdb_cmd) + self.echo =3D echo + self.suffix =3D suffix + self.prompt =3D prompt + self.response =3D None + self.cmd_output =3D None + + + def get_payload(self, response, kind): + output =3D [] + for o in response: + # Unpack payloads of the same type. + _type, _, payload, *_ =3D o.values() + if _type =3D=3D kind: + output +=3D [payload] + + # Some output lines do not end with \n but begin with it, + # so remove the leading \n and merge them with the next line + # that ends with \n. + lines =3D [line.lstrip('\n') for line in output] + lines =3D "".join(lines) + lines =3D lines.splitlines(keepends=3DTrue) + + return lines + + + def cli(self, cmd, timeout=3D32.0): + self.response =3D self.gdbmi.write(cmd, timeout_sec=3Dtimeout) + self.cmd_output =3D self.get_payload(self.response, kind=3D"consol= e") + if self.echo: + print(self.suffix + self.prompt + cmd) + + if len(self.cmd_output) > 0: + cmd_output =3D self.suffix.join(self.cmd_output) + print(self.suffix + cmd_output, end=3D"") + + return self + + + def get_addr(self): + address_pattern =3D r"0x[0-9A-Fa-f]+" + cmd_output =3D "".join(self.cmd_output) # Concat output lines. + + match =3D re.search(address_pattern, cmd_output) + + return int(match[0], 16) if match else None + + + def get_log(self): + r =3D self.get_payload(self.response, kind=3D"log") + r =3D "".join(r) + + return r + + + def get_console(self): + r =3D "".join(self.cmd_output) + + return r + + + def exit(self): + self.gdbmi.exit() --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838321; cv=none; d=zohomail.com; s=zohoarc; b=O94QUKxPfP5vDpvJ1uB3CaIjgTDvNsCi1SbcdNEx1KD9eOW0XNBqoiYs4q2GLyvcL2HTAAxAfYiDypb6tps/DoUGWsAJMwMgN3dvs//lKazYdDJBZphsRLq5LFtPN/iwShJlc3orRhhAepI3vGumbR/0AiZ+EkKM4rI+0qUVBq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838321; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lay1dX0EgU7CquIWsqnJhTZhe2aTP4vB0W0SBlr2NqI=; b=CoAFxfMXPB6kuHv7ZX4JxGraMern++PWD9xlCrtOppcTGCrpZKLNVETpjNcyptDOw3FgupialS4GUFbaH21X9bHraXV6/nX74pfSShXNbT/pi/aN1Iu2VF3j4kj5PLFxdK2iXJQs+2SMlsvqazXGkVyl3pE/Zandc7Prs4sUpD4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838321054128.99027155812894; Tue, 7 Oct 2025 04:58:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66Io-0002lT-GB; Tue, 07 Oct 2025 07:56:22 -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 1v66IQ-0002Xj-Io for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:59 -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 1v66I9-0001JS-CQ for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:57 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3f2ae6fadb4so1005375f8f.1 for ; Tue, 07 Oct 2025 04:55:38 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8a6c49sm25322445f8f.3.2025.10.07.04.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:31 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 09851603D3; Tue, 07 Oct 2025 12:55:27 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838135; x=1760442935; darn=nongnu.org; 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=lay1dX0EgU7CquIWsqnJhTZhe2aTP4vB0W0SBlr2NqI=; b=CHPqXQmxQJukiViL+qZW+C4ey/6Ch6FYIvEGVx8YvXnHIBQeqYkAbcFAIK+BI1OrKk aMd+hNTPhwRmxqtoj/sftDm9vmX91bHGuvSaNDwwwz5FPVTjGY96vbm1awYWUw+lksa/ /OWX3Af9SQIw53AzESYx3a/BrIA5C9Xyhm9xybOsOXyO9mCBC4OIeYrUzC+dkjCt93ny Il8bZyfgRt2FfzdO8DUgL7DkQ606LX+UCaGSdvyqoVvFhlp94T2+hwLgDdUNAgeJhp30 bs4KksJfB5+63QSssyl12aX1UafYBjGVJBwV9mG0zXRHDqRjgvEdpOPOJNps8AIzyQKs ba7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838135; x=1760442935; 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=lay1dX0EgU7CquIWsqnJhTZhe2aTP4vB0W0SBlr2NqI=; b=n71IiYNfuaMbxUkQ0It5fxfzPhuPGSxhF/tch9pqGENQgEKJjPWf5yFMUAyBh3s1w3 RCKTJ6wZOMwSqtRF/+XXPq3L42JfT50nvylnbw2q5JOuri2AUhl0HEsc3abJhn/NwCMg rUl0SIZ0BIED8Lo9HYJP0CRAA85Pr/LKggzywWn6mXuyUBCI1aMAMYpYxywLiVX3LVtn N9b/7xAWdtbwa4MpgO5m6za148IXGFbLEt719IrZPqpZenWmLnZ/8vIwMNtM8LqnQOFx aS5o/YQMQV1Lq8XarKTY4HBGue60fjiWJTPvf8wqRI2iTE5Fil7w8tEbXcB97vGQs3jZ cMkA== X-Gm-Message-State: AOJu0Ywx96+3H7p5c4mhmZllJPocUd3hWmvBwEgK4nxvRcbChHl3neeA srmBeIVWTyVjZmOMDsIV3UGPmXxvwsuD0rfJYJdXYIUWZx1L8U7oBoptLzzve+FACFM= X-Gm-Gg: ASbGncsKv1O9FUfWiBoIYWTNrxw+P5NURkZbMImuyyhXXyQ/naGR+bTJOsaAvzVGpyI e7QezMnnC9q0CTyLH2NEuwLGZErPY5QnMCZFTqSyFoZr3FhfIW0vupIlwhmEnFlL7imK4TcNDWC iB9OQrKvCOA6NaR1c9vHc9dwUitQAh/HcdmMy2KbxZDlFYOu9ow8zm3FxtWMozlMHk5hD1FIuxC knk51nFNFa7tNWSSt7zaPoPOyJqq7E/XpHf7q9PdQ6MGh+fnlSXGgTZIEb2a4FlEs31+rsutwMa ZomuET7xstmmFP3Y/XPsZ35ega1fDZrbzDsfQhw42I/XPQLM7ssPKbBLkyNtZ5sLw/QlD38AqrT qzlswVzxUGnOOSzsXRThQTkNDETa2NcZOPaX3fHby9GcWR2LkGNo= X-Google-Smtp-Source: AGHT+IE389ZQLAronRaEhh0Gbi3cWgpGlzqL1jLbiPcfO+LrMt45N4TyQ2d9OP++JGcH4Xx1OsKGaQ== X-Received: by 2002:a05:6000:240d:b0:407:77f9:949f with SMTP id ffacd0b85a97d-42567165df4mr10003536f8f.28.1759838135232; Tue, 07 Oct 2025 04:55:35 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Paolo Bonzini Subject: [PULL 12/17] tests/functional: replace avocado process with subprocess Date: Tue, 7 Oct 2025 12:55:20 +0100 Message-ID: <20251007115525.1998643-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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, T_SPF_TEMPERROR=0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838324473116600 From: Daniel P. Berrang=C3=A9 The standard python subprocess.check_call method is better than avocado.utils.process as it doesn't require stuffing all args into a single string. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Message-ID: <20251003141820.85278-6-gustavo.romero@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/functional/reverse_debugging.py b/tests/functional/rever= se_debugging.py index f9a1d395f1d..a7ff47cb90c 100644 --- a/tests/functional/reverse_debugging.py +++ b/tests/functional/reverse_debugging.py @@ -11,6 +11,7 @@ # later. See the COPYING file in the top-level directory. import os import logging +from subprocess import check_output =20 from qemu_test import LinuxKernelTest, get_qemu_img from qemu_test.ports import Ports @@ -100,7 +101,6 @@ def vm_get_icount(vm): =20 def reverse_debugging(self, shift=3D7, args=3DNone): from avocado.utils import gdb - from avocado.utils import process =20 logger =3D logging.getLogger('replay') =20 @@ -111,8 +111,9 @@ def reverse_debugging(self, shift=3D7, args=3DNone): if qemu_img is None: self.skipTest('Could not find "qemu-img", which is required to= ' 'create the temporary qcow2 image') - cmd =3D '%s create -f qcow2 %s 128M' % (qemu_img, image_path) - process.run(cmd) + out =3D check_output([qemu_img, 'create', '-f', 'qcow2', image_pat= h, '128M'], + encoding=3D'utf8') + logger.info("qemu-img: %s" % out) =20 replay_path =3D os.path.join(self.workdir, 'replay.bin') =20 --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838273; cv=none; d=zohomail.com; s=zohoarc; b=OXeHl/vWjnNfWXSKryp8rQZ6LVzN4okbLW2wOc3T+iO5bT63dmnE6sB6U+M5dp4klGKIIYhDXsdqecfclDttb6FZRQe/4Zyh6k4ATTBsWy90hY/PbXkT+m9kLHCW0mGhg62nhdUHp/0pY0XMB87zjdbDo+kBwqcbPLQDXBNjgCw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838273; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yjKs3jTlQtEveYE7uYq60wvWxiynzDFcFsVQGbRYhNc=; b=T1/PaMkrwKFCbHQx9YUgOFRDPF6uqs40EmtNBHUPuh62WlnRA0UjDs30x1r/6og6cBj5sCvq2QKq4Z4Ti2O5pV9MUcCpfEIWhVHD/cYRwhW56St8mRbbef3C4p9Ti+1RoAPYrXdCYT7D1vTOoDzqsZYxBegvhBbntoRPQ+xAro8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838273893563.2961236076341; Tue, 7 Oct 2025 04:57:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66Iu-0002oW-SF; Tue, 07 Oct 2025 07:56:29 -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 1v66IX-0002Yy-4O for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:56:09 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v66IE-0001Ju-Jj for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:56:03 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-46e4ad36541so66574875e9.0 for ; Tue, 07 Oct 2025 04:55:42 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fa57320easm11268755e9.0.2025.10.07.04.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:36 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1C82C604EC; Tue, 07 Oct 2025 12:55:27 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838139; x=1760442939; darn=nongnu.org; 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=yjKs3jTlQtEveYE7uYq60wvWxiynzDFcFsVQGbRYhNc=; b=etKt8jGEqvy1JM0Qcu8KItWPIApPZs/lSRyLGr/zagH5ZR8jHRvlmodB3i1MlGdUwv Az1maFRJXCWqKB2VR2ccLJLkwF2lfE+ezpsfz5QWKYXu3+vwgoLoYNQF2HlkcRdGJeir /oagKnOGqpxTtBlOrIuVHUOpG9ybm6RjTVT/OGHhGwdhNhwBV6viUNU0djD0MgdCASRB GLx3Ep2FqiuCtRbtW7TiRmPKGmO3jGhgjqfm4OUbBeCwFA00q9t9BNi2N0Y3DvP5JhFS rSaamIhNrQ32I/fkdSerbxlroLRTTC1Zn+WY2M4bJDg6fOOawT4yqCb2MJ7uWkExRTNb rtMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838139; x=1760442939; 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=yjKs3jTlQtEveYE7uYq60wvWxiynzDFcFsVQGbRYhNc=; b=FhmKKWYIIitYJQNZjmE3bxO1ju+T6hvMjUWOa6LluN9NCS2lRYqArKIH3PRHTyzSmF +83oAU2WFi5gGCwNZxA+9rePVGgLELCLMOYDAal4UJDbIlTJE3NsrVaQKTUZ+vJk0Zup 454mqTGsTT/3LB2Jr3eh/sCexqQYIhhjAXWkYjSbC8bCm/QrnKK5yrSB3WEJOpoXi0Jh UXT5hdpSWiHMemYkVHZMWTRUv+iTwxmhlkT3D43Q9l8VQu7pF3Tg5l7EetkePo19KXnd lUwUJh/Evpemzio2sysJAJ4DAvu6BalRNYTzU9htUaThBx8wmsSLq17N84QN5+Ykyl4+ j2TA== X-Gm-Message-State: AOJu0YyhCSShze+wstu27IRJ5+x8eGMAdEtZeCi8y5zBhlaRkQO1XEor 3bOiG7Ddpi5rzeE4ZJSxXaIoFXVpr0JJ+7CkvqJuMmLQFq+C+aS7JG0oJ92T7e7haDnYFs05133 qyqSC X-Gm-Gg: ASbGncuqySXIpbbFMg2vkuC5JCbwM2fEa4Z8taAIfZEPRWzlHIdIairzwYzFFyFmu4d eGnZ56zLkUynnfQ/R+XBGMu2VtlBIY8T4wWRS5FPB4ju0w/BXxi+XfZfD7djOdQ0xC46s2/cpX8 6YyLySuVRE4sXl4hrxq31fC01ToMNuXG415KML491BPOqCaJmwfrB7NhGdIbQDJal7kpLZHWXBh YS9+BHofaCgkzly8tC5BMWVHhFTq6OYe2YYYQQic4izJJ1polA3E84MxfiItBHEFxvTIj+5jOza kK991r9aT4383JgiGQCJ8lR7HT+czN1l7elXrcLXFBjmAjUhF0ibbfeSBh/S+lac9v9F39KDvKK ioy0gqKzf7KKTpZbSpcMb+xastH9gt/4tXy5GRY+3q1cMkyperkM= X-Google-Smtp-Source: AGHT+IHpE/V0ZjKKmJ+B6VpYK0c7yiKtrZL2X4HqBTLhnY+3PP5vUXoLLfXSZJcdAHfcBCxmI/dVOw== X-Received: by 2002:a05:600c:1986:b0:46e:3cd9:e56f with SMTP id 5b1f17b1804b1-46e711043cemr122446345e9.6.1759838139125; Tue, 07 Oct 2025 04:55:39 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Paolo Bonzini Subject: [PULL 13/17] tests/functional: drop datadrainer class in reverse debugging Date: Tue, 7 Oct 2025 12:55:21 +0100 Message-ID: <20251007115525.1998643-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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, T_SPF_TEMPERROR=0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838276480154100 From: Daniel P. Berrang=C3=A9 The reverse debugging test uses the avocado datadrainer class to create a background thread that reads from the console socket and dumps it via python logger. Most tests log console output as a side effect of doing calls to match strings, but this test never tries to match anything. This isn't critical, so just drop the functionality. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Message-ID: <20251003141820.85278-7-gustavo.romero@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/functional/reverse_debugging.py b/tests/functional/rever= se_debugging.py index a7ff47cb90c..7fd8c7607f5 100644 --- a/tests/functional/reverse_debugging.py +++ b/tests/functional/reverse_debugging.py @@ -34,8 +34,6 @@ class ReverseDebugging(LinuxKernelTest): endian_is_le =3D True =20 def run_vm(self, record, shift, args, replay_path, image_path, port): - from avocado.utils import datadrainer - logger =3D logging.getLogger('replay') vm =3D self.get_vm(name=3D'record' if record else 'replay') vm.set_console() @@ -53,10 +51,6 @@ def run_vm(self, record, shift, args, replay_path, image= _path, port): if args: vm.add_args(*args) vm.launch() - console_drainer =3D datadrainer.LineLogger(vm.console_socket.filen= o(), - logger=3Dself.log.getChild('console'), - stop_check=3D(lambda : not vm.is_runni= ng())) - console_drainer.start() return vm =20 @staticmethod --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838279; cv=none; d=zohomail.com; s=zohoarc; b=W0zay7cYZfzPsklU/bZAg5f1TO3LNxrnQUKBeSF6kJcBN/0afjaxjAP7aD5dWLwVQn8Y1xAoYRokY+WKP0ra6lnPhuHA8Nkf1JaHF3oDCpCoHeKOJqyLR6EvBBMwZIyRwfakWzakrEfVHOueTao6IPQs4jinjp3T3GsbP2munEM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838279; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fGaPJkIFeZLnWSkOQejb/Iaxr3wPsM/s4EknLxAt77s=; b=jZoHmB3GpA0ir7/jyH9+qiW1CK8Wj4kFt/oBTOBtflpfKpkqSWy9kcRqlkZdhS+K/Q3v+hlea/EHDAQmjcvSh8V06yOtHXb4DvjCtrFeSC9ydxBHKt/k2699Z/UkjOewtwIh5X3cGqJYN6Y+Pp9APgyNvxcTR5bNkey3/N01JwI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17598382795111015.5057790647603; Tue, 7 Oct 2025 04:57:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66Io-0002lj-SX; Tue, 07 Oct 2025 07:56:23 -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 1v66IR-0002Y6-R8 for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:56:01 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v66IA-0001Jl-TV for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:59 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3f44000626bso3947516f8f.3 for ; Tue, 07 Oct 2025 04:55:41 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8f45e9sm25625638f8f.51.2025.10.07.04.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:36 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 318936053D; Tue, 07 Oct 2025 12:55:27 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838138; x=1760442938; darn=nongnu.org; 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=fGaPJkIFeZLnWSkOQejb/Iaxr3wPsM/s4EknLxAt77s=; b=QneQKRfFVOrGv6pL5wJEvxYiWzdudU71R3EIdB6aL/iIkxbFfIDy4OiB6b6AJXSyQz Mp0RufJXhLOB3SgFYYCaYJisgBDL4b1PmYhWq/xMAfaUgSvkOKJVxTdJe+AFbYztA/4A wxP2tVGRYb+Q8QcXK3kN4aomHpADouniGYspAXp3f9w4ZHFH6SgfMugXxGCDdK2ff2x0 nakMj4ZY8Mm9bIOihJPLGibWpgcqmqV9zV5MVXdfi5eWyvXAkAMkml/U4n/G3/xrTY28 ycDqVdlbknV61zUq4fnaCuSKIvQ4K1w3QAygBtGv/KJ5tB5iCRRzc0mMyUPTmZ6pNntp BKsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838138; x=1760442938; 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=fGaPJkIFeZLnWSkOQejb/Iaxr3wPsM/s4EknLxAt77s=; b=dUOqFC0tplqx+eD9Q2RwZyrcXHAl06av1HFNs15dCEKTbzHccxN/iaa7c1D8Kq+h2p GzisCtNhEn50UFCIyYLu5D9vhIQ0E4AqInLWo2xT9u+QmFG9XR0pklJ6AeF78xA/XE+6 0K7/B4D4sNWKtoxU82RdPJE5eidAy3PJNi70cE9k2zho2uF0oXA+r3xSsaDR0YoAQC/1 yoDGs2hvbsXQZ90jLESAgRAHJ65BtXX/YcVTgRYoaCRO0febcUcP+uOLL/uyZ37S7Lrj fkpfVgxWtHa0/vfbJRBPQ52g60KGLYQIx204oBmujly7m3VrRXY9jnYmRL4tuXEDJ8nj hmCQ== X-Gm-Message-State: AOJu0YyrtuNEdKDtHkaQrEMYWCZi2aOMz3+O9a6/zDPmhA8Qfj3J0GmD asvTdg4a6LVoFbrEtla3JNtt4cE1b1A8v7MhM5dtNmDPm9eLU+wtgjovokxhNXsaedE= X-Gm-Gg: ASbGncsua5EBsHYKcOtkfdHlc3fu5GNuCbWDwvyUcgW7fAA2DMArPKqAHEj99Skn4cD XTla4vaH1uzh53iYrY2B33dzY1knC/2gvKG1wMEqAeK4GhFDmRmyU/853ELcrVRjcMX9CYbfa4K Slsf6d+b5WMtS0Lc6m9KHmvZfw5mr/w5k+4CdOl/++yM3aznfJ0zeugcVHl7iLg3mDjEFwr2JjK PASSvHn7AI+76ouMSywu0pxyeEHpQfRB4j6vhjQ2Aj01pxWnr0evosPjVdqXINm0MDDy/Bw3SQq AJIo7if6wQp1BcSzyiDCJOnAb0uskwRpAmGclr6NuACXklF6zH9Q79kH9PkBDoRNMG2InCLbfhH EFAKH8+okGLp2XyLNwqhLRvYmjB6Sdd8O2MNYqGuaVRKTeLd0MLE= X-Google-Smtp-Source: AGHT+IEkObAT//X6nBlZp7xGT8xcLiWO9VcWZvRajjoblOD7/ci1k++KmwOSROHKlWL5Ql/VT7QgOQ== X-Received: by 2002:a05:6000:4022:b0:3f0:4365:1d36 with SMTP id ffacd0b85a97d-4256714c4c1mr9403530f8f.16.1759838138355; Tue, 07 Oct 2025 04:55:38 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Gustavo Romero , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 14/17] tests/functional: Add decorator to skip test on missing env vars Date: Tue, 7 Oct 2025 12:55:22 +0100 Message-ID: <20251007115525.1998643-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838285963116600 From: Gustavo Romero Add a decorator to skip tests on missing env variable(s). Multiple variable names can be provided and if one or more of them are not set in the test environment the test is skipped and the missing vars are printed out. Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Gustavo Romero Message-ID: <20251003141820.85278-8-gustavo.romero@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/functional/qemu_test/__init__.py b/tests/functional/qemu= _test/__init__.py index 60d19891bfc..320193591b2 100644 --- a/tests/functional/qemu_test/__init__.py +++ b/tests/functional/qemu_test/__init__.py @@ -15,7 +15,8 @@ from .linuxkernel import LinuxKernelTest from .decorators import skipIfMissingCommands, skipIfNotMachine, \ skipFlakyTest, skipUntrustedTest, skipBigDataTest, skipSlowTest, \ - skipIfMissingImports, skipIfOperatingSystem, skipLockedMemoryTest + skipIfMissingImports, skipIfOperatingSystem, skipLockedMemoryTest, \ + skipIfMissingEnv from .archive import archive_extract from .uncompress import uncompress from .gdb import GDB diff --git a/tests/functional/qemu_test/decorators.py b/tests/functional/qe= mu_test/decorators.py index c0d1567b142..b2392958041 100644 --- a/tests/functional/qemu_test/decorators.py +++ b/tests/functional/qemu_test/decorators.py @@ -11,6 +11,24 @@ from .cmd import which =20 ''' +Decorator to skip execution of a test if the provided +environment variables are not set. +Example: + + @skipIfMissingEnv("QEMU_ENV_VAR0", "QEMU_ENV_VAR1") +''' +def skipIfMissingEnv(*vars_): + missing_vars =3D [] + for var in vars_: + if os.getenv(var) =3D=3D None: + missing_vars.append(var) + + has_vars =3D True if len(missing_vars) =3D=3D 0 else False + + return skipUnless(has_vars, f"Missing env var(s): {', '.join(missing_v= ars)}") + +''' + Decorator to skip execution of a test if the list of command binaries is not available in $PATH. Example: --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838303; cv=none; d=zohomail.com; s=zohoarc; b=FaaHgGW0IWwT4PcAyop0bW5qLJYNr1l8SOKbbhRWL5aCCs9TMp6FZLxavLm6+IiapWxeir8NhSk28tzEoOl99zySDd+nOepGxtTUAVAWIXucCqc5RopQyO83G4u1Y+k4OrNlBQTydFKSKOE3mnxuy3i1D4hyVE8sdfz6yXycT7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838303; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZWo3F9qbNdVHRw5wwFFktfT+k9Kv5ZvybIwCsmnf6YU=; b=gdWVZUiqX7Afu1iZ+MOlEwoqTiNd7bUWP0phvm58LYsKfzya9uw54fuqvl6kmplL9tKGilQhy+oXgMpdbaCU5B9Mv4doNg8jOntEy981ZGh5bP4/R1WClhNjaxsPEHYlKajLudYNBNjRHSIVYLbReievHTGfl3KNeVjTSkDRkkk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838303602727.0831791806988; Tue, 7 Oct 2025 04:58:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66In-0002l0-GB; Tue, 07 Oct 2025 07:56:21 -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 1v66IP-0002Xg-U2 for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:59 -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 1v66IC-0001K7-Pd for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:55:57 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-46b303f755aso47600075e9.1 for ; Tue, 07 Oct 2025 04:55:43 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e723591fcsm201853815e9.10.2025.10.07.04.55.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:37 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4A2E360585; Tue, 07 Oct 2025 12:55:27 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838140; x=1760442940; darn=nongnu.org; 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=ZWo3F9qbNdVHRw5wwFFktfT+k9Kv5ZvybIwCsmnf6YU=; b=eVMJG7IwmG6h8PNTwUIeZPAHqesvttBadi2OCOpItdtA673L83mUv1PJYovRcz2hBv QyTMW2tEfsaSI01PwL+Oubis+YaeeQTO+9q1GVRim6FJIqFoiuS/LNQFZmmOupzAZ0kA dxW3rxtxCX1fR+K9FJgPYSupV0+V9DZocc8dRXmZW0tUlkC4bZdj/liIuFR1+AChZEId WJ7zOG3IM5B8ucIGZcvz7w4AA40Q456oh73ztpCuPWoCnwRtDc0SOt+fgSk+bNNf0S1g BGfpzeoeY5BBPccjzx+zcKFBxLLsHUlltDbHO6kUuoIyxa6YFNXZ4PxblPfeoMGmBeYL 9C1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838140; x=1760442940; 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=ZWo3F9qbNdVHRw5wwFFktfT+k9Kv5ZvybIwCsmnf6YU=; b=n8ywBdLz40NuxQvboTsJ1UqKAlpbf6JuySJfAyMwwL5YwDzrCkXUV4lkVH6PlDnrlw 9rSKmiFwaxCe7y0p4zEu/lydh/Z6prMENfYqdsjf3vsjsVVEhZOiG+0YzjFdCV8x8Amp 20pijj3qdoWu0ZXgaG33+XkVaQKMbym+EPddqS4LtF4oEkpp7/78XcNmmsN4yy9BN0Bw rI1r/LFtxLUuvhMQhxklLZFccOjAA3zEdmMMihVfabq4j7whD0rbXchwqY5/AtXtSt2l UvU58o6P+YNp8WnUtX9Vs9DINPgXoPgHx1K8GknsvGer0AMBnh4hUaTpORg+w7/ePCsa KAcA== X-Gm-Message-State: AOJu0YzUnEZL8yw4Dzf8Im4oqwM2jM2YK5H0VZOKDRB0ZoQbSkWSCvdf WzYxBQHwvAwsJeROOtUxDBGBYZhLcoouzh/zd3R9mIPVkee30KIUET96qFIg1vD1RV0= X-Gm-Gg: ASbGnctN7SO+9HcZfRVsawJFoUdA+Fh4aAGdru6qH5Kqwpm3loeObJMVBvvLv0fjs+n QWxLAR0g/pXUTO5hlOmQBDtFO6mYZMJNeY2Tjl6QSYOZPVLWQel/7j2MmgilIjuD/PhZrEWmK6o Fyx2RSGgfUJ2F/6I3VP0jU3qbsOmbEopmsRA9ImVGgT1D+J5aWDRKblHAPcK2xxwgHFQkOWJM6+ GDp9H+HDnuSe2BpwlGExii83Em5nOqOGJJoZspUfcHDzEUQT3h+XkXW73TDDmpaZ+efH583A5Ls Qd6Ml4mNXkZKKb7I5U8LbUdAQ2hma9f5YvLowdrKR8ke2jPICrVRPLTz+pGB2Ba7OXKJzS487qw iKRdecwk71QIIk6EEg+lJ8yjBSLCiAs6Do07Yiq1AkEA7UxkID3k= X-Google-Smtp-Source: AGHT+IFqbBi+IEu7ifonH6dU3O4DeIT5cvCnO6KSCxy97wZA6VjjQLvUNyi31X99Gp/tcW+3ymVsEA== X-Received: by 2002:a05:600d:41d3:b0:46c:d476:52f3 with SMTP id 5b1f17b1804b1-46e71152676mr102531195e9.26.1759838139883; Tue, 07 Oct 2025 04:55:39 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Gustavo Romero , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Paolo Bonzini Subject: [PULL 15/17] tests/functional: Adapt reverse_debugging to run w/o Avocado Date: Tue, 7 Oct 2025 12:55:23 +0100 Message-ID: <20251007115525.1998643-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838307449116600 From: Gustavo Romero This commit removes Avocado as a dependency for running the reverse_debugging test. The main benefit, beyond eliminating an extra dependency, is that there is no longer any need to handle GDB packets manually. This removes the need for ad-hoc functions dealing with endianness and arch-specific register numbers, making the test easier to read. The timeout variable is also removed, since Meson now manages timeouts automatically. reverse_debugging now uses the pygdbmi module to interact with GDB, if it is available in the test environment, otherwise the test is skipped. GDB is detect via the QEMU_TEST_GDB env. variable. This commit also significantly improves the output for the test and now prints all the GDB commands used in sequence. It also adds some clarifications to existing comments, for example, clarifying that once the replay-break is reached, a SIGINT is captured in GDB. reverse_debugging is kept "skipped" for aarch64, ppc64, and x86_64, so won't run unless QEMU_TEST_FLAKY_TESTS=3D1 is set in the test environment, before running 'make check-functional' or 'meson test [...]'. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Gustavo Romero Message-ID: <20251003141820.85278-9-gustavo.romero@linaro.org> [AJB: it is and broke long line] Signed-off-by: Alex Benn=C3=A9e Tested-by: Thomas Huth diff --git a/tests/functional/reverse_debugging.py b/tests/functional/rever= se_debugging.py index 7fd8c7607f5..68cfcb39856 100644 --- a/tests/functional/reverse_debugging.py +++ b/tests/functional/reverse_debugging.py @@ -1,19 +1,23 @@ -# Reverse debugging test -# # SPDX-License-Identifier: GPL-2.0-or-later # +# Reverse debugging test +# # Copyright (c) 2020 ISP RAS +# Copyright (c) 2025 Linaro Limited # # Author: # Pavel Dovgalyuk +# Gustavo Romero (Run without Avocado) # # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. -import os + import logging +import os from subprocess import check_output =20 -from qemu_test import LinuxKernelTest, get_qemu_img +from qemu_test import LinuxKernelTest, get_qemu_img, GDB, \ + skipIfMissingEnv, skipIfMissingImports from qemu_test.ports import Ports =20 =20 @@ -29,9 +33,7 @@ class ReverseDebugging(LinuxKernelTest): that the execution is stopped at the last of them. """ =20 - timeout =3D 10 STEPS =3D 10 - endian_is_le =3D True =20 def run_vm(self, record, shift, args, replay_path, image_path, port): logger =3D logging.getLogger('replay') @@ -54,47 +56,17 @@ def run_vm(self, record, shift, args, replay_path, imag= e_path, port): return vm =20 @staticmethod - def get_reg_le(g, reg): - res =3D g.cmd(b'p%x' % reg) - num =3D 0 - for i in range(len(res))[-2::-2]: - num =3D 0x100 * num + int(res[i:i + 2], 16) - return num - - @staticmethod - def get_reg_be(g, reg): - res =3D g.cmd(b'p%x' % reg) - return int(res, 16) - - def get_reg(self, g, reg): - # value may be encoded in BE or LE order - if self.endian_is_le: - return self.get_reg_le(g, reg) - else: - return self.get_reg_be(g, reg) - - def get_pc(self, g): - return self.get_reg(g, self.REG_PC) - - def check_pc(self, g, addr): - pc =3D self.get_pc(g) - if pc !=3D addr: - self.fail('Invalid PC (read %x instead of %x)' % (pc, addr)) - - @staticmethod - def gdb_step(g): - g.cmd(b's', b'T05thread:01;') - - @staticmethod - def gdb_bstep(g): - g.cmd(b'bs', b'T05thread:01;') + def get_pc(gdb: GDB): + return gdb.cli("print $pc").get_addr() =20 @staticmethod def vm_get_icount(vm): return vm.qmp('query-replay')['return']['icount'] =20 - def reverse_debugging(self, shift=3D7, args=3DNone): - from avocado.utils import gdb + @skipIfMissingImports("pygdbmi") # Required by GDB class + @skipIfMissingEnv("QEMU_TEST_GDB") + def reverse_debugging(self, gdb_arch, shift=3D7, args=3DNone): + from qemu_test import GDB =20 logger =3D logging.getLogger('replay') =20 @@ -124,68 +96,107 @@ def reverse_debugging(self, shift=3D7, args=3DNone): with Ports() as ports: port =3D ports.find_free_port() vm =3D self.run_vm(False, shift, args, replay_path, image_path= , port) - logger.info('connecting to gdbstub') - g =3D gdb.GDBRemote('127.0.0.1', port, False, False) - g.connect() - r =3D g.cmd(b'qSupported') - if b'qXfer:features:read+' in r: - g.cmd(b'qXfer:features:read:target.xml:0,ffb') - if b'ReverseStep+' not in r: + + try: + logger.info('Connecting to gdbstub...') + self.reverse_debugging_run(vm, port, gdb_arch, last_icount) + logger.info('Test passed.') + except GDB.TimeoutError: + # Convert a GDB timeout exception into a unittest failure exce= ption. + raise self.failureException("Timeout while connecting to or " + "communicating with gdbstub...") f= rom None + except Exception: + # Re-throw exceptions from unittest, like the ones caused by f= ail(), + # skipTest(), etc. + raise + + def reverse_debugging_run(self, vm, port, gdb_arch, last_icount): + logger =3D logging.getLogger('replay') + + gdb_cmd =3D os.getenv('QEMU_TEST_GDB') + gdb =3D GDB(gdb_cmd) + + r =3D gdb.cli("set architecture").get_log() + if gdb_arch not in r: + self.skipTest(f"GDB does not support arch '{gdb_arch}'") + + gdb.cli("set debug remote 1") + + c =3D gdb.cli(f"target remote localhost:{port}").get_console() + if not f"Remote debugging using localhost:{port}" in c: + self.fail("Could not connect to gdbstub!") + + # Remote debug messages are in 'log' payloads. + r =3D gdb.get_log() + if 'ReverseStep+' not in r: self.fail('Reverse step is not supported by QEMU') - if b'ReverseContinue+' not in r: + if 'ReverseContinue+' not in r: self.fail('Reverse continue is not supported by QEMU') =20 + gdb.cli("set debug remote 0") + logger.info('stepping forward') steps =3D [] # record first instruction addresses for _ in range(self.STEPS): - pc =3D self.get_pc(g) + pc =3D self.get_pc(gdb) logger.info('saving position %x' % pc) steps.append(pc) - self.gdb_step(g) + gdb.cli("stepi") =20 # visit the recorded instruction in reverse order logger.info('stepping backward') for addr in steps[::-1]: - self.gdb_bstep(g) - self.check_pc(g, addr) logger.info('found position %x' % addr) + gdb.cli("reverse-stepi") + pc =3D self.get_pc(gdb) + if pc !=3D addr: + logger.info('Invalid PC (read %x instead of %x)' % (pc, ad= dr)) + self.fail('Reverse stepping failed!') =20 # visit the recorded instruction in forward order logger.info('stepping forward') for addr in steps: - self.check_pc(g, addr) - self.gdb_step(g) logger.info('found position %x' % addr) + pc =3D self.get_pc(gdb) + if pc !=3D addr: + logger.info('Invalid PC (read %x instead of %x)' % (pc, ad= dr)) + self.fail('Forward stepping failed!') + gdb.cli("stepi") =20 # set breakpoints for the instructions just stepped over logger.info('setting breakpoints') for addr in steps: - # hardware breakpoint at addr with len=3D1 - g.cmd(b'Z1,%x,1' % addr, b'OK') + gdb.cli(f"break *{hex(addr)}") =20 # this may hit a breakpoint if first instructions are executed # again logger.info('continuing execution') vm.qmp('replay-break', icount=3Dlast_icount - 1) # continue - will return after pausing - # This could stop at the end and get a T02 return, or by - # re-executing one of the breakpoints and get a T05 return. - g.cmd(b'c') + # This can stop at the end of the replay-break and gdb gets a SIGI= NT, + # or by re-executing one of the breakpoints and gdb stops at a + # breakpoint. + gdb.cli("continue") + if self.vm_get_icount(vm) =3D=3D last_icount - 1: logger.info('reached the end (icount %s)' % (last_icount - 1)) else: logger.info('hit a breakpoint again at %x (icount %s)' % - (self.get_pc(g), self.vm_get_icount(vm))) + (self.get_pc(gdb), self.vm_get_icount(vm))) =20 logger.info('running reverse continue to reach %x' % steps[-1]) # reverse continue - will return after stopping at the breakpoint - g.cmd(b'bc', b'T05thread:01;') + gdb.cli("reverse-continue") =20 # assume that none of the first instructions is executed again # breaking the order of the breakpoints - self.check_pc(g, steps[-1]) + pc =3D self.get_pc(gdb) + if pc !=3D steps[-1]: + self.fail("'reverse-continue' did not hit the first PC in reve= rse order!") + logger.info('successfully reached %x' % steps[-1]) =20 logger.info('exiting gdb and qemu') + gdb.exit() vm.shutdown() --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838235; cv=none; d=zohomail.com; s=zohoarc; b=MYlbuJyoxE3i28m55b6ujBeDo44TjEUBWgwkpFPpGqa5Cj1Xaju6v/W8lT7H5XLfrGq/ifq3UA1HtmHt0WXh4Be4APFEBmkPDKPjyrnwOKave5L1wkR+WmK6wP8KrlMwxjuG4RKgaDW/Qw08KOM7FDinm2H+C//k32wPc282T+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838235; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RWkzNTNhVeSRuf8nBb9rMnj6+r8fAqh97An6MdGnAFU=; b=jh5JLTa1GjCze6UKXbzIU2jooC/XV5irJwZfkXiQ+LNeAEa8cEhGo31AmLnjtw5GGSLJQYsXVwFSNzR+6/Z4ZbHItE4g5ugeR5q32URHftzh2bpNlKezikIaDsuakl5ZqWZTgTR8Y7eG/THnd3HCkC7RRyGm89hT5ah0yTYUn/I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838235450100.43070021137817; Tue, 7 Oct 2025 04:57:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66Iw-0002oX-H9; Tue, 07 Oct 2025 07:56:31 -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 1v66Ic-0002ZG-4Y for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:56:11 -0400 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 1v66IF-0001K9-5l for qemu-devel@nongnu.org; Tue, 07 Oct 2025 07:56:07 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-46e6c8bc46eso40257465e9.3 for ; Tue, 07 Oct 2025 04:55:43 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e61a0241bsm291502615e9.11.2025.10.07.04.55.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 04:55:37 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 645AD605F0; Tue, 07 Oct 2025 12:55:27 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838141; x=1760442941; darn=nongnu.org; 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=RWkzNTNhVeSRuf8nBb9rMnj6+r8fAqh97An6MdGnAFU=; b=ZZESFUXNEthZ8mMAxRYjQ9SKEB/5TmxzzTA24nf8ap6RBiMZoL3tCpE2HeiWAkSEKp khy3d5/Cxl14GsCtPajaIc9rKzo6PJtd3VyPikytq0EKuq+Dpxe5Lhj13GCPD5ZAhDt7 0QqjiQ1kQA/vGpUh2XiQdZlIA/TMNesoQqW0ZRFKeOv8bZawfpmkm7oxZPQ6ha6/Ysf/ Uqe6H84YqssRw9MeG/mcJkhAn08M18XD7c4bhBGF/l5QXBfyzXzEjPSEwNDGxNlcJnMR 61hsND4bCBVIdCaoDCsPc5BgpE/8d623VR5AMAw3n/NkMsgfZsjNn1KSz/aJm1E0hkIE OUFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838141; x=1760442941; 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=RWkzNTNhVeSRuf8nBb9rMnj6+r8fAqh97An6MdGnAFU=; b=oQ0LkRmh1l5ivq+Gd2TFtzCgsFKvLgLsra6V5jQxOvTNmpdy8Jks7lEhLl+po/+6+i QdNZzPfOXTexmVlwgDMO/yWnd1tYW/Z6BYgcv6skYOsJY0KjDk4U1GgaqJZY8OuZZ+yW 40POUn+tBGWQVBzejZLvzp+6Zedoj4AuD9+QHDhj51uLU/YsKKNs7nkAqlJXBPGt48Md UbzncXERABOryXDGglwz8TCJRQbrMKSN/KPwIDHdsAe86O99/A4hkjYJkOqpNQtItlNY eptrh+yBdaO/KEavmZoMKBpKaKI2uQ8J2/JKpx3miiPzbXmjIYPkaHCkXCN0E6nImzD/ ISAA== X-Gm-Message-State: AOJu0YyuJpMZcFDfGKAwYsBBKFZfkUUxOMrnZEQVN0G33ZtJ4wvPeXBQ mOQISzQ7CL/14r/D6v/FlQyjj2HlTz7hOvQQr4kt4hEY7v7SfAsaGQh1eiCQU2bLXPs= X-Gm-Gg: ASbGncu1buNOWrOnAyhhhjQ6JcpiIJ5ifizAQ9TUtONXxEESF3MEy2UXmYbNbYFhMN5 4NS88ENnXWUrpwE4KIksTelqKZ3yHMpSK4pK5tzWybo7yiO5RZQGEckmTrWMAsorNmysxxq1bGf 5RuB0mjCDpGU1ZAIkxnYG7/ZOzRyZShyyhknaYFGegPpm24xMQ3/ICl5EF+O6trojSBHUxKONqn SalEOmGFRX8dE7lvsOhEfG9XZJ/CyVzQhNh5EN3vSMs5Mr5WXUCXuZT3q/U92dHEVymiNHMUgPO EE508WbKpQpvmSqtsHbWFD7CWjl14Yw1WwYUe1K11zdeJjysWbR423g4U3C5ph5+QeR8GxbMcmZ vgHaNGbXslDAdKBFeDI4PdoEgRIQ05ALkxV9xrUKZt5MPDOaoNrw= X-Google-Smtp-Source: AGHT+IHuCRbDcyWjPmwNVhULKnB7gPUyp+OW3faylGNmCCTJcVnlBMByEE5B9XBoGZPgvGw+YCwW/Q== X-Received: by 2002:a05:600c:538e:b0:46c:a569:71a0 with SMTP id 5b1f17b1804b1-46e711510efmr111328225e9.26.1759838140636; Tue, 07 Oct 2025 04:55:40 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Gustavo Romero , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Zhao Liu Subject: [PULL 16/17] tests/functional: Adapt arches to reverse_debugging w/o Avocado Date: Tue, 7 Oct 2025 12:55:24 +0100 Message-ID: <20251007115525.1998643-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838238290154100 From: Gustavo Romero reverse_debugging no longer depends on Avocado, so remove the import checks for Avocado, the per-arch endianness tweaks, and the per-arch register settings. All of these are now handled in the ReverseDebugging class, automatically. Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Gustavo Romero Message-ID: <20251003141820.85278-10-gustavo.romero@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/functional/aarch64/test_reverse_debug.py b/tests/functio= nal/aarch64/test_reverse_debug.py index 8bc91ccfde7..906f10aec55 100755 --- a/tests/functional/aarch64/test_reverse_debug.py +++ b/tests/functional/aarch64/test_reverse_debug.py @@ -2,25 +2,24 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # -# Reverse debugging test +# Reverse debugging test for aarch64 # # Copyright (c) 2020 ISP RAS +# Copyright (c) 2025 Linaro Limited # # Author: # Pavel Dovgalyuk +# Gustavo Romero (Run without Avocado) # # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. =20 -from qemu_test import Asset, skipIfMissingImports, skipFlakyTest +from qemu_test import Asset, skipFlakyTest from reverse_debugging import ReverseDebugging =20 =20 -@skipIfMissingImports('avocado.utils') class ReverseDebugging_AArch64(ReverseDebugging): =20 - REG_PC =3D 32 - ASSET_KERNEL =3D Asset( ('https://archives.fedoraproject.org/pub/archive/fedora/linux/' 'releases/29/Everything/aarch64/os/images/pxeboot/vmlinuz'), @@ -31,7 +30,7 @@ def test_aarch64_virt(self): self.set_machine('virt') self.cpu =3D 'cortex-a53' kernel_path =3D self.ASSET_KERNEL.fetch() - self.reverse_debugging(args=3D('-kernel', kernel_path)) + self.reverse_debugging(gdb_arch=3D'aarch64', args=3D('-kernel', ke= rnel_path)) =20 =20 if __name__ =3D=3D '__main__': diff --git a/tests/functional/ppc64/test_reverse_debug.py b/tests/functiona= l/ppc64/test_reverse_debug.py index 5931adef5a9..69551fb84df 100755 --- a/tests/functional/ppc64/test_reverse_debug.py +++ b/tests/functional/ppc64/test_reverse_debug.py @@ -2,39 +2,36 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # -# Reverse debugging test +# Reverse debugging test for ppc64 # # Copyright (c) 2020 ISP RAS +# Copyright (c) 2025 Linaro Limited # # Author: # Pavel Dovgalyuk +# Gustavo Romero (Run without Avocado) # # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. =20 -from qemu_test import skipIfMissingImports, skipFlakyTest +from qemu_test import skipFlakyTest from reverse_debugging import ReverseDebugging =20 =20 -@skipIfMissingImports('avocado.utils') class ReverseDebugging_ppc64(ReverseDebugging): =20 - REG_PC =3D 0x40 - @skipFlakyTest("https://gitlab.com/qemu-project/qemu/-/issues/1992") def test_ppc64_pseries(self): self.set_machine('pseries') # SLOF branches back to its entry point, which causes this test # to take the 'hit a breakpoint again' path. That's not a problem, # just slightly different than the other machines. - self.endian_is_le =3D False - self.reverse_debugging() + self.reverse_debugging(gdb_arch=3D'powerpc:common64') =20 @skipFlakyTest("https://gitlab.com/qemu-project/qemu/-/issues/1992") def test_ppc64_powernv(self): self.set_machine('powernv') - self.endian_is_le =3D False - self.reverse_debugging() + self.reverse_debugging(gdb_arch=3D'powerpc:common64') =20 =20 if __name__ =3D=3D '__main__': diff --git a/tests/functional/x86_64/test_reverse_debug.py b/tests/function= al/x86_64/test_reverse_debug.py index d713e91e144..2b31ae87243 100755 --- a/tests/functional/x86_64/test_reverse_debug.py +++ b/tests/functional/x86_64/test_reverse_debug.py @@ -2,34 +2,29 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # -# Reverse debugging test +# Reverse debugging test for x86_64 # # Copyright (c) 2020 ISP RAS +# Copyright (c) 2025 Linaro Limited # # Author: # Pavel Dovgalyuk +# Gustavo Romero (Run without Avocado) # # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. =20 -from qemu_test import skipIfMissingImports, skipFlakyTest +from qemu_test import skipFlakyTest from reverse_debugging import ReverseDebugging =20 =20 -@skipIfMissingImports('avocado.utils') class ReverseDebugging_X86_64(ReverseDebugging): =20 - REG_PC =3D 0x10 - REG_CS =3D 0x12 - def get_pc(self, g): - return self.get_reg_le(g, self.REG_PC) \ - + self.get_reg_le(g, self.REG_CS) * 0x10 - @skipFlakyTest("https://gitlab.com/qemu-project/qemu/-/issues/2922") def test_x86_64_pc(self): self.set_machine('pc') # start with BIOS only - self.reverse_debugging() + self.reverse_debugging(gdb_arch=3D'x86-64') =20 =20 if __name__ =3D=3D '__main__': --=20 2.47.3 From nobody Fri Nov 14 22:18:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759838787; cv=none; d=zohomail.com; s=zohoarc; b=g8K3/wba2XQAEecvJBlYaq5fmOlHB87k5FGsNDTbQw7YE6gu900/3ORNGqjZ28vljuPfA/s2S2hQu4PL2v6J2mwmxLRbCTKtS7pcTXPg/pUUuUNlbLMoB0hWvhibonNYYRHesJZtWVb6CrHlxzCsHz9ZhbtVDONXxzGnbJk8Va4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759838787; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=M7Mgd7EkPdKSfhCjuk7ndXTip3GHUcWefr6E/eQKgoA=; b=U2RQKXAimF+EvJyiLH06BBuW9PNqx13W1jbg2PTabUakMz0zKS2zYpe3UCgsUZDjUz6N2qTt0ris7DwdjtuGPuxdylg2OPCDpg4+Y7IMPjnCO1f+ZJnR+I/kYz5/0iiBIiSzsGt4jx5mef5bwsDL1tGhhK9w0WBRQSexhEIxC/E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759838787201404.79572140118376; Tue, 7 Oct 2025 05:06:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v66R6-00043k-I2; Tue, 07 Oct 2025 08:04:56 -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 1v66R2-00043T-CF for qemu-devel@nongnu.org; Tue, 07 Oct 2025 08:04:52 -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 1v66Qr-0002NK-RM for qemu-devel@nongnu.org; Tue, 07 Oct 2025 08:04:51 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-42421b1514fso2907241f8f.2 for ; Tue, 07 Oct 2025 05:04:40 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8a6c49sm25357882f8f.3.2025.10.07.05.04.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 05:04:35 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7DE0E605F4; Tue, 07 Oct 2025 12:55:27 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759838677; x=1760443477; darn=nongnu.org; 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=M7Mgd7EkPdKSfhCjuk7ndXTip3GHUcWefr6E/eQKgoA=; b=ylSzixdF6MlYWsraeByrLgC48M4NjjOliXloVejhx+HHLSyftFLfzUK1O0cyWv3qix mmWBeUNfN/l1Vj+WRnvp/mKR+BwxAet+kt3cYO83m8tFNDYB7aDuFJuhqvicYicDhuif ASWQ6agmd0/qb1zFMsvGVJ5c+dqf4PAYvDlx9nvtDX1lsB3Mp51jh6u7R3J6Vu+MII2x G2CDFm1lJEUE8FW1knBIgRwdE+GJSlD2AXlnch319h8SkflHe7RSJVjW9SLab0L0ZHxz xJlaJbmZkqQIqhb98k+zzP+7zpY2fJXzJMlKJpJsJHzrjljXTYgmXfOOcJEa0zX1fdaF mbGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759838677; x=1760443477; 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=M7Mgd7EkPdKSfhCjuk7ndXTip3GHUcWefr6E/eQKgoA=; b=iIYx6s3it6k91KzErXo77aRmaBpDtQKypfokygM+EXDn1ZRi1gB+QyvQdIqF1TYfrK uzlsutNiyBJ2dtVrF1w0FU41wqwvSu5si3w83rNpPBwyXxx8gnGlJe16eZJmnbJhZU5F oG8vaTprmaa7mDMqC1JsrCGp8EEODtfgoq8ycF4XeqjeNU8LIb5xB/uFLG0BpHoA566+ UrkCm5Cw4sTle+5k5CWnJKS2GGKMhrDWotXsrd+MYeBqTqyF5w4Tc+46nu6R29CNEAW6 Hn17iHlIt2ynuQjIEFj/AJ/99OllLJEvwkCCg6u54jG1c2yQKy/3ygninx0xYcEst/NZ YTmw== X-Gm-Message-State: AOJu0YyRUxgbZN0Np7oBtz+qz/bcdfnFf0+ZZns242Y2YwAg4zk9LNKG DaGv+aDzT4h4Y8yFpMf77Yy0p9onDFmxljdjKFen8HhGvl1/Qh+irFC2Id1bSVU/+Fc= X-Gm-Gg: ASbGncto9mzlXYWNp6f2RxbmdPl/kkuntY4wXeNdmGHJWknL6Sq81jLTcYwhcyRodOU ULZAT3TQotpIbC9ASnAFY9RGFBwjn8USB0wkCYbq/4imhS/VlPMYpszHln10dn+OY73jPLtQYeb P7E7Aj/JiH7jy4+2BXvaJEJajn/W6NNcOAhZZEDJ27flWBBgzXXpPF2Kpn5iycBcoid6H+MQJcE 448S9qQax0pATr4R9IitXj5iPDSupLLUFalIL2Lnc2gecH7D9888hbK94L2xNSne13+jIHtNCpD lt8oR0KSNcG1sqtyDqvXPAdUsvbjWLMAXW/BgNkCSaYtdBx8TDmm4pPcD2p8LWiCqBL682U0V9R Ld/zegJnkbnXP5CIvGEbm1QZfPXHhzqFm/Vr89SOLn1mIqE6hyLETCN0cZm+92A== X-Google-Smtp-Source: AGHT+IH4BiMrNErjv+gRrlQf6aUqwG3bGP+pBNdEfeHaYTAoXmejcUG6PyGlgOIDiHGMj4T7s+R82w== X-Received: by 2002:a05:6000:603:b0:3ea:6680:8fc4 with SMTP id ffacd0b85a97d-42567139e59mr8727394f8f.8.1759838676767; Tue, 07 Oct 2025 05:04:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Vladimir Lukianov <1844144@gmail.com>, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Subject: [PULL 17/17] record/replay: fix race condition on test_aarch64_reverse_debug Date: Tue, 7 Oct 2025 12:55:25 +0100 Message-ID: <20251007115525.1998643-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251007115525.1998643-1-alex.bennee@linaro.org> References: <20251007115525.1998643-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759838789265116600 From: Vladimir Lukianov <1844144@gmail.com> Ensures EVENT_INSTRUCTION written to replay.bin before EVENT_SHUTDOWN_HOST_= QMP Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2921 Signed-off-by: Vladimir Lukianov <1844144@gmail.com> Message-ID: <20250603125459.17688-1-1844144@gmail.com> [AJB: fix re-base file mode] Signed-off-by: Alex Benn=C3=A9e diff --git a/replay/replay.c b/replay/replay.c index a3e24c967ae..b2121788c1d 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -263,6 +263,8 @@ bool replay_has_interrupt(void) =20 void replay_shutdown_request(ShutdownCause cause) { + replay_save_instructions(); + if (replay_mode =3D=3D REPLAY_MODE_RECORD) { g_assert(replay_mutex_locked()); replay_put_event(EVENT_SHUTDOWN + cause); diff --git a/tests/functional/aarch64/test_reverse_debug.py b/tests/functio= nal/aarch64/test_reverse_debug.py index 906f10aec55..ec3348c96d8 100755 --- a/tests/functional/aarch64/test_reverse_debug.py +++ b/tests/functional/aarch64/test_reverse_debug.py @@ -25,7 +25,6 @@ class ReverseDebugging_AArch64(ReverseDebugging): 'releases/29/Everything/aarch64/os/images/pxeboot/vmlinuz'), '7e1430b81c26bdd0da025eeb8fbd77b5dc961da4364af26e771bd39f379cbbf7') =20 - @skipFlakyTest("https://gitlab.com/qemu-project/qemu/-/issues/2921") def test_aarch64_virt(self): self.set_machine('virt') self.cpu =3D 'cortex-a53' --=20 2.47.3