From nobody Sat May 18 14:25:19 2024 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=1684426911; cv=none; d=zohomail.com; s=zohoarc; b=JPzcy78cON+4ogoLG8C4ZdzAAN+Yy8VmHWFUQkD/7En/pLcLJk1+w/KkH0+m8E4v92Q6LsuXkKGPu70xCvtTNA0cAb9hdg5CuZGTJzJBTgDVlrYYvVbggygd+oUgu6H6H5xoAg6cwWOGw5VX2d5LCH+UJIEuL+OexGpuKmfusQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684426911; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Zbl8XzyKlaQzQKkmBpRC1BQfjMk6noU7XtypXo8S4mE=; b=oD+Vwn6z+gdniEtX8LDAN5BHQsUNmwaHK17PFXYqsm86/Fbn82vAfEbjhJGbaA8/Kp0L8ksr96B20oSYPc8PHY3SpaAydSgz4jDNpwhPp7x8ckUtcWi+PcOyo6FAEBYd8yG9LwY/yrRAL6apIgyibcYpEEVBZDJg/L7dgAkcGMM= 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 1684426911169189.5985048519193; Thu, 18 May 2023 09:21:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzgMz-0007dv-BF; Thu, 18 May 2023 12:20:49 -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 1pzgMq-0007Yn-7b for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:41 -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 1pzgMn-0006OA-Gg for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:40 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f420618d5bso14716625e9.1 for ; Thu, 18 May 2023 09:20:36 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m16-20020a7bca50000000b003f4fbd9cdb3sm2504196wml.34.2023.05.18.09.20.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 09:20:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5DE2F1FFBC; Thu, 18 May 2023 17:20:34 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684426835; x=1687018835; 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=Zbl8XzyKlaQzQKkmBpRC1BQfjMk6noU7XtypXo8S4mE=; b=CP2cQJ6GvxK3TcLDMcCNHZlEIXw8ACYWLWF5vHj+FHngZJg1D4ePURAr+EDf4uuLS4 nvWqOjcvm6jvC4DwbF0TC8afc9Uw1rfJOWXbp3CnxcdWJbfnqm1fj7c34ieZyCa245Nk o+OElouFDouEVf/+i6kz2PEIV2fZIAUhqChDmXysTOp7yLUtrK2F10/ckkpy++EonJYc 8OWesbRYpmk59kfQw1G0IvazZzLftCSR3aDYubIRq0Xip3t7zi04u7gEEEuHlNKk5zcH kldZftgNn3aVz6gc940PlG8BxuL4XccCoT/NT6abPER/MZyuwFw27BQp0kiVKsvGDzzf CWsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684426835; x=1687018835; 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=Zbl8XzyKlaQzQKkmBpRC1BQfjMk6noU7XtypXo8S4mE=; b=fAYbaLaUJZq+TFJ4800UGjQU1O0m3W1z5NAGByTx0oOGPakRkJN9JNf5Efk12yx2IO F3A4QFxO+N5v3szVBdFr8aj2e1vQJxs5vUWvHaSNHvf3C0A5hRvh5ucIglNZPMYQ6lEC //4X+EVk8ESXGaEgHFT+swc3SNecYZfdTOYknJgR3Yve8bI4zuoIL6GlXmcU4c+7KYYX PGE5Hmf7z7zysdg3gpJeyvAB08AaN/L+t3TZOGtymkIeDcGy01vGQgRmTU56BJe4pSRj ymjocSEfE7Up+BZ6hVUPLLXlGSw/oJwsoUr9pHFOLJnvh0cxY1ixOcoaNdUjldB1p2Q/ UWkA== X-Gm-Message-State: AC+VfDxM5ku5wvYT4gDZYHxkhnj81dE1ITwDETgnMDspdhOG7p5KCc2C AlpGHYN1yisbgb7oBgi4j0t1pg== X-Google-Smtp-Source: ACHHUZ5HYaKmR9nnnz5FYH2HMdEaMUqDceDfxkcGeMrw9+sSkqlkFfzp5nz00ASgzyIz9sDfEosp/w== X-Received: by 2002:a1c:720e:0:b0:3f4:2d31:11b2 with SMTP id n14-20020a1c720e000000b003f42d3111b2mr2050672wmc.13.1684426835237; Thu, 18 May 2023 09:20:35 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , Richard Henderson , Peter Maydell , Thomas Huth , John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Mark Cave-Ayland , Wainer dos Santos Moschetta , Cleber Rosa , Beraldo Leal , Bin Meng Subject: [PATCH 1/8] gitlab: explicit set artifacts publishing criteria Date: Thu, 18 May 2023 17:20:27 +0100 Message-Id: <20230518162034.1277885-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230518162034.1277885-1-alex.bennee@linaro.org> References: <20230518162034.1277885-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, T_SCC_BODY_TEXT_LINE=-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: 1684426913262100014 From: Daniel P. Berrang=C3=A9 If not set explicitly, gitlab assumes 'when: on_success" as the publishing criteria for artifacts. This is reasonable if the artifact is an output deliverable of the job. This is useless if the artifact is a log file to be used for debugging job failures. This change makes the desired criteria explicit for every job that publishes artifacts. Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20230503145535.91325-2-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- .gitlab-ci.d/buildtest-template.yml | 4 +++- .gitlab-ci.d/buildtest.yml | 2 ++ .gitlab-ci.d/crossbuild-template.yml | 1 + .gitlab-ci.d/crossbuilds.yml | 2 ++ .gitlab-ci.d/custom-runners.yml | 1 + .gitlab-ci.d/opensbi.yml | 1 + 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index a6cfe9be97..d90bd6419f 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -29,6 +29,7 @@ # rebuilding all the object files we skip in the artifacts .native_build_artifact_template: artifacts: + when: on_success expire_in: 2 days paths: - build @@ -57,6 +58,7 @@ extends: .common_test_job_template artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + when: always expire_in: 7 days paths: - build/meson-logs/testlog.txt @@ -72,7 +74,7 @@ policy: pull-push artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - when: on_failure + when: always expire_in: 7 days paths: - build/tests/results/latest/results.xml diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index bb3650a51c..0bb5cd56f9 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -462,6 +462,7 @@ gcov: coverage: /^\s*lines:\s*\d+.\d+\%/ artifacts: name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA} + when: on_success expire_in: 2 days reports: coverage_report: @@ -587,6 +588,7 @@ pages: - make -C build install DESTDIR=3D$(pwd)/temp-install - mv temp-install/usr/local/share/doc/qemu/* public/ artifacts: + when: on_success paths: - public variables: diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild= -template.yml index 4f93b9e4e5..a7e34e0145 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -55,6 +55,7 @@ .cross_test_artifacts: artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + when: always expire_in: 7 days paths: - build/meson-logs/testlog.txt diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 61b8ac86ee..ee4c1b74d9 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -161,6 +161,7 @@ cross-win32-system: CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu microblazeel-softmmu mips64el-softmmu nios2-softmmu artifacts: + when: on_success paths: - build/qemu-setup*.exe =20 @@ -176,6 +177,7 @@ cross-win64-system: or1k-softmmu rx-softmmu sh4eb-softmmu sparc64-soft= mmu tricore-softmmu xtensaeb-softmmu artifacts: + when: on_success paths: - build/qemu-setup*.exe =20 diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.= yml index 34a1e6f327..a0aef96a07 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -20,6 +20,7 @@ variables: artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" expire_in: 7 days + when: always paths: - build/meson-logs/testlog.txt reports: diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 9a651465d8..867e34c19f 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -65,6 +65,7 @@ build-opensbi: stage: build needs: ['docker-opensbi'] artifacts: + when: on_success paths: # 'artifacts.zip' will contains the following files: - pc-bios/opensbi-riscv32-generic-fw_dynamic.bin - pc-bios/opensbi-riscv64-generic-fw_dynamic.bin --=20 2.39.2 From nobody Sat May 18 14:25:19 2024 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=1684426942; cv=none; d=zohomail.com; s=zohoarc; b=GEWbETEqpuxH9EeSl0S2BwT1XUgHiZykrDsurzOtYDXUoM5iZZmI5WX8snf1DSQ6gkilr3ur/0IfBUfhykzGhkwC3bN40u80e7x3RGy8em5weK+HXTMKXB5CqxaQXCF4zlDfN0NsO8CcUAZBDxno+cBS0IXRowOuhWgi7BFNGbU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684426942; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hUHrMn9cHBXK2gE6B1hvICEMAHPwsKhO8NPg/jbojk0=; b=LMFPvJvYlWz3vRxnoeDTsqMzSeYySO/o+cqWq3qGgv2ddGZvoZXSGODU1fEvDYvEciXdJMC/Bbmi/Ycz1AM8GvrAQhZc+vhHCEH9ejtvjHuOQybprEd/PeAhsuYq8Rly8Wp4kH4NJ3/t2gisO6KQAWrxJ5BIJxMbb0alJ+YB1go= 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 1684426942143746.4380673847145; Thu, 18 May 2023 09:22:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzgN1-0007em-CE; Thu, 18 May 2023 12:20:51 -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 1pzgMq-0007Yr-Oj for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:41 -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 1pzgMo-0006OB-0j for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:40 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3f423521b10so15098505e9.0 for ; Thu, 18 May 2023 09:20:36 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l6-20020adffe86000000b0030785b864f1sm2584903wrr.65.2023.05.18.09.20.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 09:20:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 74FBC1FFBD; Thu, 18 May 2023 17:20:34 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684426835; x=1687018835; 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=hUHrMn9cHBXK2gE6B1hvICEMAHPwsKhO8NPg/jbojk0=; b=s/xYoGYQLNBKdPs/URM7DgxnbxBSBHILWBSzglW2qySsRm1uhDh1Q2PPIV0dmz8yvw ErfVDbV6f7sdM7UPp6HX4BeXz490hJbAmEsXMVXjkswuYC10IDdB9NSO7P/SvHvDclP5 vJ1cy39cBWWpfrCivpS7qt0jcySp8p7YukOmzRNBWH9lg7f9OA6CYGoJ3lEjUy0PjfFT 73gmXoHyaVih0NVFM83Jl0E7U/mkjxEURqq+93xHzGpYsafxDk+8bDR/waGcNbXClevo 9fgK7LKfnVS8rR4LGua/GzzsIx53W2OqqR3DDGIWIVSiGSDUQbS1fyrPrUhzwMJOVahl A/dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684426835; x=1687018835; 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=hUHrMn9cHBXK2gE6B1hvICEMAHPwsKhO8NPg/jbojk0=; b=ZOixQjZah9vz9d28BbbLTDNjQHgcNd+jQF4q59QHmRmyZRn/HsDq6z2Q3hGzAxeZO2 8qRkYReW3oLd5J6Fine1mPrIhnItFeCiP4eir4bSuelIvwZnoDUi9hXrdXSQouqiY37F Uwo1dRIAm9cFI54H84b2xr8mXwD8Fc5IZxLUkI/n3xbQskKhItTQ6b53Rl6iNrc3wz8J dFrWj6gG8/Kjc2dpx5QlzPHw1WXUK0CSzVWn+ggJGpBwUuRrmVeOCCrFg11TgKeE3+T6 D9cZ+leyQOBAZg2bngn3p3rTPY8CFoFfU9Pchg5vRK9qwHEFs2iY3Vo0Gphmobk0ynEG IbrQ== X-Gm-Message-State: AC+VfDzpJs7JpL0uiFwdTvQlqVHnptTZGyV7JBAyHJ3MZlRrdzeX7C+k p3HP/mKuIRUAFxgtrVB+0wDkUg== X-Google-Smtp-Source: ACHHUZ7T8IW+mrriobVTIhLRLxfJLDcKXLN8MGL0PfLg82NwLWtQqMKZt55iAUfAfgnHXCH6/u5nbw== X-Received: by 2002:a05:6000:181:b0:306:2c16:8359 with SMTP id p1-20020a056000018100b003062c168359mr1979126wrx.39.1684426835417; Thu, 18 May 2023 09:20:35 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , Richard Henderson , Peter Maydell , Thomas Huth , John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Mark Cave-Ayland , Wainer dos Santos Moschetta , Cleber Rosa , Beraldo Leal Subject: [PATCH 2/8] gitlab: ensure coverage job also publishes meson log Date: Thu, 18 May 2023 17:20:28 +0100 Message-Id: <20230518162034.1277885-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230518162034.1277885-1-alex.bennee@linaro.org> References: <20230518162034.1277885-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, T_SCC_BODY_TEXT_LINE=-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: 1684426944030100003 From: Daniel P. Berrang=C3=A9 The coverage job wants to publish a coverage report on success, but the tests might fail and in that case we need the meson logs for debugging. Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20230503145535.91325-3-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- .gitlab-ci.d/buildtest.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 0bb5cd56f9..b6390e3562 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -462,9 +462,12 @@ gcov: coverage: /^\s*lines:\s*\d+.\d+\%/ artifacts: name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA} - when: on_success + when: always expire_in: 2 days + paths: + - build/meson-logs/testlog.txt reports: + junit: build/meson-logs/testlog.junit.xml coverage_report: coverage_format: cobertura path: build/coverage.xml --=20 2.39.2 From nobody Sat May 18 14:25:19 2024 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=1684426911; cv=none; d=zohomail.com; s=zohoarc; b=RpInZTmCRDpLiLMlIn5RRH8WdHvjWk4DOVe6+0d7PdluK6APgIVu0/XxjRhzuFERNd5+B/VnGf1oigXGap5aTBdvB212ahVZetVmYdJZHLRuTaWOvWWAvl64vhYX+4sI44LGPJKxMpHRMnSqhN8IZnufAMI4u8Myr2A+dph2lBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684426911; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hn+zKX2ZU5kJ7IFfmWrHts4Msqz+nCT2HShGHhdqu5E=; b=TDwkYqepJjqY/kvGLv01f5fqZfL027rLZVPqAEWbnCJIWQWDyhgLHcih56ovWav4VNg7FouqbPibCbB/eyzAs1Mfn3iNkD+HQqFULNwwxgJe0ACiTNuXLswhjQ3CafDv38Fa7RDAObQkm//2JS+3GbGqsz8cQmI5hKdCQNPCR1w= 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 1684426911218840.8362077035658; Thu, 18 May 2023 09:21:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzgMw-0007bf-Fl; Thu, 18 May 2023 12:20:46 -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 1pzgMr-0007Yw-0n for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:41 -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 1pzgMo-0006OS-Lu for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:40 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f423ac6e2dso15006815e9.2 for ; Thu, 18 May 2023 09:20:37 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id q18-20020a5d61d2000000b003079c402762sm2634267wrv.19.2023.05.18.09.20.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 09:20:35 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8BC471FFBE; Thu, 18 May 2023 17:20:34 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684426836; x=1687018836; 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=hn+zKX2ZU5kJ7IFfmWrHts4Msqz+nCT2HShGHhdqu5E=; b=PVY9M8FFvBQzKOxMngZxYlBngSF8TKBY70X94t0LWOykD0FMMQhpgMIc9yqSkjT0r8 egkIiyo+PWznWBc0uz/e/GGK0Ra0LwIx6rHAwknGCIDlpdhTg0tlRLMfWRLyupdJpgL6 ZLvEkpdB4uViqcpdu+Z36dhYayROG/2EZPAGloE+5AW54n8X+KBt1EgWXY0nI6shvLk3 SHNEjBLC8NV1hBrHdCqm18TWCL7z7Q8nRuEO2XnR52Ae/D8z82ZjXr94o/LaCb6gv9Tf gCGTRV3N1L/AVfu54uzgbX05NCAfWhnXtUF8RzAeozOrJLM53OFC9OLPaJbCUMFn2T4e b1QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684426836; x=1687018836; 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=hn+zKX2ZU5kJ7IFfmWrHts4Msqz+nCT2HShGHhdqu5E=; b=hXtIlBWDATPEPW68RIKzmZLNPkwfyM8WtrHCsOKvJmZ2huYAKEjncYNP+Dzugej180 8yKzaJmQsNbU+NFnvUpljZ8aLWKsEOngZv+IKoKwMhNDTZ9gIk99b1uoF1RhYjZSgpSf xbT8I/Y22+8RNWCObPPVFLUvD7CHJjdvp/R7FYB8cgF76f1v2h340iuMaUhhJHVQJ75Y 0y+hPvbctTGPVFzKXxtliBYlhocDGWjOXUuNSt+tZDfasARCwllgHn/EARL2AEcypp1B Z4dh0VJibDNUnGG7fysHNC9KPk00ZxZj5foPjnSxjSLuLsADD8fiWCewNpjt/YumKgtr tTdQ== X-Gm-Message-State: AC+VfDxfbU6gZu1ivUFDxMcBjougj2BZIiMReK5O41A1Mw4FRgwhuLuL 8L2EJOVZjq7kGbBPbWx8pTFa1TY4FcTyldMkXYianw== X-Google-Smtp-Source: ACHHUZ47EwLfiIf78/APLnPtdRxV697QarkvPGswTFmoIySQt2U04ywhAmYsTa7EnOEApqeXghZ2Vw== X-Received: by 2002:a5d:4988:0:b0:309:4289:91c9 with SMTP id r8-20020a5d4988000000b00309428991c9mr1882856wrq.17.1684426836297; Thu, 18 May 2023 09:20:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , Richard Henderson , Peter Maydell , Thomas Huth , John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Mark Cave-Ayland , Wainer dos Santos Moschetta , Cleber Rosa , Ani Sinha , Beraldo Leal Subject: [PATCH 3/8] docs/devel: remind developers to run CI container pipeline when updating images Date: Thu, 18 May 2023 17:20:29 +0100 Message-Id: <20230518162034.1277885-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230518162034.1277885-1-alex.bennee@linaro.org> References: <20230518162034.1277885-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, T_SCC_BODY_TEXT_LINE=-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: 1684426912546100008 From: Ani Sinha When new dependencies and packages are added to containers, its important to run CI container generation pipelines on gitlab to make sure that there are= no obvious conflicts between packages that are being added and those that are already present. Running CI container pipelines will make sure that there a= re no such breakages before we commit the change updating the containers. Add a line in the documentation reminding developers to run the pipeline before submitting the change. It will also ease the life of the maintainers. Signed-off-by: Ani Sinha Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20230506072012.10350-1-anisinha@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- docs/devel/testing.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 203facb417..8f18052ba7 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -485,6 +485,12 @@ first to contribute the mapping to the ``libvirt-ci`` = project: `CI `__ documentation page on how to trigger gitlab CI pipelines on your change. =20 + * Please also trigger gitlab container generation pipelines on your change + for as many OS distros as practical to make sure that there are no + obvious breakages when adding the new pre-requisite. Please see + `CI `__ documentation + page on how to trigger gitlab CI pipelines on your change. + For enterprise distros that default to old, end-of-life versions of the Python runtime, QEMU uses a separate set of mappings that work with more recent versions. These can be found in ``tests/lcitool/mappings.yml``. --=20 2.39.2 From nobody Sat May 18 14:25:19 2024 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=1684426911; cv=none; d=zohomail.com; s=zohoarc; b=hn8Vun8jPNzGIx5A/hOVg0bmqMRJ7pylauS+VU9xa16CJJhxpigTzbcGypiRnz7akeEKv9xgNlTuZEsJxo+lYhsfigX20Q7KPMp9O6M3zk64kpT9ffwdnLfSJn6j7epKM6+nxt0vOD3/gNuva21uD22Xe5N1U7heO6cOTQ3pQAI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684426911; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PVJqmD25uEtI8Z7J+wAFRXP/lIYUW4MU+2fPvwiFZvM=; b=eYQTrwihBpLh/EEfrgZl+QwcD5jk8FhtsVCqrS9kX4UzBu2kkKyVdD0+hwrpZZHH9TLR/wZbufgr7rKeoJDbtaAQx7NVPpdBMYUfmMTtqxLNLOffHoA5vvlMjKMUgcKLn0jIKAK/9weFLgzq6x4CbFE3QJ68ioLzXd9ut3JMqtY= 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 1684426911170403.27287108591963; Thu, 18 May 2023 09:21:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzgMy-0007bs-DI; Thu, 18 May 2023 12:20:48 -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 1pzgMr-0007Zg-JS for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:41 -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 1pzgMp-0006OY-5f for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:41 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3f4271185daso21732595e9.2 for ; Thu, 18 May 2023 09:20:37 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id q20-20020a1cf314000000b003f508777e33sm5778363wmq.3.2023.05.18.09.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 09:20:35 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A469A1FFBF; Thu, 18 May 2023 17:20:34 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684426836; x=1687018836; 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=PVJqmD25uEtI8Z7J+wAFRXP/lIYUW4MU+2fPvwiFZvM=; b=Zq7fqYuChQO7D06RWNepdR7m3V/b1nwbJASqfFJ3AOvLcbq/qZYCnh8UkC1I6wr8mg pEgO54GE1wlwWUJYcloLW3qn3nH1gGKzWw1SqQgZRMnqO2iuhaF5WxFSKSyrrhIc0piq oVk9gmcR1YRgC0Smqswjcbm5/w21ui/I7w33ofMLA643bwBNwQ6JYRqHJkttflmxpygO F7HdvDsb+UMUTdu6vbZdbxhlh87J52SNTw+CXFWemDLoKfBwGzteOfmdtrb7apx/UnSL ++Tmwl74hiqjzQUt1zOaBGGirOZOdJXT46ZVEYrpjtr27Bre9Dgtz9hdNq+mJVhaJiRu TWDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684426836; x=1687018836; 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=PVJqmD25uEtI8Z7J+wAFRXP/lIYUW4MU+2fPvwiFZvM=; b=Ct4rlLN9Q2hr1zIgFzpFzpAZjIWBj/miLInR0KCeNXIxJeF+wpbWIbC7q61QiJM5wc Vl4RrNwgmGB89KdtKSdJJhnM23xfWQNimj8S85dsjKevfR++8w20inOj3dxFrCESMm4n +7gbxj6itZZRmL06MPoEXs5q92uYMYErUs9SZk77MJ1T6r/xhVeA3smhTvb5RdFTNykd nPHZCDKCTEy+f8DNHwTyvAuUK8PnkvOMCfMTIpFAsAvV4FIBpKUapJQQ40/XNy2CHLKe 6DHO34PfOu220j8ASSujJxP3uy+S1qZSWDy/QwQSGyor2uT0O+bsb6NeLaUwI26UB2QF Ps5w== X-Gm-Message-State: AC+VfDxZqz4s1UAMxWKOisTPG3sz71nNcaihqVQExUdVq3Z/PuKCn5Lb bGB7sD6NIhjsg+lbLHVI4W+fSQ== X-Google-Smtp-Source: ACHHUZ6i68aN+6OYhBVPzVkQdlWc7jm6TMmkl83wgaSY4BisUti/9m2ZUx8Eiq+5jA0yxY2rfFeAaQ== X-Received: by 2002:a05:600c:216:b0:3f4:2255:8608 with SMTP id 22-20020a05600c021600b003f422558608mr1905990wmi.31.1684426836513; Thu, 18 May 2023 09:20:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , Richard Henderson , Peter Maydell , Thomas Huth , John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Mark Cave-Ayland , Wainer dos Santos Moschetta , Cleber Rosa Subject: [PATCH 4/8] accel/tcg: Fix append_mem_cb Date: Thu, 18 May 2023 17:20:30 +0100 Message-Id: <20230518162034.1277885-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230518162034.1277885-1-alex.bennee@linaro.org> References: <20230518162034.1277885-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, T_SCC_BODY_TEXT_LINE=-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: 1684426911856100002 From: Richard Henderson In fcdab382c8b9 we removed a tcg_gen_extu_tl_i64 from gen_empty_mem_cb, and failed to adjust the associated copy, leading to a failed assert. Fixes: fcdab382c8b9 ("accel/tcg: Widen plugin_gen_empty_mem_callback to i64= ") Signed-off-by: Richard Henderson Message-Id: <20230518145813.2940745-1-richard.henderson@linaro.org> Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e Signed-off-by: Alex Benn=C3=A9e --- accel/tcg/plugin-gen.c | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 34be1b940c..5b73a39ce5 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -254,33 +254,6 @@ static TCGOp *copy_op(TCGOp **begin_op, TCGOp *op, TCG= Opcode opc) return op; } =20 -static TCGOp *copy_extu_i32_i64(TCGOp **begin_op, TCGOp *op) -{ - if (TCG_TARGET_REG_BITS =3D=3D 32) { - /* mov_i32 */ - op =3D copy_op(begin_op, op, INDEX_op_mov_i32); - /* mov_i32 w/ $0 */ - op =3D copy_op(begin_op, op, INDEX_op_mov_i32); - } else { - /* extu_i32_i64 */ - op =3D copy_op(begin_op, op, INDEX_op_extu_i32_i64); - } - return op; -} - -static TCGOp *copy_mov_i64(TCGOp **begin_op, TCGOp *op) -{ - if (TCG_TARGET_REG_BITS =3D=3D 32) { - /* 2x mov_i32 */ - op =3D copy_op(begin_op, op, INDEX_op_mov_i32); - op =3D copy_op(begin_op, op, INDEX_op_mov_i32); - } else { - /* mov_i64 */ - op =3D copy_op(begin_op, op, INDEX_op_mov_i64); - } - return op; -} - static TCGOp *copy_const_ptr(TCGOp **begin_op, TCGOp *op, void *ptr) { if (UINTPTR_MAX =3D=3D UINT32_MAX) { @@ -295,18 +268,6 @@ static TCGOp *copy_const_ptr(TCGOp **begin_op, TCGOp *= op, void *ptr) return op; } =20 -static TCGOp *copy_extu_tl_i64(TCGOp **begin_op, TCGOp *op) -{ - if (TARGET_LONG_BITS =3D=3D 32) { - /* extu_i32_i64 */ - op =3D copy_extu_i32_i64(begin_op, op); - } else { - /* mov_i64 */ - op =3D copy_mov_i64(begin_op, op); - } - return op; -} - static TCGOp *copy_ld_i64(TCGOp **begin_op, TCGOp *op) { if (TCG_TARGET_REG_BITS =3D=3D 32) { @@ -451,9 +412,6 @@ static TCGOp *append_mem_cb(const struct qemu_plugin_dy= n_cb *cb, tcg_debug_assert(begin_op && begin_op->opc =3D=3D INDEX_op_ld_i32); } =20 - /* extu_tl_i64 */ - op =3D copy_extu_tl_i64(&begin_op, op); - if (type =3D=3D PLUGIN_GEN_CB_MEM) { /* call */ op =3D copy_call(&begin_op, op, HELPER(plugin_vcpu_mem_cb), --=20 2.39.2 From nobody Sat May 18 14:25:19 2024 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=1684426943; cv=none; d=zohomail.com; s=zohoarc; b=eDcwnf+7R75W2Y2BgjIHF8uQ+kK5pN6gxR4RrL+9ZlnYbrrOVbDb0rFtPpILB8V97bYF8p68xBHoUVDZkdTSd9oc9p/vVMlLj6l/F08+fvP4J1JTwsThj+IU0LinLczzwFjofQUpx6/PhlwNBISL8KuB7yx7r+rxTAhBTxCOSjA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684426943; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9WUqhetdgE59J23w7OMYoxJNBVAN+y7zryiCeyC7VBI=; b=XGot1HMga1lCxvUGdp8SnzK2q34RXq20nYw+yW7ThYQ8n6P5JyXUVi6NmlQgNeMBBh4vJ8+K8caHewZXLAINfoS6+zQamyU/UhGJPt+WowqNk+Q+KjW7trFGwvwK8IiH+hYKsLDsgiMQ/GDxIe5eiFJEyAfaLYm9dzOTvwqFpP0= 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 1684426943278486.1879425992513; Thu, 18 May 2023 09:22:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzgMz-0007dt-2K; Thu, 18 May 2023 12:20:49 -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 1pzgMq-0007Yu-Qa for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20: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 1pzgMo-0006OZ-MN for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:40 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f42d937d61so21650905e9.3 for ; Thu, 18 May 2023 09:20:37 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k4-20020a7bc404000000b003f4e3ed98ffsm2469032wmi.35.2023.05.18.09.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 09:20:35 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BCCA31FFC0; Thu, 18 May 2023 17:20:34 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684426836; x=1687018836; 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=9WUqhetdgE59J23w7OMYoxJNBVAN+y7zryiCeyC7VBI=; b=Qau3oOcjErE/jFx+eo+rc5cuzF3WT7T8Df+bZQMtDy/Q3Q95S+POVsea/xwygBkx7+ EfcrVXiS4ZYrNhkbSYVwjJGZChFmOEqmaACJGH/+2EJM2Qcgvehr4C2JTQ4/jCj4WpRZ j6Qfm293ITNKu+67scqBsbXLh2RJYcmpzYiXuEy7abCP6ip7ZepJ33ityp6mEjF+3pba xJ7ZymEkENc9R8yjonEF0aMHjJia1/NIPuhe12mg3GEXD29rzia9tgq5W9utrtBDVz1I c0gUYsNdPuuXAVXWB0AGT4wZWNIT/XZ6FbXh3gYdlNkDAKUhQxTFNX0fCCQvGoxcngb/ 6S/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684426836; x=1687018836; 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=9WUqhetdgE59J23w7OMYoxJNBVAN+y7zryiCeyC7VBI=; b=kEGCAYl2YOTHuAtumKCfEEnpQEceLeWttG9IcWyo3cLrCqgzl5H8sGsAoimRlLPUoN cpuuDXKZnG16RsUMq9Gyc9fxla3hTpoN3H7fyhK8LO9iAvN2OJNIHeAwo83r8JpWpJx3 f8uHMrGWOcTUuuJ5vj58n+2DUZKitvsE3Y4TkqNtvr2zlQy13D18lnyN8+HKejkLRXO/ T4XPJVig0N6YwvTt6vYjNmKhhAfOhMSEVQJ5hXjE04pD7eFBvjaiAQ7GBLPReUcItdUZ 6eDRAw0goUXEvaxw48UvJuB3JTKkvLXmHLyhl90sRkCrT+EOUyvIjgyKAKjGBDVogo3G e9gg== X-Gm-Message-State: AC+VfDygSKL1PGW8x6D5RljIuZKIHauH7Ra+pYSPvenzw0dfx/vOZHk9 3pnaX0RtEVTB46LG7WnKnCbE1Ee+pepa8BHkdG0Nyg== X-Google-Smtp-Source: ACHHUZ6osZgSqE8MF0AwbM/1x6NmhaAqX1XmmVm1Wr94PE5xf9DLLevWDPE89YQov5ahW+Fd8XcOMQ== X-Received: by 2002:a7b:c012:0:b0:3f3:468d:d017 with SMTP id c18-20020a7bc012000000b003f3468dd017mr2055206wmb.6.1684426836713; Thu, 18 May 2023 09:20:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , Richard Henderson , Peter Maydell , Thomas Huth , John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Mark Cave-Ayland , Wainer dos Santos Moschetta , Cleber Rosa Subject: [PATCH 5/8] tests/tcg: add mechanism to handle plugin arguments Date: Thu, 18 May 2023 17:20:31 +0100 Message-Id: <20230518162034.1277885-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230518162034.1277885-1-alex.bennee@linaro.org> References: <20230518162034.1277885-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, T_SCC_BODY_TEXT_LINE=-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: 1684426944417100005 We recently missed a regression that should have been picked up by check-tcg. This was because the libmem plugin is effectively a NOP if the user doesn't specify the type to use. Rather than changing the default behaviour add an additional expansion so we can take this into account in future. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- tests/tcg/Makefile.target | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 72876cc84e..2462c26000 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -169,13 +169,17 @@ extract-plugin =3D $(wordlist 2, 2, $(subst -with-, ,= $1)) =20 RUN_TESTS+=3D$(EXTRA_RUNS) =20 +# Some plugins need additional arguments above the default to fully +# exercise things. We can define them on a per-test basis here. +run-plugin-%-with-libmem.so: PLUGIN_ARGS=3D$(COMMA)inline=3Dtrue$(COMMA)ca= llback=3Dtrue + ifeq ($(filter %-softmmu, $(TARGET)),) run-%: % $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<) =20 run-plugin-%: $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ - -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ + -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@)$(PLUGIN_ARGS) \ -d plugin -D $*.pout \ $(call strip-plugin,$<)) else @@ -189,7 +193,7 @@ run-plugin-%: $(call run-test, $@, \ $(QEMU) -monitor none -display none \ -chardev file$(COMMA)path=3D$@.out$(COMMA)id=3Doutput \ - -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ + -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@)$(PLUGIN_ARGS) \ -d plugin -D $*.pout \ $(QEMU_OPTS) $(call strip-plugin,$<)) endif --=20 2.39.2 From nobody Sat May 18 14:25:19 2024 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=1684426911; cv=none; d=zohomail.com; s=zohoarc; b=Yqzb0vRkw69QV7ZCbKHTaIAy77Ghj2qeAMs3lDS5V1V+SiYcRrvkpo4Sz03wg9Q3OaH5ThC2E5pTkV+U0QP4gIJCuqAjS+oTFoniZ/Scak6sxsB0KNDmv/PQIpNKkDk0wrHyCF4OGlx2lfYnTXPdbxKEm3rcrAfG6wWCXL2L7/w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684426911; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cvrSe/0m52GzDnMMDzRQNC/FD8LWFpadN65cq2Wt+xM=; b=RaC2lWZgzmJl1Jm5zyz2GA237971R3bFAMfACWX5fWSrVlmKRCvYnEl37puTBkthOIfUU/diay5XpOPVZrbYuazg5CqqJGTqELxXQzR57Tj/8Kc2UbnQaTbG5cFNMon83HEA0iI26F8bGmdCfbMf1orQa7Xy+vBWnANpwRXWhcw= 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 1684426911244662.7214541500184; Thu, 18 May 2023 09:21:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzgMw-0007bh-Ib; Thu, 18 May 2023 12:20:46 -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 1pzgMq-0007Ys-P1 for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:41 -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 1pzgMo-0006Oj-Qe for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:40 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3f49bf0223cso21787265e9.1 for ; Thu, 18 May 2023 09:20:38 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k4-20020a7bc404000000b003f4e3ed98ffsm2469035wmi.35.2023.05.18.09.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 09:20:35 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D45471FFC1; Thu, 18 May 2023 17:20:34 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684426837; x=1687018837; 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=cvrSe/0m52GzDnMMDzRQNC/FD8LWFpadN65cq2Wt+xM=; b=XYHaabGYmEmFFCX/TZMC/qaCzxN0WXe0y5/GLkSDjp+S/J2qo6RHchB8MQtf1WOwSZ 1sDx/fWRTCmwAMVA683FXLqBIxlSEw1pU8/z/NrC/NGguiPskVbhgHlWQbV38w3xbLyO 3nA2NKXu1vMqh+ri6f1NKYwCDqzp+7cvSbIuet5sPDRQz6JIp+CYhVcgXMGBo46657W+ cJ8GU5evua0LYcKLjU6Cw4VRUP8hWf7+Ovy96/3fXLtXYZSDUYjj9vDdwCDe4K/Pr2KA KOV5XbRLSIxZ3e9GHJhKBPStEaVXzpCEFmiSCX4GiUhZeP8erle/bTk9XJURL/7bplyK gxWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684426837; x=1687018837; 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=cvrSe/0m52GzDnMMDzRQNC/FD8LWFpadN65cq2Wt+xM=; b=PRMuBoXkC6iW1B8pME5GNpVcO3nFO7RksETbgvlyxU3A/5PeEsE6m5mtev0h3gm9rH sg6fVsCE4EXiD/2j6rHnvDTDqzAkKX1pwokwKhAuG2GuEXtva5PCdm9jNcR0YTYcalJC IXs4C9IJ7GlEH3Oc/UFWFTXnLqhPuc4JZO9vFXkMDG7IR5DHkOg1M1zNFoLc0Ygv88hM fzLqVluqddvX0KSiCgkaAAFRM6ew8ZKLLofteg2Ns3ahr8Q1z9ylpYbvHfxPk86Hhj5G 3X97eerzkgiDh+IYJbtUPQoGMaWcpBh7ryi4Gbz05pH729R6yQV4ve2vc8aoCvCo73Nm Xe6w== X-Gm-Message-State: AC+VfDw1AskG/ha+w78ioLGMCKjPyd3doy4qPb4bM1UvuUiBlqQ3IjQo v5ac1xyhI1I7AGyNrK8l7HRIQA== X-Google-Smtp-Source: ACHHUZ6J41kHPPTne+ps/6asonsn+xzIbd+JvD9UFL8yFVMlgVwovSiNInmNIxH8YZOF0YvSDlYAAw== X-Received: by 2002:a7b:c3cd:0:b0:3f4:271a:8aaf with SMTP id t13-20020a7bc3cd000000b003f4271a8aafmr1913348wmj.38.1684426837535; Thu, 18 May 2023 09:20:37 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , Richard Henderson , Peter Maydell , Thomas Huth , John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Mark Cave-Ayland , Wainer dos Santos Moschetta , Cleber Rosa , Beraldo Leal Subject: [PATCH 6/8] tests/avocado: move guest output to "avocado" namespace Date: Thu, 18 May 2023 17:20:32 +0100 Message-Id: <20230518162034.1277885-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230518162034.1277885-1-alex.bennee@linaro.org> References: <20230518162034.1277885-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, T_SCC_BODY_TEXT_LINE=-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: 1684426911843100001 It has been noted that console logs have disappeared since the update to the latest avocado. This seems to fix it. Signed-off-by: Alex Benn=C3=A9e --- tests/avocado/avocado_qemu/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index 33090903f1..b19f797b7b 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -138,7 +138,7 @@ def _console_interaction(test, success_message, failure= _message, if vm is None: vm =3D test.vm console =3D vm.console_socket.makefile(mode=3D'rb', encoding=3D'utf-8') - console_logger =3D logging.getLogger('console') + console_logger =3D logging.getLogger('avocado.guest.console') while True: if send_string: vm.console_socket.sendall(send_string.encode()) @@ -407,7 +407,7 @@ class LinuxSSHMixIn: """Contains utility methods for interacting with a guest via SSH.""" =20 def ssh_connect(self, username, credential, credential_is_key=3DTrue): - self.ssh_logger =3D logging.getLogger('ssh') + self.ssh_logger =3D logging.getLogger('avocado.guest.ssh') res =3D self.vm.command('human-monitor-command', command_line=3D'info usernet') port =3D get_info_usernet_hostfwd_port(res) --=20 2.39.2 From nobody Sat May 18 14:25:19 2024 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=1684426911; cv=none; d=zohomail.com; s=zohoarc; b=fgFyW/EnUBRD2Cxj/UQphT6C45DmZkl2JryinvMWLtwdsySbBvycOqz46CRCqGh4oradLpJDmGmfWTB48fyzx/3bHl7KfmhugDtkSNAxcC/rVXIC1gZedM6v/7OJ9mGh0AsyQCeI9TqZpwvxeRr5LOu+gVLQ0U1wDzRehYzzhao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684426911; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ayogSVxfSVQQQYdBMAOZ/LyoRWO3sdpvhi1wrumi/gQ=; b=gUEdCsKAesT0zV+zjBw0JMQl7uAcyeOiTgNHZVnB0lT9qpVLnVCPD2hvfKc0EYf0YKZ+jlHYeDxOLHVgrUz1q6pKOHfNHpso4GGpyNLpaEJzMylPmkCXJeJ/KZNoqU6sz6faCaw69eAOpJVcg2H5AvFieY+NpA5dt+sbl2is/SA= 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 1684426911132238.5139148783868; Thu, 18 May 2023 09:21:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzgN0-0007eU-R2; Thu, 18 May 2023 12:20:51 -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 1pzgMs-0007a5-AV for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:43 -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 1pzgMp-0006Oy-VD for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:42 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3f417ea5252so15823155e9.0 for ; Thu, 18 May 2023 09:20:39 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 2-20020a05600c22c200b003f4e8530696sm2472658wmg.46.2023.05.18.09.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 09:20:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EE6341FFC2; Thu, 18 May 2023 17:20:34 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684426838; x=1687018838; 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=ayogSVxfSVQQQYdBMAOZ/LyoRWO3sdpvhi1wrumi/gQ=; b=rdB9tHepLa5T84QRfVWA+TvRBaMa0nNcNZspgXLRiaT+Seqe1WXZJfI2cVg1+rvF3D ZyvJAOjhY0/wmt8XeVF5BghlF6sZXB4b1vWY/jw5Mjx/FUf72rPDKBr0v6mb2qmXbXcj Ea15BZOrFOfuC3NpKvU9YrzkTfEnQoG7x5mxBxVKDMO6ybkWEXPyNrkoGzNRTkssKCV3 EaO92MK0PsiKSDJd+X+hJYxy1XCjLs99uaS6ClwAvjPGxbr+HgHXDzT93iE0u0WBZTDe LMUtXLam5+FeWJ8s0t8pvl1/SBx5eCbP1HJfBf/GT8pZ5QI4glBepwjjlUY9e1eCrRRi mXtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684426838; x=1687018838; 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=ayogSVxfSVQQQYdBMAOZ/LyoRWO3sdpvhi1wrumi/gQ=; b=f+Im7QH3y2TFd73dcToTyYcdL1xdnFrRxo4gpmXXG5OFEcU7KumSU1c/4J3XDZ2NrL IScqoFi2kIMZtRKJ+NVwFqj0FEx6/6NPQAlMl60Kf0A/+sO6KblrQMqqCXkDmrquJZ0n AHyOCpKLGhmW7OlqroMA4XqZmZM5s9EkmEvQa3OOSLg4+0P95x9gIQOq5jB9xWyV88IR IE6KaA6nKewCe+/0FZ1q/ujO9KEY4Z2N85N6dlQgF+WqevVnvzGCOMC9U/6ZoHl5f0gU HEWNu8vBASLCZTtg5+tEOxHCOVDTNu3lF9ArcrqcRrUzhwFuH68XCnXs5CWxf83HnOi0 H1ZA== X-Gm-Message-State: AC+VfDzzlQZzAG27kRFRtQD7VFgYgDmaIwnCEPq4Y0hly3kJTOv7NOb5 C/dU+cZHxUV+/DRCNm8zuwHkIg== X-Google-Smtp-Source: ACHHUZ6zJuqITLf763wgz0CVaqG2ZnvEU4wi+Z2UYemlS2423c3xMSdM1jU+jHB3rHn/sNzTnqLcsg== X-Received: by 2002:a1c:7906:0:b0:3f4:253b:92b3 with SMTP id l6-20020a1c7906000000b003f4253b92b3mr1857874wme.18.1684426838667; Thu, 18 May 2023 09:20:38 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , Richard Henderson , Peter Maydell , Thomas Huth , John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Mark Cave-Ayland , Wainer dos Santos Moschetta , Cleber Rosa , Beraldo Leal Subject: [PATCH 7/8] python/qemu: allow avocado to set logging name space Date: Thu, 18 May 2023 17:20:33 +0100 Message-Id: <20230518162034.1277885-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230518162034.1277885-1-alex.bennee@linaro.org> References: <20230518162034.1277885-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, T_SCC_BODY_TEXT_LINE=-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: 1684426911867100003 Since the update to the latest version Avocado only automatically collects logging under the avocado name space. Tweak the QEMUMachine class to allow avocado to bring logging under its name space. This also allows useful tricks like: ./avocado --show avocado.qemu.machine run path/to/test if you want to quickly get the machine invocation out of a test without searching deeply through the logs. Signed-off-by: Alex Benn=C3=A9e --- python/qemu/machine/machine.py | 42 ++++++++++++++------------ tests/avocado/avocado_qemu/__init__.py | 3 +- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index e57c254484..402b9a0df9 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -49,10 +49,6 @@ =20 from . import console_socket =20 - -LOG =3D logging.getLogger(__name__) - - class QEMUMachineError(Exception): """ Exception called when an error in QEMUMachine happens. @@ -131,6 +127,7 @@ def __init__(self, drain_console: bool =3D False, console_log: Optional[str] =3D None, log_dir: Optional[str] =3D None, + log_namespace: Optional[str] =3D None, qmp_timer: Optional[float] =3D 30): ''' Initialize a QEMUMachine @@ -164,6 +161,11 @@ def __init__(self, self._sock_dir =3D sock_dir self._log_dir =3D log_dir =20 + if log_namespace: + self.log =3D logging.getLogger(log_namespace) + else: + self.log =3D logging.getLogger(__name__) + self._monitor_address =3D monitor_address =20 self._console_log_path =3D console_log @@ -382,11 +384,11 @@ def _post_shutdown(self) -> None: Called to cleanup the VM instance after the process has exited. May also be called after a failed launch. """ - LOG.debug("Cleaning up after VM process") + self.log.debug("Cleaning up after VM process") try: self._close_qmp_connection() except Exception as err: # pylint: disable=3Dbroad-except - LOG.warning( + self.log.warning( "Exception closing QMP connection: %s", str(err) if str(err) else type(err).__name__ ) @@ -414,7 +416,7 @@ def _post_shutdown(self) -> None: command =3D ' '.join(self._qemu_full_args) else: command =3D '' - LOG.warning(msg, -int(exitcode), command) + self.log.warning(msg, -int(exitcode), command) =20 self._quit_issued =3D False self._user_killed =3D False @@ -458,7 +460,7 @@ def _launch(self) -> None: Launch the VM and establish a QMP connection """ self._pre_launch() - LOG.debug('VM launch command: %r', ' '.join(self._qemu_full_args)) + self.log.debug('VM launch command: %r', ' '.join(self._qemu_full_a= rgs)) =20 # Cleaning up of this subprocess is guaranteed by _do_shutdown. # pylint: disable=3Dconsider-using-with @@ -507,7 +509,7 @@ def _early_cleanup(self) -> None: # for QEMU to exit, while QEMU is waiting for the socket to # become writable. if self._console_socket is not None: - LOG.debug("Closing console socket") + self.log.debug("Closing console socket") self._console_socket.close() self._console_socket =3D None =20 @@ -518,7 +520,7 @@ def _hard_shutdown(self) -> None: :raise subprocess.Timeout: When timeout is exceeds 60 seconds waiting for the QEMU process to terminate. """ - LOG.debug("Performing hard shutdown") + self.log.debug("Performing hard shutdown") self._early_cleanup() self._subp.kill() self._subp.wait(timeout=3D60) @@ -535,17 +537,17 @@ def _soft_shutdown(self, timeout: Optional[int]) -> N= one: :raise subprocess.TimeoutExpired: When timeout is exceeded waiting= for the QEMU process to terminate. """ - LOG.debug("Attempting graceful termination") + self.log.debug("Attempting graceful termination") =20 self._early_cleanup() =20 if self._quit_issued: - LOG.debug( + self.log.debug( "Anticipating QEMU termination due to prior 'quit' command= , " "or explicit call to wait()" ) else: - LOG.debug("Politely asking QEMU to terminate") + self.log.debug("Politely asking QEMU to terminate") =20 if self._qmp_connection: try: @@ -557,14 +559,14 @@ def _soft_shutdown(self, timeout: Optional[int]) -> N= one: # Regardless, we want to quiesce the connection. self._close_qmp_connection() elif not self._quit_issued: - LOG.debug( + self.log.debug( "Not anticipating QEMU quit and no QMP connection present,= " "issuing SIGTERM" ) self._subp.terminate() =20 # May raise subprocess.TimeoutExpired - LOG.debug( + self.log.debug( "Waiting (timeout=3D%s) for QEMU process (pid=3D%s) to termina= te", timeout, self._subp.pid ) @@ -586,9 +588,9 @@ def _do_shutdown(self, timeout: Optional[int]) -> None: self._soft_shutdown(timeout) except Exception as exc: if isinstance(exc, subprocess.TimeoutExpired): - LOG.debug("Timed out waiting for QEMU process to exit") - LOG.debug("Graceful shutdown failed", exc_info=3DTrue) - LOG.debug("Falling back to hard shutdown") + self.log.debug("Timed out waiting for QEMU process to exit= ") + self.log.debug("Graceful shutdown failed", exc_info=3DTrue) + self.log.debug("Falling back to hard shutdown") self._hard_shutdown() raise AbnormalShutdown("Could not perform graceful shutdown") \ from exc @@ -611,9 +613,9 @@ def shutdown(self, if not self._launched: return =20 - LOG.debug("Shutting down VM appliance; timeout=3D%s", timeout) + self.log.debug("Shutting down VM appliance; timeout=3D%s", timeout) if hard: - LOG.debug("Caller requests immediate termination of QEMU proce= ss.") + self.log.debug("Caller requests immediate termination of QEMU = process.") =20 try: if hard: diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index b19f797b7b..d925573299 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -322,7 +322,8 @@ def require_multiprocess(self): def _new_vm(self, name, *args): self._sd =3D tempfile.TemporaryDirectory(prefix=3D"qemu_") vm =3D QEMUMachine(self.qemu_bin, base_temp_dir=3Dself.workdir, - sock_dir=3Dself._sd.name, log_dir=3Dself.logdir) + sock_dir=3Dself._sd.name, log_dir=3Dself.logdir, + log_namespace=3D"avocado.qemu.machine") self.log.debug('QEMUMachine "%s" created', name) self.log.debug('QEMUMachine "%s" temp_dir: %s', name, vm.temp_dir) self.log.debug('QEMUMachine "%s" log_dir: %s', name, vm.log_dir) --=20 2.39.2 From nobody Sat May 18 14:25:19 2024 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=1684426918; cv=none; d=zohomail.com; s=zohoarc; b=n17nII30YPKDbXNC//z3eW2VX2bFIJRA1tOyp4ZwX2inJWn4hX/3l90WMEX9pNil/N8GGtrIxRS5C00ptUCA0QhDYE0jE+atBSkBVnIONOlX4ZwOUZBeVFFtGle7jK17cek3JDV+ulucHvaI+P4Hp/yn6LC1iD2RNDVCgZs1m2U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684426918; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=t9bOCy8hfslLOFUbFXGRnstMdv8Rmiyu6+GL3b7wJvQ=; b=DndN7hJAP4/YFmjR3m1UUsJKj+89Bf9eLlJeTFEXS4wf723GzsFt+NOu941KCTt66cIw0i4Y0CQ2MXAl74rP5ycE3IYOAvmDwQAkRYIDEPFLHK7ppo/WsHsRnspXhujTVK5qWPnU8CBohJ0xId0LZCg3XIfMKrkep2EenaxZnd0= 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 1684426918392304.00003775355947; Thu, 18 May 2023 09:21:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzgMz-0007du-3J; Thu, 18 May 2023 12:20:49 -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 1pzgMs-0007a4-2x for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:43 -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 1pzgMp-0006Oo-Db for qemu-devel@nongnu.org; Thu, 18 May 2023 12:20:41 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3f423ac6e2dso15007015e9.2 for ; Thu, 18 May 2023 09:20:39 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id g23-20020a7bc4d7000000b003f4290720cbsm2477307wmk.29.2023.05.18.09.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 09:20:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 11D371FFBB; Thu, 18 May 2023 17:20:35 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684426838; x=1687018838; 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=t9bOCy8hfslLOFUbFXGRnstMdv8Rmiyu6+GL3b7wJvQ=; b=Sf9UO7H/kY0lxXEeBowCMMlrjC81mkfrexk2c2Iu7Tzo1adQSi5nhwPNUVrjiALdwB VjSvzHND6xbyjgWnzHoa2hlvFRZ+3H41vtyfD0RhNDMMxLCds/eHEZULe/QslIgG1+BA OGI2OhsG83leqpV7RVCRA54C9QUH1T8ca6dDIAuID8SRL8rdJm3DnXNPLMwxLQ5Gq+yt KaLYoMmhOQrTlBfg+e3eVEy/WNTWp93VRBp54IDZ/y9u3u8HFPk4veNGJmjRGtM9PbO4 Zs5gquLMxJb4IR97EV2jLfciODpNwYGS10CSBJb/toFux7bH2bPHpG5CJrKAqZA+znWe Axrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684426838; x=1687018838; 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=t9bOCy8hfslLOFUbFXGRnstMdv8Rmiyu6+GL3b7wJvQ=; b=lQjhzDFmibxRxtVkp8z1A7BIccfgr6X4wG6jXLzdMLeaOMO+vvHV0geNnMnoT1ahx/ MVkr3TYga40kg4AwNoO4T+tfXzKJ1IJSXFvE+Ov46vMVN83/wXPEcjqnGe1gfphdNBdv 7jGw7aFVtxHTeXRh9+1aKzsSEG78WZuGZ9ascSjIfS9OeXJXu3G/cPtFcbOyaKrE3/n9 vpkZ4OVgU6xuUVy5WqFR3FLN2yEakbCldHGh6j6kqO3tA2pdBqTj0ZdAzGml/Xt9pRNO 0y1utRCelvj3iINehLso4vkTzEkmaRXgKky5FollNoy03Vafs7z157IqlLtKD5CH2FMf A5cw== X-Gm-Message-State: AC+VfDw7uPO3+g+lCRNQmqdMAX5N8gkpKNlKJjJo1V6mfCOpbkHJ4Pjs yN6OAfyT9zUIgH8Xz1w3art55A== X-Google-Smtp-Source: ACHHUZ5niRyCRrdvz48kXHl2VLwfv8iEXJaLiFeFbRaEOUVxJQiRFd++xhRIZhzAuRjVoi16COBDkg== X-Received: by 2002:a7b:cd8c:0:b0:3f4:27d5:a6dc with SMTP id y12-20020a7bcd8c000000b003f427d5a6dcmr1988921wmj.31.1684426837950; Thu, 18 May 2023 09:20:37 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , Richard Henderson , Peter Maydell , Thomas Huth , John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Mark Cave-Ayland , Wainer dos Santos Moschetta , Cleber Rosa , Beraldo Leal Subject: [PATCH 8/8] docs: add some documentation on avocado logging Date: Thu, 18 May 2023 17:20:34 +0100 Message-Id: <20230518162034.1277885-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230518162034.1277885-1-alex.bennee@linaro.org> References: <20230518162034.1277885-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, T_SCC_BODY_TEXT_LINE=-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: 1684426920335100003 While we have fixed the logging to go under the avocado name space we might as well mention the useful "--show" option and the streams you can use it on. Signed-off-by: Alex Benn=C3=A9e --- docs/devel/testing.rst | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 8f18052ba7..77402a0daf 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -983,6 +983,31 @@ of Avocado or ``make check-avocado``, and can also be = queried using: =20 tests/venv/bin/avocado list tests/avocado =20 +Logs +^^^^ + +Avocado collects anything logged under the 'avocado.*' name space in +the log files for a given run. You can also use the ``--show`` option +to dump selected logging streams directly to stdout: + + .. code:: + + tests/venv/bin/avocado --show avocado.qemu.machine run tests/avocado/$T= ESTFILE:$TESTCLASS.$TESTNAME + +There are a number of useful streams you can select. + +.. list-table:: Avocado Logging Streams + :header-rows: 1 + + * - Stream Name + - Contents + * - avocado.qemu.machine + - VM lifecycle including the launch command + * - avocado.guest.console + - Serial console interactions + * - avocado.guest.ssh + - ssh interactions + Manual Installation ~~~~~~~~~~~~~~~~~~~ =20 --=20 2.39.2