From patchwork Fri Jun 23 12:20:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695237 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1920347wrm; Fri, 23 Jun 2023 05:23:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4EbmoHvxSZRKxe2AFnJcbns9a/zTTIgWzfRp1+ffkmdOu1ExQwbBdRToh6Aq7C17iPN51R X-Received: by 2002:a05:622a:244:b0:400:813b:2274 with SMTP id c4-20020a05622a024400b00400813b2274mr3807493qtx.15.1687523000999; Fri, 23 Jun 2023 05:23:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523000; cv=none; d=google.com; s=arc-20160816; b=oeaJNXgSvyXRuYOIduTFufhRHeq/0ggBsiVmD2l1FhmckJVShdBCeuxCcOYvSglaVF 4sJsrj5fKn5d3OWhhU0bey0DGoIejhKmqomTMql0HM27F6JA77FtWVmkgGWpA2/aX7ej PAdMDZxnx6L/oMn6X8LPetTWvJLhUew0yLvFxad/QsHbTVFiz55DqQvJ+7fYJc2WBaLA FkqXOlJLuWckA22d+boXWVG2QQZRCHN30wAkSh55tuWrnsQJ5N8zEMboeO+Og7hhx4aB Fun8IeSwkx14vER+mgwnrSM7wyp2UKgYscFLYLCmw1DJjen6oi7dcWHewiaGswE1zmXJ EQ0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=14XP3klDtGmdL/A+tboDM4nxojyBPPw/sAoLndlO5fo=; b=W5wMef6/JJs7YXacESL0jOyUNTCPB7UhS7WTaDOlmkQZZVF3Dut1A2a6ytVeAyfTQC mqemOAh+094ABkLXP/PjVCA2hxGAkiAng0T7TFb7+PbUTLJME3N75jOE+3INngyhYOke 3edb1RP1nOULB4DI51LD508eEp63f3OQYyTaC1pEdKfz6nYq+peuWL/mP500SVa4oCKN 9qP7mP16l5simKbHU3U8wzr06iPZivDPWs66PJJfpm2T0rIb6zx9hfjJt86cyhFA7DFL W2DVklnSauBBZrnRWLKpcZ6HmnP1P7YBEMkjnNwk2tqbbA1mTkVLPdKkwazpRwR4mxFh aUyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i9zsfYZB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m7-20020ac85b07000000b003f7fc2a94f6si3486308qtw.491.2023.06.23.05.23.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:23:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i9zsfYZB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfoF-0005Yk-VV; Fri, 23 Jun 2023 08:22:40 -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 1qCfmo-0003kY-Pt for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:12 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfmh-0003fz-Jd for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:06 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-31121494630so674757f8f.3 for ; Fri, 23 Jun 2023 05:21:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522861; x=1690114861; 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=14XP3klDtGmdL/A+tboDM4nxojyBPPw/sAoLndlO5fo=; b=i9zsfYZBvIzgFeP7qxWS5QB0nDa5FDAmiHdxir0lZclnW+GiJDK/e/GCA5rmXGI9av Gq6DSAT1KjnpNPryWxmtRMPaKHsgkAxZUViK5Mz1UTEZ5yg7l5b371nOiAdl/8AhTT4L AL/YnJ9mCBFwm6HXZ9HPgsEC2HX398ENBQQVIbvix4ijBf+1+v+ftVIPz/WQUSWTwh4p X0ahuSZEhjNEz6GHMFoqg6saytYp75p8UeRW6prRA8hy5J1XIx8EOfxBZHwUNrGP0/U4 epQetrfP1SmCQBl0Yv6wJY8iZga1LOqplEN7OR104iQZojDAwOnf4Onwawmi0XXP8viJ PbRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522861; x=1690114861; 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=14XP3klDtGmdL/A+tboDM4nxojyBPPw/sAoLndlO5fo=; b=OaYjY8jwossUcrePVax8wmdR2q6QoeAcS9Hv4KXhJvV7aZ+yUTayxTgrVJqNtbi1BY 5MHsrXFfzfwBcWI9gkDeOjohXlwnwvLEATK704k9vDnYS7tgUl4W+N61t7D1+g//ieWQ /e1EQZ+Sxrf3BZPv4BWN/MAoDNlRmf+fJJDBsgxNURUx529N4iPJLYqeprafvAhThzaC C4XafijKvXOHWS+bQdbbdjBg2KfFVLs/8KCZvE31Bfkxv99WMNHSQ/gaTAiRim5/vmfd 5n0jPOjK1cS7B70wQgXLRrpPW+H7M12PTt1ifltgise+CqfTOqhkfPeTXvwEFI8UW+YM LjkA== X-Gm-Message-State: AC+VfDw6YI3LeXEWbSBYRdamjSLdGYcnPfbDrSmAiq2sfX+gbtjlHplB y+Q63Y1SBmF9UivIPfZzrocCiw== X-Received: by 2002:a5d:4909:0:b0:30f:bf71:501b with SMTP id x9-20020a5d4909000000b0030fbf71501bmr17891794wrq.61.1687522861500; Fri, 23 Jun 2023 05:21:01 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o11-20020a5d4a8b000000b0030fb828511csm9372613wrq.100.2023.06.23.05.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A82981FFBC; Fri, 23 Jun 2023 13:21:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 01/26] gitlab: explicit set artifacts publishing criteria Date: Fri, 23 Jun 2023 13:20:35 +0100 Message-Id: <20230623122100.1640995-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Daniel P. Berrangé 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é Message-Id: <20230503145535.91325-2-berrange@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- .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/opensbi.yml | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index 76ff1dfcb6..c1251e4805 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -25,6 +25,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 @@ -53,6 +54,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 @@ -68,7 +70,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 1922caf536..fcaa3869df 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=$(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 1e0e6c7f2c..34f9df2be9 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -169,6 +169,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 @@ -184,6 +185,7 @@ cross-win64-system: or1k-softmmu rx-softmmu sh4eb-softmmu sparc64-softmmu tricore-softmmu xtensaeb-softmmu artifacts: + when: on_success paths: - build/qemu-setup*.exe diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index b4d7eef688..fd293e6c31 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -63,6 +63,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 From patchwork Fri Jun 23 12:20:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695240 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1920537wrm; Fri, 23 Jun 2023 05:23:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6y5j1HsPeUuvOo6P4zJSkugiWegExzBB62V3XIuTapcUwX/g58LAKtxktjBKQjUwfdoJcC X-Received: by 2002:ad4:5ca6:0:b0:62d:f1ea:242f with SMTP id q6-20020ad45ca6000000b0062df1ea242fmr28491138qvh.6.1687523029205; Fri, 23 Jun 2023 05:23:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523029; cv=none; d=google.com; s=arc-20160816; b=Pf9uJU5Ifx8TjNJRCBDqoc0YyG7d7oi4dzdHtMBDfGGW8Q51+ooBiJo4jUc0ZTRrND QggscIPBPnCn8lz8BaGPphuxWiQoHNZhaWUllEkHT+T+ewlNcajhGhWCOsJZKgFFeWpv 8cvToKNLWKANTJgmY1WEbBR3psWP+/Mv1VtnIZkzenpFCFftJuWYUK63MsCqgmdGeznl rQTspLR973aSUTgKGc7342RvXVoRD5bVasc/vlGQbUO2eY0VJtbGl69KZ9drjUh3OAf6 0MYn/7cCGIEhqPqS0HAKZbInazxP6WRUQvrjzC3tV1/N+D/icZaqGp2VZkCqWmzku9Sj kxfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hazNgz+WePYWHkhh7hg5TUrtV6hneANQlKnUGSMVRh8=; b=pl087WXFF9pAtGuNAG6f4o1DK8Bl9KRJSorIiXTYRVKB6zNk/0F3eaIDnL3w3Kil+q xJU5uMmyZ4MXIWP3+g9V825Goe3j1i635rdS4gWcTGxl0MquG9ZgP0rYjj+rBqo6a6e+ oD5CpT/lE6pNynU7fhsDoJo74achaI41kWhycxqeZTZXrxAWdsnM34rjCn0SsCRo76K4 1Sh6mfxO0S26oL26VbM1wmAkWI5KdH+jcjiFIUZfqp3hwUOztbyDrrsfs82uNXe0Txmo qDESoK7/RZzMHeqnYv4JrFD2FojZ/3voB6wE3RIOvVKIb8B7d3k5VdoIWJM4sOx8bQ+0 NoQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JxY8Ckni; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 1-20020a0562140d4100b0063017dd53fbsi3561602qvr.372.2023.06.23.05.23.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:23:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JxY8Ckni; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfnk-0004DF-GP; Fri, 23 Jun 2023 08:22:09 -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 1qCfmo-0003ka-Q9 for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:12 -0400 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfmi-0003g4-1n for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:08 -0400 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-4f95bf5c493so643317e87.3 for ; Fri, 23 Jun 2023 05:21:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522862; x=1690114862; 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=hazNgz+WePYWHkhh7hg5TUrtV6hneANQlKnUGSMVRh8=; b=JxY8Ckni1IdB7XbgrIy88BRa58Vs8563Fik3dG7t6C/UfBb0UdyUKrQNaaMeIboIU4 FpOmqN84ZVLkUoRd/WC0lxt8kcwsKcwrHS5HkomLdtlCfzUPC/N0B9cheV/ZFNQEiAla /er2xFPQ0DXtsDfBN0+gN0ADZTAziKTLhdqyfdgHFMW/acUzOU3JjAq1NH/DPnhriNcu V5yse+9/PGXALqQ2s0M/+oJypCrRFKm50ZR6KdSGypSwxVwiCgYQJD7mf9PgrFq4bdfS KG7w9EU/e+9Oot+APY3aPRpVWTPhh3ySxD6HH4ZOl8/gYZV/6VH5Q3P7u4UykkE2GUxK X0cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522862; x=1690114862; 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=hazNgz+WePYWHkhh7hg5TUrtV6hneANQlKnUGSMVRh8=; b=I7cCc4VHSkNcac+ELFFPmtI8sjk5clbQaVqulmGp8IYWBEgZMBu+olrng6PiJsjoxX fXRrAWi9YAA/vbUWNaAPVAxkmfgdm8RKNLvu0iRK6al+fTRkdTMvs7sY6qPRozmMe7nZ W7oc+b5PpI40ykCqSR0XmuL4DTzuoFy6norGM3jeTucnwLDSITQ31k2aRSa//CQt+/AH atSRM0CEC7K41D1KXUEh+RPSylenED15KyOYJnGl+JuESGpXau5/E72FL7/ZaGzsUwmL bXjMv17rHSK+dCSUAr3pGFo7pUpeOc3PnuGu05OGiSr4R0FLGMGFBEnb/6E/O+yRAf9N +h4w== X-Gm-Message-State: AC+VfDxyI6J0M/v9MZKZZh7HnHrpQTrr80a/7UK6WMfXBEhmdoheMWZX LatWCThRUKTd8LNMRPWDSdNy9g== X-Received: by 2002:a19:8c01:0:b0:4f8:6d99:f4f3 with SMTP id o1-20020a198c01000000b004f86d99f4f3mr9499463lfd.52.1687522861765; Fri, 23 Jun 2023 05:21:01 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h11-20020a1ccc0b000000b003fa8158135esm17256wmb.11.2023.06.23.05.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C15FA1FFBD; Fri, 23 Jun 2023 13:21:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 02/26] gitlab: ensure coverage job also publishes meson log Date: Fri, 23 Jun 2023 13:20:36 +0100 Message-Id: <20230623122100.1640995-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::136; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x136.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Daniel P. Berrangé 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é Message-Id: <20230503145535.91325-3-berrange@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- .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 fcaa3869df..528c0c62aa 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 From patchwork Fri Jun 23 12:20:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695247 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1922333wrm; Fri, 23 Jun 2023 05:28:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7o9QDl4vwc451CJ9vWt1Wa9jKhzWPEz0ZD6qGGe+KRqxoZECmVW2cTQURgZr6kV7YmgTl+ X-Received: by 2002:a05:622a:652:b0:3f5:80b:4724 with SMTP id a18-20020a05622a065200b003f5080b4724mr14470544qtb.68.1687523293344; Fri, 23 Jun 2023 05:28:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523293; cv=none; d=google.com; s=arc-20160816; b=CrRs/oFAPDPGl6v8SupVmhMuwOHRdzARm5lSiyAzyVQ6f1eimZmJqFAOEjwLzc6x8p tVcS9ORWcpltNbB3pDrvonQ9svXwLID2gaI8Injoz4IabqEC4U2t3WpNoaLO01ugwK88 vn0m3Jzda4nrcI7QY7R/ULRNw9u5IYHIwjlvfGQ9ytycgJ86o6qgrWckPsbosFaOaK33 47VyI3xFo0/tYV418cB/jSBir2kv025jITLXwn1Raqd3VZaAHkyVSTYg+UVycPNJkVyE q+xVTlpDIlbN34R85GODZKgYOHR75EKTxrwsIEmBmyRK6yHrpbuTxy1tHNYITDYe0pQS 7eNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RypTNKe/MDUsJeYzEQqR1qusiXy4qha/WYTyqtQl3T0=; b=M4kmupyVoXN2pn0/+h1oK99U7GWu18K4j51B/7HjdosZN+pKB6z0eY2gaeXKjx9W0M C/4EkBMk3s9N81cfBWpI2RPuR80w0zVnYTqRCXXcqXRdX1ODPNLtFDAPDpHfJlZDEQLz +FWOAEc3/8o05F4fiLQ1gXY7CjaJX8wZCN3gOMFkx+Ted+De5hE8C9KpPli+sLOW5HDo alCou1OVSSi/NwAF4Q7YKzXiHKCVDoYnz2cbPwxcgDapZNJzpLWvyFU+e5JAXDWuKYnL Zy0jR4Z1nqcpMsHttZgyo+75W9G1beOazu8F2rO0eYWzRJt8QAXUvt4kCR80ggsCUMPE JmDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rifZLCwC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 21-20020ac84e95000000b0040083f1ab45si810444qtp.191.2023.06.23.05.28.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:28:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rifZLCwC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfnu-0004Rr-E4; Fri, 23 Jun 2023 08:22: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 1qCfmo-0003kd-Ri for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:12 -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 1qCfmh-0003gA-KU for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:07 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3112d202363so629885f8f.3 for ; Fri, 23 Jun 2023 05:21:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522862; x=1690114862; 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=RypTNKe/MDUsJeYzEQqR1qusiXy4qha/WYTyqtQl3T0=; b=rifZLCwCceGL2fsb7geP/LRhw0rxpMFKGT84yIYyBArTP2x/f3UTL2ZNTatXv4ASgp 4XCVzH4NBXr62O2ebTzxN/1PNFXHxn4iw8ZPb52RaFyYPMWqmqzwOKnOd3PR/DftnQg5 PP5Wwdswnpn9xLiCiDyEGM/9uYpNQxh+P/9aI+UPW/YJPf+if6n59OIoHS0Sq42sUCJ5 +Lc610OJfQYAuBgKVhqIOiWMue3vCm2dnAiW1HtMTJbpXj7Y/eUEbn8eyF5WnznEn593 XY1RiL4/W5iusOM4U0QN6+Xgjh0bHgT8VhWrSX3gD9+klkS3iIstPZTxfVExhqReUF34 vmow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522862; x=1690114862; 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=RypTNKe/MDUsJeYzEQqR1qusiXy4qha/WYTyqtQl3T0=; b=fS9SiVZvXEbVMA1egvBycpKJd/QjowjFsoA3R1E2pslkBNfAiZFjzZuc6zgxLaVIns PKM6odgwBMFezYk1r40mUYMlTH/LQXOh5hFZXHsGrBiWjna3jDBvH2ArL7kN+TUVo6Rj ahAYw8JG3WxpClfrqyYx+Xq8uhwA3etCggGtHqh16TxxFb6Grl3UUVI1RxxwrcWn+KGn 4vCUDmVzY3vqlM+jxq2y7Aon8QEDDZZCd4OHAf3ynlJecVoR6PoV1aCb4CCBg5Gu9Iqn YdDfmOjOym9Dd8Xc+uORM4DjeOR6FprtrXUegcpAuD3KnjQLl7VALGUA53mBuyURHZBL asUQ== X-Gm-Message-State: AC+VfDwCHty0KHfGN/mt+I+JjPOeVGr7YkC3QVoqpTulOe00j/KeYPTU e+zCPtDAbNLQVhW1bfV/MwRvrA== X-Received: by 2002:adf:e982:0:b0:30a:f3ca:17bb with SMTP id h2-20020adfe982000000b0030af3ca17bbmr14429858wrm.35.1687522861941; Fri, 23 Jun 2023 05:21:01 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k1-20020a5d66c1000000b003079c402762sm9533188wrw.19.2023.06.23.05.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D9F041FFBE; Fri, 23 Jun 2023 13:21:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 03/26] gitlab: reduce testing scope of check-gcov Date: Fri, 23 Jun 2023 13:20:37 +0100 Message-Id: <20230623122100.1640995-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This keeps timing out on gitlab due to some qtests taking a long time. As this is just ensuring the gcov machinery is working and not attempting to be comprehensive lets skip qtest in this run. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- .gitlab-ci.d/buildtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 528c0c62aa..dd5f11aa30 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -454,7 +454,7 @@ gcov: IMAGE: ubuntu2204 CONFIGURE_ARGS: --enable-gcov TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu - MAKE_CHECK_ARGS: check + MAKE_CHECK_ARGS: check-unit check-softfloat after_script: - cd build - gcovr --xml-pretty --exclude-unreachable-branches --print-summary From patchwork Fri Jun 23 12:20:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695230 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1919842wrm; Fri, 23 Jun 2023 05:22:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4iRU2AgOpwkOGTODMdeo0Va0RW4NSTCl7eQZCFL4WEx0LQdL46r07ct4iM8LT9KRK24GT6 X-Received: by 2002:a05:620a:448e:b0:75b:23a0:e7c9 with SMTP id x14-20020a05620a448e00b0075b23a0e7c9mr30646865qkp.42.1687522930519; Fri, 23 Jun 2023 05:22:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687522930; cv=none; d=google.com; s=arc-20160816; b=nYf39yRJMLCtSyjpaF4z+bnb2bZDmwwrSp3q8GAU1tsAIU1nfs4Bt5jZxqBKHTMz7M b0TNu09vrzD0ofgbm1Uv9nAHuptf5DGLQJqVC6GcNv/I7lZiuItwR7xaapt18aqQ2hGz aRMH6YbEWXHQQ/WlDhYTq22yDuSswqllY1+FBy39IojYfGN3WbkpJydzkGsZbYJsoJeI 6q0yQVnS2cJqA9HudRMzwyzmw4F6yg6LshUY1HO8RN7BSQNzkcMbO343xTXbrdldj1fJ s3j3ew6iNJdgpZ2RkN36CaVNgLBOOkuwBHK/s2aPC7XqBAtxKMavBkICtW7Sapa3sMh9 BLAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hn+zKX2ZU5kJ7IFfmWrHts4Msqz+nCT2HShGHhdqu5E=; b=kMRFEIQUEA7yev3+Qylr0ysAALsGidMB9l2DA+EvfQJrzpwlaKinuEmiBRsGtT7crd n6vAshiNqvvA9OjrWDZc8/GzC9xu5SoLhFV8pCI2VPYzIV9wz1F0ON0Ft7jfukCHiyQV ygRZaD/x5+4hQOgl2tXDQG8uM/zBsNj1Z2/pSzXmeAPXZqfdPOlAnISlZ7gdLeucJhVg dd0HXCs0nuMedV2HNRkEiRrpvUjyT8So3z6/yW4DFQNOUtez3fnj3tKhQinrRa9Ev4zI YAFY/1WpsKHEOopP4mZ4BU6q8VY6VF5NADCC5ITWrOTJZg29FSLKUFswAeN10g+VG6mL W9Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hb2QKjFK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f2-20020a05620a15a200b00759348adce5si3479217qkk.196.2023.06.23.05.22.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:22:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hb2QKjFK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfn7-0003pB-BH; Fri, 23 Jun 2023 08:21:33 -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 1qCfmo-0003kc-Ql for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:12 -0400 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfmi-0003gh-TU for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:09 -0400 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4f86e1bdce5so705351e87.3 for ; Fri, 23 Jun 2023 05:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522863; x=1690114863; 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=Hb2QKjFKhS6CN9UAy8Fe0sRyzyl/vX/Gp7kO8bmVn/wYbE3gmcd+RXla+ak7d2MQ8n yxgg/b6VDUyJyWviHD6V8y+G/5t47M0U/puuhb/nuyse2YJgtxCy5UL8jUzxcwAKy9b7 A4n8uBu+pCzauRTm0cWc9+xY4+ICvU43zTDqjGrKjK2Gqod96YRaOX5MYwFMBpx2qWe5 jZquzrgQ5+PSelCfZ8wGuD1Us1emqEo7w76BXMzeJsj5XD6wfWcvLoCEpivghayzj8RC xj4TERq4Us8g5803tFRnzjay6De0GPiRE2PYgOtfcBfCCc6TdEa6mjQB0WT/31LaZmUn aP5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522863; x=1690114863; 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=XGzb6CUht6JABhZKFbGrftYGrQr67cgtBjc9okXmG2LiGXH0Zw2CX6yqPRoO2Yrmet 7dAD7rl9mAgroYKCackKDwbCtMwayLQWxaTDegzkfQ0ZkJNrmtWOmtqokufwRWZNYZE1 /KPWDR8okEEzgGlctzHJZ0m2+3Df89K6jLP0I/1TSfoH0pF6o2Xtwj7Cc+Nw1ft+PYyX nTi16ChCAkRQjozpHUEGDz1c8uHO6T9CBqYHu16cVWkJWzX10NnTmddBHtfrdjDbSefv Z2nrI5DWbqlVN9PpXjrot2fP0sdCzTRzLWY4zfmnJJ2JRwT2yGJx4/y3iMgU0R0en1ZC F/rQ== X-Gm-Message-State: AC+VfDyHClucHcRErsf4DZSIwez68TgL4YLu0ysWrW5747yqb9qUeW/Z IPXJM+TB6o+wETCI26hlY/Mb5w== X-Received: by 2002:a19:791d:0:b0:4f8:6f40:4773 with SMTP id u29-20020a19791d000000b004f86f404773mr9242977lfc.7.1687522862905; Fri, 23 Jun 2023 05:21:02 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id r11-20020a5d498b000000b00307a86a4bcesm9415759wrq.35.2023.06.23.05.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F41251FFBF; Fri, 23 Jun 2023 13:21:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= , Ani Sinha Subject: [PATCH 04/26] docs/devel: remind developers to run CI container pipeline when updating images Date: Fri, 23 Jun 2023 13:20:38 +0100 Message-Id: <20230623122100.1640995-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::132; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x132.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: 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 are 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é Message-Id: <20230506072012.10350-1-anisinha@redhat.com> Signed-off-by: Alex Bennée --- 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. + * 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``. From patchwork Fri Jun 23 12:20:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695244 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1920816wrm; Fri, 23 Jun 2023 05:24:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7VooFsjf3lRVlEf+es7zIQG8Jv7qGZlGSQdXjyx5/LM0CnqO58yAIzbOX5g/cE7hgQoXrJ X-Received: by 2002:ac8:5a46:0:b0:3ff:3110:bb5e with SMTP id o6-20020ac85a46000000b003ff3110bb5emr10764664qta.30.1687523070734; Fri, 23 Jun 2023 05:24:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523070; cv=none; d=google.com; s=arc-20160816; b=K51pfdyu87X5EM2G5fvuXF+Re/Hmikg2F320JUjL0u2iDYZEiZxmZim7S5ealAaXUe /eiEiDZcl6qx6czblNuACyc2cRE0s4GXjammx+iPQK1mxIh1k1AKJUcQHBmHAIMfy5GO jKXVGmFm+OaVLmI8MnkQIyaqDbGMuHVLkqwlITMrZhRgW3UxUmCGW7IWTIXGzFq6fQzV rA9oMgh3lqbflagqFRjMnjaD8VSFRbg9TSvb8TLfS1v29zKYs4MbGqoP5zE5m4pqWTF/ 1aYh8aIHFUBIGBb5iEoNtXcreBldzSQib8/yQlONco9Rcn/nIiCqHhF/uBiPHq7XJR6a qsfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9WUqhetdgE59J23w7OMYoxJNBVAN+y7zryiCeyC7VBI=; b=w5sHkGPb3afL24yeuEpf636MbzlkCvcqCIZluipDhWzO0fycVQZGKYr5WrZz6NWwZI WVL+lgngQug326TYcfgfCAUvifOGI+HsF7knyY3KEtzSs3V0cWiumGky0jubSMEClc1U H4vBS6dHhAFA/H6U9gin6gf7NQmFBNOzBSZiQU1GLs7hwLTJC+SBMkg9WjF6epnHKwPq X/e+cBoRM8KKhQU96PuRuZgjbfg1EgY99sVl/kOdfA1vDFi6DEtUYjg5YWj9xRVjQEUW gLSO9WrO8dDhST1klqRGR0gTk4NAbqGlDEFoYI/2CdpScLjuyRlAnXTtiKQ6mbHpunzL 4OTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D73HOrWI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d13-20020ac85d8d000000b003ef65640a4fsi3505561qtx.800.2023.06.23.05.24.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:24:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D73HOrWI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfoU-0006an-7k; Fri, 23 Jun 2023 08:22:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCfmo-0003kZ-Q1 for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:12 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfmi-0003gr-Ma for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:08 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3110ab7110aso620325f8f.3 for ; Fri, 23 Jun 2023 05:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522863; x=1690114863; 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=D73HOrWIhu2fC33oVmavdY6FdQfU+/K8O3x/sgrLpX75NeP8frQHts37plDdIVkd2r g2clhRovLNOt+yEWxGzMRc3O1sPT500lBJkcDbJmQ1RZkHgEC9GFYvdzhD3oKuo/efiT jZpDc87AlSwVEofLyIi40DYx1ZcJJKmNRX/ZFGWhb3iJ9kOPvckhl7E4+c7dxK2pp8Uz UexrErdhQvBOJm479WjTZOm1by+n+SQqnak5E0aDOnO0F8sqC61Z2aCSOmweBp/pWMQC phR91XCZODHtrImQ47Va3OdBiLPgQK51+N1PhC3lwSMQEA//nqkZahNSzq1RMCzXFPB8 YzMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522863; x=1690114863; 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=bUnj1Dwba6QTL2CbCnxcn5xv74dzcwMHflsiXGhwN5Vc1lv2cOcevU1QxzW6sNObqb 5ws5ldkdAxL5O1Smk7u5WuQWAPZEj2Z3kHzcB3ttrqW5EBALmzbnAptqVbfruj08G5ci CwZEhITzySGefF1XKmbfKhiGUKysBsS2VpYufnDBSAUJ14fxQXJsiwG0YRMyDUDcW7I6 NyOx+ubcf1Ndjg3hoWFdzdYLo3Rj4ki5GIxZpgPl/XB9wNcGDPxRLL7pjOz7Dr+uRBdE DObHceECskBijgv/T/UwlpwLS5Spls2ROcKCrNMVd8NUA7EcswBAK2t42hBcOqEVEWln ORKQ== X-Gm-Message-State: AC+VfDxMnWV4CYZy1WFitIU3oFrQrbcpI5kfSV+uG4W+9nkgRoMFTh1h 5+DntTnkZrYYu2DjMvULsj4VSw== X-Received: by 2002:adf:f244:0:b0:309:4999:7549 with SMTP id b4-20020adff244000000b0030949997549mr16063793wrp.46.1687522863349; Fri, 23 Jun 2023 05:21:03 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id y16-20020adfd090000000b003110dc7f408sm9389685wrh.41.2023.06.23.05.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1A50E1FFC0; Fri, 23 Jun 2023 13:21:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 05/26] tests/tcg: add mechanism to handle plugin arguments Date: Fri, 23 Jun 2023 13:20:39 +0100 Message-Id: <20230623122100.1640995-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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ée 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 = $(wordlist 2, 2, $(subst -with-, ,$1)) RUN_TESTS+=$(EXTRA_RUNS) +# 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=$(COMMA)inline=true$(COMMA)callback=true + ifeq ($(filter %-softmmu, $(TARGET)),) run-%: % $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<) 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=$@.out$(COMMA)id=output \ - -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ + -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@)$(PLUGIN_ARGS) \ -d plugin -D $*.pout \ $(QEMU_OPTS) $(call strip-plugin,$<)) endif From patchwork Fri Jun 23 12:20:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695235 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1920193wrm; Fri, 23 Jun 2023 05:22:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4d0JiSjVmgGj7P/9fbPRgxltw6fsm7dOOonwcdchBjL0mUuFUxtOgVT7wLouvogKhJYjW/ X-Received: by 2002:a05:622a:1703:b0:400:8e0e:e657 with SMTP id h3-20020a05622a170300b004008e0ee657mr1081659qtk.40.1687522977117; Fri, 23 Jun 2023 05:22:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687522977; cv=none; d=google.com; s=arc-20160816; b=ZPg1Xj4lg7eFHgB+0bfDymesMzSRCFRWG3pHea8NA1G9wCV+xbB/nMIKn83Lfn1MN6 JjStHp87wWXToKpYDVRIEtFx7rNoES74wAInZC/D5FzQq15JUcHKJZRR3ry1mQiSbqkX nbD5IjadmMpM8LICQnE0hUNd7tLXWuS/f0LTk9GAi2WP4wJgKmQmB2i0fc9hUgF7DWV5 aSh4/MivvlnDK5kEU5R8jMublmbh45JNUG6z0w7zL1NpvaCk51AxR9B+r+g6olKCvEmu kgWroKJU8I51tHD0O0tYAfs2r6p/JCAWY66Ubd4KvQW4ztN/WyzOetNfeMvfnuUUajJo 4uvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FoyMsMYVxFV6o67+0YaZUwlfroq/Nmrav1p8dT4axmo=; b=u/t0QtYVyoN4skSdgpUvgGi0XzkPQjFzv489s6PTmzfxuGire4yiN9wPfgc2JIBVZ2 14lBNjsItfR/r7c01Lo7Kv//yYqwUXfw+TomtN3VmmjwzLyknKpcXFc7/V18RjwSU7pd GOYVdwA/RJB5826DC6GhV1jto4AT8Tbbr/owukdwutg5EyHhRw24IXPvqanwxU3gajaz v+83ZuNDkhbC8L8i7RUJ+qtZteP3T60v5extirqwRbY8pd3ksfP2Nyw5smZHQ0v3eqiD yTCDHkPehWYVXysNnD/s1KuzVa94JyeN3auL/miGGfIyJqJoJYRHigURrsA7TU+tqoug EDKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rkmJhJvb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o11-20020a05622a044b00b003fde363ad68si3581165qtx.741.2023.06.23.05.22.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:22:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rkmJhJvb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfoQ-00065m-8C; Fri, 23 Jun 2023 08:22:50 -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 1qCfn3-0003pT-Nt for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:27 -0400 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfmp-0003gz-V5 for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:20 -0400 Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-4f4b2bc1565so725650e87.2 for ; Fri, 23 Jun 2023 05:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522863; x=1690114863; 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=FoyMsMYVxFV6o67+0YaZUwlfroq/Nmrav1p8dT4axmo=; b=rkmJhJvbLfSBkC6UZiSc4YpDplSh9i5qRgkDdZtpEHreHswl0y/Er9rCKE9zGXUgUp 58GgPUN0VMbZ3CQiLFzmHzwsvKQ0jevIw+tQbXJydKSXOJONbHm2PCU0nyZ2nuMy1SxF PgTZLpd/m/3SRFF3BaZLtraTM8N5lfvRBpM0W8h94CXWi4vAh5CZB0ApXtLabH20j8Gt 6b48w6SJQGCefb01W9njZMq5MPPn+wbscqEadXPavNC46KEnF1bQAaFV7SEQ17qk4tED oGiwFuptxwAU2jIewsxkuEQ+xjW91r85fAmXz5M8P7BwHbZFsTdBQsx+L+JpyQ4dHiwQ Cl4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522863; x=1690114863; 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=FoyMsMYVxFV6o67+0YaZUwlfroq/Nmrav1p8dT4axmo=; b=Phw3RFNPvTenTnSxBk77g4IT0d9vpTgt4lA+1GPIq6+xi1ZtG2g9inhQf3A0OFbWr6 enNiC+n0IHkTilqmwKDQMNZolG1zbUwlAZzeWs3AlpIuGAUDvdGLD4udBA0Cq3Nd7g8x 9xI7agq4MvzPJYaHvidHpCeG3TzUqTK/SD74Gs83OaojKbbagvXO+7dBdFc8GSTjM1D/ Mh40DdyrzyTp7DxH539PfhjEiaZemASSGJITMR8ntnQ/jZLYUegqs/0PS8qKc3fhXi7V bVob4wTfmrhsh7gWJLlyAA2TQ6rjBAQExQNG79l2abyOLqLzjw1wOWPbURp8EeLAg+uG ROVg== X-Gm-Message-State: AC+VfDzHnj1JXUqOiOwxSSxv5a0N73vfta1Ws8iWlimC879lniAezDk0 8VHuMQf55NO7Is/p3TxQb/rhwg== X-Received: by 2002:a19:6404:0:b0:4f8:680a:68f8 with SMTP id y4-20020a196404000000b004f8680a68f8mr9713154lfb.41.1687522863762; Fri, 23 Jun 2023 05:21:03 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id d11-20020a05600c3acb00b003f7f475c3bcsm4073048wms.1.2023.06.23.05.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3191B1FFC1; Fri, 23 Jun 2023 13:21:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 06/26] qemu-keymap: use modern name for Arabic keymap Date: Fri, 23 Jun 2023 13:20:40 +0100 Message-Id: <20230623122100.1640995-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::134; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x134.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The very old compatibility alias of "ar" has been removed from more modern versions of keymap. Lets move with the times. Signed-off-by: Alex Bennée --- pc-bios/keymaps/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index bff3083313..0bd8ce0077 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -1,5 +1,5 @@ keymaps = { - 'ar': '-l ar', + 'ar': '-l ara', 'bepo': '-l fr -v dvorak', 'cz': '-l cz', 'da': '-l dk', From patchwork Fri Jun 23 12:20:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695233 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1920034wrm; Fri, 23 Jun 2023 05:22:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4MEK69c4au/qKUWyxnhl5UUchhPM/MvWjtQN0RS3XpfyOcyJHMZXDv/GUNzqzc3k6hUPni X-Received: by 2002:a05:622a:1a1d:b0:3f3:96c9:b071 with SMTP id f29-20020a05622a1a1d00b003f396c9b071mr18256602qtb.26.1687522958913; Fri, 23 Jun 2023 05:22:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687522958; cv=none; d=google.com; s=arc-20160816; b=YtJLcheGcID1K8hqShJj3InFUYD0Qob8+TgJ9Avqs+0ESi9F/ZBHZaA63y2ETxIMfh yS5XV/n+EzyMg7Owo6GPxJO3YP2m7HihIvJotjRYlfhGoO95QEgZX/PYwxVCRT0/QGZZ QShh6GiJnqJGoNQivoICU0oN3rIqkRkYz2mGrfFJM21M+XOqHeSjvyxr/N9LfYI2EJot bEVv7MfxOO19GqU3tNBUd0zbMKPtIAPyfghUXJYnmdisNA3wDnpA36JMT6xmXMthz6CA SEkbbekyEdqXnEq+k2vDvD05DMzFvErbSUyc98D+/T7LhrvMu1ouav50rXGE6dOdBWjc 5EUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UiwEwjAi6lomr9E2iVsjR5pQJHgLNYXOTgd+ktx/cfE=; b=Csd8x8b8JQxXNlhl8t3narQOAxMt53MYJH2rlTp0ggzsMm1b8VvoJOwBZXs+rxBNlS L/6yBm2gIuIONDbDP4QULomARjVPt1ZofNWG4QazEw8iR9ez6OQsD7ghpHroOsru8NaW GjqBsh2tqZ2BKvY3GEptCp266lRFvzCEjAJvLWi71LAztLSRuEHPB4bnpRib52sa6CsE EshFuSzrTi95Q4/aHgzDFBJB5bTAgzP1wPyi66pc63vG9x4sKCHENy4zcnNsQpbY2Z2/ WdNFmYgTB7qBSW5LTuQ3hSbUkqTOGNXLcv1jlTPSFDS5Xf3Lw4dEP4ZhT3DEIrsOQFER KQRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="u4t/Tgi8"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n22-20020a05622a11d600b003f4f5bfe7a3si3632380qtk.31.2023.06.23.05.22.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:22:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="u4t/Tgi8"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfo0-0004Vt-R4; Fri, 23 Jun 2023 08:22: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 1qCfmv-0003oA-K5 for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:18 -0400 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfmo-0003hO-Hj for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:15 -0400 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-4f870247d6aso706492e87.0 for ; Fri, 23 Jun 2023 05:21:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522864; x=1690114864; 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=UiwEwjAi6lomr9E2iVsjR5pQJHgLNYXOTgd+ktx/cfE=; b=u4t/Tgi8JNEuzIancjMufZUWhxuNov8a4Y93qN9/0qphNFe21QqNLKzQykIBIlUZvo bVB9HvJT6CgfPh7M1SaClNkKi8buyRlhhUXAxJpKYUbk1LF6hUApYb77S1rSRV/Yu6Xb vAScRVQU5irjrkcB2TtZotE3taJDDXgFzlTZvXgzKv42PbOKBs9mFN2yo+Z8kPWiEdQw TZbVH2vmk4b9ymnZ8FU/+DniKH9TURSyNaICHiZstfNzi0u2Wp2unPPD90lZMDtQs0CK AMIIt2OMRZP0ZIpO6Us2oVpZl0nM3WxqHlDM7E7l1B4txjhBrf0jhmvYWTch8mxeZXwK ZQbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522864; x=1690114864; 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=UiwEwjAi6lomr9E2iVsjR5pQJHgLNYXOTgd+ktx/cfE=; b=ai2Aq9biaspCO8GQ7THcF5vWNydviZJvaTeznlteJ5zHTkBk4JKuwxOcx1q2neKM+a ko9JT5ZIOzRt6qER1NFkYEYP6eQhh1F/VkA0bk73b0rgPhROkr2E9MCImR1V5Hv3QqRt zE6JhEx3U6PjpFifG3n4v3TLv6il7rgieji9y4QxtIastRkou4DKaL/DT3qqPSMxZG2N muOx/YPu1QdQvC9ED4LjWZYY9iA0eGzi6WdKzi3ejouH4aR4Im+1X9M2g2bPxCCAf+Qa 88w5S9iwSM3G34mwUPcC1gR1aRE91RMj5raL94tdpLm9Tv6qtGYLSm84maWrqqWmJXtX VWIw== X-Gm-Message-State: AC+VfDzqHA9onhdOvRjehLOG1bVkoJjAH2pot9Ldchv1WkidCsnITQBC mbl0Dyb+cQYmfrCqHhrzC8yEbQ== X-Received: by 2002:a19:ca02:0:b0:4f9:586b:dba1 with SMTP id a2-20020a19ca02000000b004f9586bdba1mr4956649lfg.4.1687522864472; Fri, 23 Jun 2023 05:21:04 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id q19-20020a7bce93000000b003f9b53959a4sm2159572wmj.43.2023.06.23.05.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 494361FFC2; Fri, 23 Jun 2023 13:21:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 07/26] qemu-keymap: properly check return from xkb_keymap_mod_get_index Date: Fri, 23 Jun 2023 13:20:41 +0100 Message-Id: <20230623122100.1640995-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12e; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x12e.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We can return XKB_MOD_INVALID which rightly gets flagged by sanitisers as an overly wide shift attempt. Signed-off-by: Alex Bennée --- qemu-keymap.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/qemu-keymap.c b/qemu-keymap.c index 229866e004..8c80f7a4ed 100644 --- a/qemu-keymap.c +++ b/qemu-keymap.c @@ -140,6 +140,18 @@ static void usage(FILE *out) names.options ?: "-"); } +static xkb_mod_mask_t get_mod(struct xkb_keymap *map, const char *name) +{ + xkb_mod_index_t mod; + xkb_mod_mask_t mask = 0; + + mod = xkb_keymap_mod_get_index(map, name); + if (mod != XKB_MOD_INVALID) { + mask = (1 << mod); + } + return mask; +} + int main(int argc, char *argv[]) { struct xkb_context *ctx; @@ -215,14 +227,10 @@ int main(int argc, char *argv[]) mod, xkb_keymap_mod_get_name(map, mod)); } - mod = xkb_keymap_mod_get_index(map, "Shift"); - shift = (1 << mod); - mod = xkb_keymap_mod_get_index(map, "Control"); - ctrl = (1 << mod); - mod = xkb_keymap_mod_get_index(map, "AltGr"); - altgr = (1 << mod); - mod = xkb_keymap_mod_get_index(map, "NumLock"); - numlock = (1 << mod); + shift = get_mod(map, "Shift"); + ctrl = get_mod(map, "Control"); + altgr = get_mod(map, "AltGr"); + numlock = get_mod(map, "NumLock"); state = xkb_state_new(map); xkb_keymap_key_for_each(map, walk_map, state); From patchwork Fri Jun 23 12:20:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695245 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1921042wrm; Fri, 23 Jun 2023 05:25:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7QkSqbdf2TCVG9ZvopAFjGetbqy+Wx8Wq9obW4yDvJ/kvW0VjlBV7BeGgq6RgqcIylu4iZ X-Received: by 2002:a05:6214:5001:b0:625:aa49:ea08 with SMTP id jo1-20020a056214500100b00625aa49ea08mr27901478qvb.27.1687523100871; Fri, 23 Jun 2023 05:25:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523100; cv=none; d=google.com; s=arc-20160816; b=hkFR1uYgVkfeRyiHpXNgBZ4/8Eyyx93gfuuy0V1HYobVQCyV13Rc/ykxlykOnW9u1v l2vKKeRTy4HbWZz2iBsDupA8xpTgz8jf+ofd9PtuneCu8vH+3a21DTQwbCDpOlzEgFt7 c+q94Gu93KsV65RaYjtpdSP0F5vUYyW2USbmxjOuqMuXNICUfym4PP28oQQRbDGj8Tm8 syekWYbGVlMUHUPhJiQFRbWBp6eIM/yCq7/WHQUEozl/wJsqzx5ytYiHEuK3jAhPuAzp 0dbGDu0BWejcUieN6bPSb1CaevLWTH20lhbUG7EgeVKo0eIvC2iISspvyNUOwxwopMmd q5vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=J+Gvhw8OwKumAwW4S55btl0nU9jRO4rpHnQkORleZ+I=; b=HK5QmnYVuSQMq6+YTfJH6DUiGpR5u8D9Uc50LqCsuPYOQRnS+P5Ecwm9q0NaG4igZ8 gflXS6waNLCW+lqk5KHMv8srT15n90ZVRB2Qen5dUTBcP5dhx7uo/5a2DMJvNtLi550r OA0VVRB4MrrRlgN8dt+MRszs3l9IBsvfFG77Bq3ymFyh4G5AtrTSKV+PlQRtEu+jD4YT uY14RLMA7Dmm5NVaZ3xnMGoklfumx5eBXnbvB5aD0xWWhIhsmJVr3MmOEpLWhhQ6Z5fN PkusXl7zJrzQ4CBRjGaKhPkWEK9f+M9DB/nNBlmPDxXnZZCNW1l08OCPJX1zjWUd+sLa 2Ryg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rNOlfTrM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id jf7-20020a0562142a4700b0062ff6ed8591si1211173qvb.98.2023.06.23.05.25.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:25:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rNOlfTrM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfoR-0006Hf-Ca; Fri, 23 Jun 2023 08:22: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 1qCfn3-0003pb-RT for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:27 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfms-0003i6-I1 for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:20 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3fa7eb35a13so2768575e9.0 for ; Fri, 23 Jun 2023 05:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522866; x=1690114866; 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=J+Gvhw8OwKumAwW4S55btl0nU9jRO4rpHnQkORleZ+I=; b=rNOlfTrMXeuprg/vHe0uYLIiZixZ3vF57OX515n2V+WVsQ4FI/X/i5K/8Xxdwn8hXA nkTfo0D3iDucmj90JTqyKeTzqZWsjxQshF7K4oZD8D1j0/rFcrOuGCTKr6A+nhY8oSlY wzaMxXrP+FX+t3UrcbFLxzQ2XV3iOZyBjlnTO3wobGOAvsZm98lc8pzKjHHpKNFNLYmO dZnk06sf2DXA8CWQBjh6UbXbm65ZJQvdD5Ok9oKGXC4RflWi9+S5dj9psuTS5TbHRbrt hBKwcicVjPka7cKj8piq+uNCn3vWcOAD4jNi5OtL12JJyZDkBaV4MMvbQEXeHelQYMOt 7qng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522866; x=1690114866; 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=J+Gvhw8OwKumAwW4S55btl0nU9jRO4rpHnQkORleZ+I=; b=VPa/yPVE2HHRm+1jFxuioNKrIGS0+RPmCCZjGDgOvajEuSxNqCMAB6wvXk0V0HbZnW StFTdKJ1EBTmlaQsx8Y0fIzWiTkebZA6d6Jj2aKcBt6F+6U29Z7MA+V64uEV5NuJ5g7c XW0iCCLLPZpy9oLCtj5nT9XVQlX5LA73p+0Zi8FrvltLxydSZdeu3IPfkmXNg6Wc1dLL ONdheMSvFM/KbHNl5WubUiBkvoN6J/ipXAJQOjKQNed3Kp7nk/PIlA0SLp8wUmU4FnQu IfHBJVGMOcQhzZO2wFiNSOHJHLhzOurah7m3U+VDtpz6Rhw934OgmhDzw38xOg1BIqf9 dQJg== X-Gm-Message-State: AC+VfDwwS7ZiPSYCHe9H7a4RjfTGydNnSN3kIa2BBlBgSQp4F6ih7VgT 5Jm0mCMv7MsHjzXH8wnPmsIlKQ== X-Received: by 2002:a7b:cd8a:0:b0:3f9:b975:a0d7 with SMTP id y10-20020a7bcd8a000000b003f9b975a0d7mr7221350wmj.1.1687522865873; Fri, 23 Jun 2023 05:21:05 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id y15-20020a7bcd8f000000b003f9c8c6bf53sm2239319wmj.13.2023.06.23.05.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 61CCF1FFC3; Fri, 23 Jun 2023 13:21:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 08/26] scripts/oss-fuzz: add a suppression for keymap Date: Fri, 23 Jun 2023 13:20:42 +0100 Message-Id: <20230623122100.1640995-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org When updating to the latest fedora the santizer found more leaks inside xkbmap: FAILED: pc-bios/keymaps/ar /builds/stsquad/qemu/build-oss-fuzz/qemu-keymap -f pc-bios/keymaps/ar -l ara ================================================================= ==3604==ERROR: LeakSanitizer: detected memory leaks Direct leak of 1424 byte(s) in 1 object(s) allocated from: #0 0x56316418ebec in __interceptor_calloc (/builds/stsquad/qemu/build-oss-fuzz/qemu-keymap+0x127bec) (BuildId: a2ad9da3190962acaa010fa8f44a9269f9081e1c) #1 0x7f60d4dc067e (/lib64/libxkbcommon.so.0+0x1c67e) (BuildId: b243a34e4e58e6a30b93771c256268b114d34b80) #2 0x7f60d4dc2137 in xkb_keymap_new_from_names (/lib64/libxkbcommon.so.0+0x1e137) (BuildId: b243a34e4e58e6a30b93771c256268b114d34b80) #3 0x5631641ca50f in main /builds/stsquad/qemu/build-oss-fuzz/../qemu-keymap.c:215:11 and many more. As we can't do anything about the library add a suppression to keep the CI going with what its meant to be doing. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- scripts/oss-fuzz/lsan_suppressions.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/oss-fuzz/lsan_suppressions.txt b/scripts/oss-fuzz/lsan_suppressions.txt index 02ec0a6ed5..7d90c280d0 100644 --- a/scripts/oss-fuzz/lsan_suppressions.txt +++ b/scripts/oss-fuzz/lsan_suppressions.txt @@ -1,2 +1,5 @@ # The tcmalloc on Fedora37 confuses things leak:/lib64/libtcmalloc_minimal.so.4 + +# libxkbcommon also leaks in qemu-keymap +leak:/lib64/libxkbcommon.so.0 From patchwork Fri Jun 23 12:20:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695238 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1920348wrm; Fri, 23 Jun 2023 05:23:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5JGLsw+3aPQYpetuihtwuDuCCvX0ZIW3mtDFCaEGTwOJz3C5ge+YV9HtbS3L8Xuvg1srEa X-Received: by 2002:a05:620a:9449:b0:75b:23a0:d9e6 with SMTP id sm9-20020a05620a944900b0075b23a0d9e6mr20003059qkn.60.1687523001065; Fri, 23 Jun 2023 05:23:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523001; cv=none; d=google.com; s=arc-20160816; b=eZlsR68QFEximN3VWjNDrlRbzvWQEU+0pLlT9O590yKXRMbMakJypbelb3XXwn4VQQ e6hJ85Qpert+VrRsGMnW1bkvnUAmJ0Bu1YLxogIldty3LIQYyPLS/lCfGM0O3FTMDP/i 5CzlrZ1AxtSB/EGIUbbsZoIJwH/ICg0gNAvLJFLteqWldBp+b8mRTA9HQ21vKhA+Q4YB fS0Nz5MhklvgetAqyqa12noMuMMJARf9uggknDLQgZVz54m4GadkDU+zO1beAHA8VoG5 knO5zZUPiyBazzut1/Ddm+bjvG3WugA8/VO33QfhyDmxIq1XSzxpQVXXmFfn/NO4ekhg O4KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cCVrBcA62K9RLf5e56Guknvwd44ZoDW7Y93GujqWZjQ=; b=imR+iSux7pd/P6kKdllzdQhB+1FxHtCyhXuKGmZ7dB4NEfMsTCZtmfpYljgxMf6G5E PueqeNjkgpZDeTQ+5/4Olkcxxx1m/2v1WFHJ9zMdOHCqb6CEyPU7ZU8gSiSogB9KR5fX 7Nv+fQoGRWOT1pFe6QdJmaA5dvsEopIUMLgi4/hL+qTkl+Ql715S+QnMr7f4xMYreMd9 3iGIXsJneKyNZVczmcPcVigujIfpQsQd2dPl4KBNWuVSv9VDwd7ZUA9Ib65s5pCPM/3g kRUnXgFjdb792YqtJpZpWnCs5TTW7CjOrmZpfDuodHg2yzp2s9RlGz8dg9zC5ENUlNtc +7zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KTpc5rQI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id qw23-20020a05620a8b1700b0076554a836e6si78314qkn.580.2023.06.23.05.23.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:23:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KTpc5rQI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfo1-0004mU-MV; Fri, 23 Jun 2023 08:22:25 -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 1qCfmu-0003o5-My for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:18 -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 1qCfmo-0003hz-AA for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:13 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f9c0abc8b1so7225165e9.1 for ; Fri, 23 Jun 2023 05:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522865; x=1690114865; 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=cCVrBcA62K9RLf5e56Guknvwd44ZoDW7Y93GujqWZjQ=; b=KTpc5rQI22c/y3NRcMlIiXKjNRvshvRgkP98Q9XeXBcJHV6bMrlnYYr01sqnTptoTQ uk0cCTx19AZNsn6u8GuEX+Rs1BrJdpenN6md2sq2TxV8vH28uiG6KEbbztbITEeu5F+b Yg6Cor0xOvVCbqcZrlKECvgnDRgjDVX9iy/pgpwYuj5eAqlPYluAJDRVA7SeLO2fUfpD ZT9sUaXqfOC04wK/Z1AvYzoMcevifTe9/tRpGKPVZ4ciNH0uBoJY7ptPymYhv44ua7rW WhnFLSC/Z6cDqC+FATKO8uV5JAPwgwVUBLAIBNtZqDLFuoqpUI5X+Qtr2wTIoEHBz079 gXBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522865; x=1690114865; 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=cCVrBcA62K9RLf5e56Guknvwd44ZoDW7Y93GujqWZjQ=; b=eFHL0ZP9u7z64Ik3aVPXA8BM7X6fVKgaM3fpIL+9T8TGsStCevUG6ulTVhYCIQv4FU IJOEsM0EhWJgKTl8N4tI6uiMTGQkjdwDIuuYN1+ZYtjZpQT/ASrljS6TxJa7rf0kO3T5 0IYUnnNaN1FZsU57tiUtWeSOLfTxiPwrXHOmYJVjhUxiPCSo+y3xT54XOz6OKFTKlH7m KT/UmdyxSfNDjT+ztscYpATggwlwtc97k4t1jKAsCPP8ffaYciLeJyFzP70itZLFCVBM x2wk50Tq+kWaF/mI9igR+91Rn8EmmR3XVVisFv+snmEpj1Wp6JlT9QFYnjGVKocEinjS mJxA== X-Gm-Message-State: AC+VfDwo4+0vLIo3hVvAc50Dhw5GkohnKp6z852p62n3qPFCBbdXcq81 06n9A+f7tOLtjOTU0SQTfAqGYw== X-Received: by 2002:a7b:c7cb:0:b0:3f9:b1e7:8a41 with SMTP id z11-20020a7bc7cb000000b003f9b1e78a41mr12023755wmk.35.1687522865709; Fri, 23 Jun 2023 05:21:05 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id c25-20020a7bc019000000b003f819faff24sm2195346wmb.40.2023.06.23.05.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7B3A71FFBB; Fri, 23 Jun 2023 13:21:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 09/26] tests/qtests: clean-up and fix leak in generic_fuzz Date: Fri, 23 Jun 2023 13:20:43 +0100 Message-Id: <20230623122100.1640995-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org An update to the clang tooling detects more issues with the code including a memory leak from the g_string_new() allocation. Clean up the code with g_autoptr and use ARRAY_SIZE while we are at it. Signed-off-by: Alex Bennée --- tests/qtest/fuzz/generic_fuzz.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c index c525d22951..a4841181cc 100644 --- a/tests/qtest/fuzz/generic_fuzz.c +++ b/tests/qtest/fuzz/generic_fuzz.c @@ -954,17 +954,14 @@ static void register_generic_fuzz_targets(void) .crossover = generic_fuzz_crossover }); - GString *name; + g_autoptr(GString) name = g_string_new(""); const generic_fuzz_config *config; - for (int i = 0; - i < sizeof(predefined_configs) / sizeof(generic_fuzz_config); - i++) { + for (int i = 0; i < ARRAY_SIZE(predefined_configs); i++) { config = predefined_configs + i; - name = g_string_new("generic-fuzz"); - g_string_append_printf(name, "-%s", config->name); + g_string_printf(name, "generic-fuzz-%s", config->name); fuzz_add_target(&(FuzzTarget){ - .name = name->str, + .name = g_strdup(name->str), .description = "Predefined generic-fuzz config.", .get_init_cmdline = generic_fuzz_predefined_config_cmdline, .pre_fuzz = generic_pre_fuzz, From patchwork Fri Jun 23 12:20:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695239 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1920470wrm; Fri, 23 Jun 2023 05:23:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ52GrD1ZM/TmPkQwYYRUKixGlujeO6+/GUs25CbNN5HP08v4GfqxzBCxn1N0BXJdMRPAdwt X-Received: by 2002:a05:620a:2610:b0:762:3a1f:4e8e with SMTP id z16-20020a05620a261000b007623a1f4e8emr24226248qko.7.1687523020199; Fri, 23 Jun 2023 05:23:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523020; cv=none; d=google.com; s=arc-20160816; b=rZ6AyK98n+ZnKiIPdSZyHnBds8Pp+r5iNrA/snAfPwKHgQPA6jvPVP6WrG/zGt+nzU OjKdYAEoeZ3IRyzfXkbYj2nQhz66ztcsQLjAxt9ERjCjEKaXqI1Eo2JsHL717q6tHUu5 M4X/wfbTIuDXV9+4NtUB8ZanXAVCSszCZ7bslctB2pW4hk7AnNTSwAyRYrnYsb0mSDKO il9s6c4JiExQCnWA3SScUp1iMedxUN9u2pnwngAYa7Q4oprdTHCy8pdRw8jHCmPUocsG kXSO3xZ8qmU4bYsbnu0slQTHa7/pmRP7y+DXh2NNL7xVFeQOfnFjSK77orOt/KqxA3UQ dyjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=aIzjiTDV01K3tkp9aXGFv1lByMVRceW6OmvT/ZDu2SA=; b=L6dBZvxZMaucYtLHGWXvJXJa6N9nOpiBqYXgeXu1NyBpkmAVawy1Kyje7yaZLUNp27 0UCZBMaWVoG5w/0zUTuwBBD8zUU2Tha05SmbylbpnsjBSmlMhVUmN1qkIHbRHNuCRL9s PAB03EWwXAnVN371TKzXUf4z6fettgpIRifm/T9efN++aec07gDCampaGsCbQAEla80j jSsmwmRt3UETX96wSev5X06GaGDL+E9Y1BPERdPyRNjT9X0ACBz8UIxkvw6DabEOVmg5 jaDOpgW0Xf+HlCZdRCIHl5G7yoT0dE0qvucYB+opphIMejUfYNcVTHJhwzJVdOEQzFfW NtNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jhhD1kzf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y13-20020a05622a004d00b0040089a7bb48si471790qtw.35.2023.06.23.05.23.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:23:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jhhD1kzf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfo7-0005Be-Ph; Fri, 23 Jun 2023 08:22: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 1qCfmu-0003o7-No for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:18 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfmo-0003ia-LU for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:13 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f90b4ac529so7560935e9.0 for ; Fri, 23 Jun 2023 05:21:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522867; x=1690114867; 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=aIzjiTDV01K3tkp9aXGFv1lByMVRceW6OmvT/ZDu2SA=; b=jhhD1kzf5GakGGS11o9Xgpc+TvzmOHE/Dhkelon8pHh7LnhjVSV1STLaDM8aePaa1M 9KTEOloK7AwkYNphOeoU69nbmva/S+D+y8kj3YF66v3EMC37wNn+gFo9SfWZmzszeASy pvlAtwW6M3XykOKVXirNiehROQDZuT0rm73ahOD/2nsxtHm0LoaRhYVcK7SzYbLdMYuU y6f4owTMdEy9VvlraZeMccU5JVV4p7JZhmwrhA3yDxe/gT2tdw9fd/euPXsZpSa66hRf o5s3Z5DnkM493kKxHQ4PX2kLB/1DGjfLcwkqie952ESeZWAdyao7BQohqLUAzNBFQDtG qNqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522867; x=1690114867; 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=aIzjiTDV01K3tkp9aXGFv1lByMVRceW6OmvT/ZDu2SA=; b=i8aSKJoLa/qwC8H1GSuSoXEtCCD4ywmDhaUNEuRYs71mN521qkKltM8O41Lng4gXl5 2k37DOu4dAL41axytXBc+VczP9kPKGP7pQ4hBapke64SzGJx4P87us3/G351wVFA9NWo Cuj2STHTVB3+qHOgDdP8Z4TQw/qzc/pMizuN6kuZzVDik7VWCtBvOwGMgallNzmyIBw/ O6y+NxDjBsCTCaCVxfrpH0yCgUvJz982MEKgnp6bkqprmDSkZFs9tivKFC5hXzLYx+UO UsbFLq6qjPwjX1dVOTYAQ2Kdovbooa78+SitKBL9BiUaDWGoqvopP5JFKbbD/QCdcTPL tc/w== X-Gm-Message-State: AC+VfDzTCwgl+eo9tAI32dJlz87p+JjW+neYhAo2/R8R6tASt3ssd/OK qW2/OpALvc2hzbkyXMWx2uNOKw== X-Received: by 2002:a05:600c:231a:b0:3f9:b430:199b with SMTP id 26-20020a05600c231a00b003f9b430199bmr9968001wmo.15.1687522866933; Fri, 23 Jun 2023 05:21:06 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id g7-20020a7bc4c7000000b003f7eeec829asm2259310wmk.10.2023.06.23.05.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9582C1FFBC; Fri, 23 Jun 2023 13:21:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 10/26] tests/docker: add test-fuzz Date: Fri, 23 Jun 2023 13:20:44 +0100 Message-Id: <20230623122100.1640995-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Running the fuzzer requires some hoop jumping and some problems only show up in containers. This basically replicates the build-oss-fuzz job from our CI so we can run in the same containers we use in CI. Signed-off-by: Alex Bennée --- tests/docker/test-fuzz | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 tests/docker/test-fuzz diff --git a/tests/docker/test-fuzz b/tests/docker/test-fuzz new file mode 100755 index 0000000000..7e506ae1f6 --- /dev/null +++ b/tests/docker/test-fuzz @@ -0,0 +1,28 @@ +#!/bin/bash -e +# +# Compile and check with oss-fuzz. +# +# Copyright (c) 2023 Linaro Ltd. +# +# Authors: +# Alex Bennée +# +# SPDX-License-Identifier: GPL-2.0-or-later + +. common.rc + +requires_binary clang + +# the build script runs out of $src so we need to copy across +cd "$BUILD_DIR" +cp -a $QEMU_SRC . +cd src +mkdir build-oss-fuzz +export LSAN_OPTIONS=suppressions=scripts/oss-fuzz/lsan_suppressions.txt +env CC="clang" CXX="clang++" CFLAGS="-fsanitize=address" ./scripts/oss-fuzz/build.sh +export ASAN_OPTIONS="fast_unwind_on_malloc=0" +for fuzzer in $(find ./build-oss-fuzz/DEST_DIR/ -executable -type f | grep -v slirp); do + grep "LLVMFuzzerTestOneInput" ${fuzzer} > /dev/null 2>&1 || continue ; + echo Testing ${fuzzer} ... ; + "${fuzzer}" -runs=1 -seed=1 || exit 1 ; +done From patchwork Fri Jun 23 12:20:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695246 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1921882wrm; Fri, 23 Jun 2023 05:27:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4bb+xPMAWbmJkcZRq3fjKu92WSK9GRmz1kVFX5+3j8PSwt6ZtZhm1F0SDR4QlMGWEAa6m7 X-Received: by 2002:a05:620a:8b16:b0:763:c9f8:bea4 with SMTP id qw22-20020a05620a8b1600b00763c9f8bea4mr7251204qkn.35.1687523225083; Fri, 23 Jun 2023 05:27:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523225; cv=none; d=google.com; s=arc-20160816; b=HaeqhtVtYjqp7zGxhWqQ9s5zBzn1QSzyVavudN1BqbGMxo9Ra7qkmQNX0A+IIUKTPL j4S5W60a0RHOIXUTmuRRy85jW+wYKVu7hxOM8Nbo7+OHJhfdsvX5RPmdgzGCZxXOeddR HqJJvgGSRC7p91bO6tYVdQiFM9XoY4WVlTcDBFm5nMaXG2dpnAgy5htReRebvhbhAti+ BX/Fs260OnGMUvOnkAgC6JpxV4tjMFPf7nEpfckUJzLQFM/yXV/bOflwzCbLKRIBiDOj 390m/MDN8V98i8oIYsUjINJzjsk+lgNhr+RJsCMT/muCOpNH4kknuIZ2c9VP79R58MQT ATZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vcsfGHCbHul0oRYFUr8ghI+TCa734UZNBqW4hxmvJxY=; b=RaONwtWfyI1c7ZZAAfMivCwew8Hm1ZapDzJcG5cw7QWpXIXXPFOwasq06MsofNhTK6 vHZy9dPBLM3eadvh6Y9YaPatjZIK8C8hLNIaeVugW7sN3Xb9oW95NVLO1A+ww9DMjtcY QVgikNRXcD2zh3icq/2oQAa2Xgn/oYwbqccWqkGVLMOLrejpSFZdhK/BAjK7AicORe3W 2/MiiVEJWKJTYD8mYYLaeNZ3pgMXFodM+3+yTNsybbp2EQaLWCBx+bn262iK1nvlJAlK EIYUILePVsVTmYo0p9CuHEYwSRRN9IJJMcxxbtomckz9edfzfJEZNL8WC7dLUDP1KuUI CclA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SPXvYd4m; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o6-20020a05620a110600b00763d64a012csi2153677qkk.283.2023.06.23.05.27.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:27:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SPXvYd4m; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfo8-0005Dm-DA; Fri, 23 Jun 2023 08:22:32 -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 1qCfn3-0003pX-Pr for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:27 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfmw-0003hs-D7 for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:23 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-311275efaf8so549939f8f.3 for ; Fri, 23 Jun 2023 05:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522865; x=1690114865; 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=vcsfGHCbHul0oRYFUr8ghI+TCa734UZNBqW4hxmvJxY=; b=SPXvYd4mezSEBv2WTGSrqRuK5vR7EsXrkhq6oDt5Etwps8/sZErBQBySRlOc/jlbUH DF5Qvug2f+tsTXz3kysAx4doLVT0czNq+gwPrpdqWQHvKMDRgQWcvXXgAlJ3lSWjRfjO n7mww229m42mNtHusQTXB3ReStHglLIUCKT6HYBYbjjL58zOLkaCttetqaZr9f3Qd00F Cc99/OoIcQVf6TEVrk57LbkG9XWA2o8MuodxItVqMMd7TdVGQzM3J4jsSlR5TLIdj4Lb eCJQEKcluha0a2aKOtjQIVLiRK9clNNQBDtcyI4f0GmUjXvouRErZ5mH3Vxv0HdMLpqy dNww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522865; x=1690114865; 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=vcsfGHCbHul0oRYFUr8ghI+TCa734UZNBqW4hxmvJxY=; b=a7FkHncYwQsbfTRgki0Yo7nqXgsGnPRLePkviE9ZZ8aJ0PipQ/npMG6IwBOAuavOfy CMbLn1jCTUjaG4MOCZIRyz/1ar2C1oo2ahv1G34lTr/WQPsGuzfTpUDbj55SYYx0Bx2b nqc28A9wLyXRkXAgIFabpPrSj6WTMm8Rf2KfKc9iPIbvVBXu8ipuCc0557gRi2oABoDP zuB4cq9ZGwtZ9/T+tCNByAzlTBEyItTTwrTODaw5GQvA1sKH21DKOWHtoIqfV+hXeIGa hb5qOGXog04OJhKYUVYWf28Y3K6V0OB4YYgm4LneYSLfW4/psldyGKOhK42II9pKKBHB YzzA== X-Gm-Message-State: AC+VfDw3cv3SjMdydL95Qb+i/o1lPgavSfMfCC73TPSzywCOrF9REI7n OKfo6SC3nKroJK0D4wvTEpJoPw== X-Received: by 2002:a5d:4905:0:b0:311:1677:a2a9 with SMTP id x5-20020a5d4905000000b003111677a2a9mr14375641wrq.71.1687522865540; Fri, 23 Jun 2023 05:21:05 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f4-20020a5d58e4000000b00311299df211sm9485684wrd.77.2023.06.23.05.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AEA7D1FFC4; Fri, 23 Jun 2023 13:21:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 11/26] Makefile: add lcitool-refresh to UNCHECKED_GOALS Date: Fri, 23 Jun 2023 13:20:45 +0100 Message-Id: <20230623122100.1640995-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This is yet another make target you usually run in the top level of the source directory. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b22bf6fba1..56f165c0b2 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ quiet-command = $(quiet-@)$(call quiet-command-run,$1,$2,$3) UNCHECKED_GOALS := TAGS gtags cscope ctags dist \ help check-help print-% \ - docker docker-% vm-help vm-test vm-build-% + docker docker-% lcitool-refresh vm-help vm-test vm-build-% all: .PHONY: all clean distclean recurse-all dist msi FORCE From patchwork Fri Jun 23 12:20:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695236 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1920240wrm; Fri, 23 Jun 2023 05:23:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6oKpK1sSzdYjg57qDb4+5/tdU2n29PcH34Cdf3r52tgybI/gIfJcIOpP4Nnt2QUgwItbD3 X-Received: by 2002:a05:620a:4544:b0:75d:555d:5997 with SMTP id u4-20020a05620a454400b0075d555d5997mr25330782qkp.25.1687522984747; Fri, 23 Jun 2023 05:23:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687522984; cv=none; d=google.com; s=arc-20160816; b=XPfKQQLU252Pb/iR5YgUvq/3q9VAbWm63dF32DN+JlWGZR8UUu6EgHRCrelYdHXHkn 0uuNZcTVSRQzunbFaIbd1E6s7k6XFo37dadBIcKLKj2/ES9mooGk16yoTP6oheP/WQnw 1ekxg066xyjF2JaLjBiEaWCYpjguf09yXcIXIMcMDVGzEM6qy44wqvbRGfo8PNGQJFaZ lyefgYLRQ5NUpzMvg8dByG/Pl/9Ku0L+3dYs7k0pvVPr20gWKkTZDHVW+TQfrVueWuHt /nMGiIdx3Dj4nR/ulS4NO3cCjIxKA8Md25lMbGpPYTTdBg6a8tUmONokb0UQqFYSe8a4 YzWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IO8FBVf+cxDpmWwXUlU1UGAlcwL+PYrJLsP60QqSPVQ=; b=obEIr0cVjAMKKJKpq27eg6LqIte769edXPYXv/rZ/T/uz3E07/DaIurI1XSDuIHY3w Kx0NXU1oRotNrK5FSSTysAB+ZlLW0Omn++fuP58GcqMqfdTOuQEYEs8/n3sns685T7On E/55KeG5XwwuJXlQqki2H7xdgzwNM4NzdLXTqgbjIj/QzJCRFK+HheSD8cm+09A7DZqL 5LVCLMR6cwkAzaNUk2yU54MYz7y9gsGcaiY5R9ZjmTRAjEZnvAUkhVCkdvurHAgqNn9R 2h6+N4ZG1SzoL2Fk+okGaKKtjbFzxFgfo584LrnyDD51+3+vFYZ6DWUsm0OPV7f3K/og g2uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WIXk0hjU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bk12-20020a05620a1a0c00b0076555ae53e2si19115qkb.690.2023.06.23.05.23.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:23:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WIXk0hjU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfng-00046m-6f; Fri, 23 Jun 2023 08:22:04 -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 1qCfms-0003m1-RG for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:18 -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 1qCfmo-0003hB-Am for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:13 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f9b258f3a2so7364545e9.0 for ; Fri, 23 Jun 2023 05:21:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522864; x=1690114864; 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=IO8FBVf+cxDpmWwXUlU1UGAlcwL+PYrJLsP60QqSPVQ=; b=WIXk0hjU9d/HOhhwzcatybuWLPn6Vdye655bSjnK0J7RA/oGvMwn7pJmY0RTxzSMVk jsemR+3oVSe5f3/EslT/ARZlSbpT6G+E9Sx8fivR/3ayzIwMKSW79IRWZ8Az6uc/NTjK BoeDRg3zgm+c+pYcIe5viiAq4pnh5AEZ3UbrpdfR/RcZG9au6RRRkBqXGnUk9u/AB2aS r1ZEz6SkBJnj792q0UvrWot+wU+DqGs4og3n949Zf0SLY5X5g3ZYNBICRTS7rUGPk9QC vw6Pqqn4j3Kv39gr0ZY5/culLHMC/bnpZMRtrWaRscahc3sr5EqhfnGl/IKUTjVfKxbU lCdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522864; x=1690114864; 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=IO8FBVf+cxDpmWwXUlU1UGAlcwL+PYrJLsP60QqSPVQ=; b=ZXU1i7XPeBoe45ICT5sLrZEqWcSvhX8r1voSzKKY2GmpNuki5z+YLYryi9kOiDaZxb XSnNNs4A21jPvs/gL3vbocYBBMkT8mjD2Z18gCkwTvRu1OSrw8ZEZpdztGs1M2oViq+H Kto+/+ux7ZsoI/TcRn8cOrTUkMhAzsNHwGYOBCdbpzhuiBDGTxezkdhAQptk4WrQYIPR 4AGqRhGYtbxy95c798cIaENxhqlty5Rkee175gg8DDKH9o+qUWsGue5FdXbyjaoWWGBl 2KXmmHHE7D99gA/4qrRfKmza6rzc4NKUghA0qaYfI4wKSqHjvF/kfZfMRY6Jkag2pvsD f65A== X-Gm-Message-State: AC+VfDw4Q9s0k6wReGce9jpAzgqMg3vQRp7THdZQn0pl4m04dRxkqrh0 hXEUVaBorkBpP9f49zij7tNoRQ== X-Received: by 2002:a7b:c391:0:b0:3f9:b3f5:b8f with SMTP id s17-20020a7bc391000000b003f9b3f50b8fmr9975932wmj.34.1687522864118; Fri, 23 Jun 2023 05:21:04 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o16-20020a5d6850000000b003047ae72b14sm9483364wrw.82.2023.06.23.05.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CC4801FFC5; Fri, 23 Jun 2023 13:21:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 12/26] tests/lcitool: update to latest version Date: Fri, 23 Jun 2023 13:20:46 +0100 Message-Id: <20230623122100.1640995-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We need this for the riscv64 and gcc-native mappings. As the older alpine release has been dropped from the mappings we also need to bump the version of alpine we use. Signed-off-by: Alex Bennée Acked-by: Richard Henderson --- tests/docker/dockerfiles/alpine.docker | 4 ++-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 0097637dca..43370f7b36 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all alpine-316 qemu +# $ lcitool dockerfile --layers all alpine-318 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.16 +FROM docker.io/library/alpine:3.18 RUN apk update && \ apk upgrade && \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index c8971e90ac..b0f44f929a 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit c8971e90ac169ee2b539c747f74d96c876debdf9 +Subproject commit b0f44f929a81c0a604fb7fbf8afc34d37ab0eae9 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index f1570b54df..5d36a62b10 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -115,7 +115,7 @@ try: # # Standard native builds # - generate_dockerfile("alpine", "alpine-316") + generate_dockerfile("alpine", "alpine-318") generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("debian-amd64", "debian-11", trailer="".join(debian11_extras)) From patchwork Fri Jun 23 12:20:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695232 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1919948wrm; Fri, 23 Jun 2023 05:22:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5N66diHZ1BittkTpv7QN5rF5SHPL0jkgpXqTlbVM0Y9R7nIJ3gFJcaC6A4VzFUv7/3ICOP X-Received: by 2002:a05:620a:6884:b0:75e:ac5e:d84b with SMTP id rv4-20020a05620a688400b0075eac5ed84bmr6422881qkn.57.1687522945083; Fri, 23 Jun 2023 05:22:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687522945; cv=none; d=google.com; s=arc-20160816; b=bGg9kcUqF4jSQxS8gHQ3DWizT+P3o/O7L8bJFtXPyOM9uNefZsDgf9Jsq6QNj6c00I sJy2BoRB37hfS3zGPCGj+Hzq6Gj74DpMaVwQWRWy5sf6JmuB4J0ZjIOkvJoppDV6x+8y 3su+0uSMIRFYDb1hFlircrbFgLY8lBq7SY+ST4skDQ0pPSlgvxLGqCSzM2Yhc+rAqZL5 1JQmAerFLykxeG0JuQgUX0D4+qGw1euqCSOaJ+gXA66cWxqevBsMCsdVTmo7d4xbZYgz YsIf9cXMErkK2uT5JYWP9urkyDpDx0R/5rR5RMy3hbGhbdftdAjyMyA6rQkyOH8HRGzK d07g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eCf3OIvOJaKjsLU3/R6WpJfoRS6mjuv0cWQYEa6/HWk=; b=M6Xy9PCLFMlzUizl3Ly8bCb+Q5Fhd2lpS21f1vCGjKHmQrO63JSw/IU2QNaSMKQzu7 ztVqCCxpP34CBAdxQpzQL4IVcPdrMRfM4p3ccxiXQ3VRvvsje96jLcBnj9RqQKlnFImO zl3ZW2HY84Y4lhDQhMc5JsGv0H2ja0HtxdOozB9ZWW9/7QscDfC/6Pe4+PT3u2sYe4QZ Oy9svoIkijEcmqs2saI5V2Oidp9arOS4BZ8M4HWnasex7vqUOTojDXL3inN8bnOxfii7 Q3tVUTGgw4PKNj1uD176WHKb4/jf8IVUhm3AV0/7nhM1kQLa4SxHs8FmzZpVo0M5cIey ec6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VPi+AWMn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id hu3-20020a056214234300b0062558658712si3664645qvb.246.2023.06.23.05.22.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:22:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VPi+AWMn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfnr-0004N7-P2; Fri, 23 Jun 2023 08:22:16 -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 1qCfmv-0003o8-Iq for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:18 -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 1qCfmo-0003j9-K8 for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:14 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f9b0f139feso7313915e9.3 for ; Fri, 23 Jun 2023 05:21:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522868; x=1690114868; 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=eCf3OIvOJaKjsLU3/R6WpJfoRS6mjuv0cWQYEa6/HWk=; b=VPi+AWMn/l2z121NGiOR1wmjtfhtBiuD1EvZysj0rlA9SsaOSXpwjYsuIsV67AIq8d 4QHX7vH9kuKsN01/Qr6B3sxgzfBzGH23i23CUj2Y8I1p5wbB7AAT/o/JyZwtrj3LnHT4 gsQJ3lEvCQK49onTUUeV6KdCw6xKnL+jXNQrVmBNhtQMmziPLk34XJ5mT6HKfmHIaiqG s5CsDPrM5bDB9YiRMS7S/xFdq0qsw/YzpQLzfQZiRfBA1ZnDN2Bf+S+VoHWoeJUV6A3E NS6GzzogcJVgBpRDClM/D+YtIuXjWUxl9C0E2w38uZlt3PKQV7R3MCPWIyF9gHfs6ZDA H8BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522868; x=1690114868; 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=eCf3OIvOJaKjsLU3/R6WpJfoRS6mjuv0cWQYEa6/HWk=; b=Da6X++8z3ESElgXpTPVCApy8OKQnWIOEjCDyvk3T4tJCRy3R9v71nBYAYluGlmIdSP 4oYGcU3hQ67q5ACjKvOnhLWDjshsAZIcR0Ca/qCyrxHkILiwUJcyGRYwjoAIOAVHUxSz Zkju4OB86ll5SUHvByzcOqNyz0/MiLscTfwIAc/5AR580kkHGLmT+7bO58gF6UHiiw8o ma1/fbIXECQuXUGNM1+oj6rTa+oo0uU/EPb/ZcQQ7FmKCuptXIc/Ay99d5kA8YVpwX3l KfRFhzu2drtc4qG1PsQJPa1SjZNGZrUccgwBeGQ+ioCfV9c/oSlPz0xysY2Jmxusrfp2 epOg== X-Gm-Message-State: AC+VfDzsBh7ktIx2nq9M+Gi8OuzWvut2Zu0L0XXFvacROsidwxZJMoni 0F5qMhPDYYqLDnyw+qVgjdzElg== X-Received: by 2002:a1c:4b15:0:b0:3fa:770b:363 with SMTP id y21-20020a1c4b15000000b003fa770b0363mr3195154wma.4.1687522868031; Fri, 23 Jun 2023 05:21:08 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id b13-20020a5d4d8d000000b003048477729asm9433099wru.81.2023.06.23.05.21.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F04CB1FFBD; Fri, 23 Jun 2023 13:21:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= , Erik Skultety Subject: [PATCH 13/26] tests/lcitool: Bump fedora container versions Date: Fri, 23 Jun 2023 13:20:47 +0100 Message-Id: <20230623122100.1640995-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Erik Skultety Fedora 37 -> 38 Signed-off-by: Erik Skultety Message-Id: [AJB: Dropped alpine (in prev commit), reflow commit msg] Signed-off-by: Alex Bennée Acked-by: Richard Henderson --- tests/docker/dockerfiles/fedora-win32-cross.docker | 4 ++-- tests/docker/dockerfiles/fedora-win64-cross.docker | 4 ++-- tests/docker/dockerfiles/fedora.docker | 4 ++-- tests/lcitool/refresh | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index dc72ae9cc9..a0a3cd9e5b 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross mingw32 fedora-37 qemu +# $ lcitool dockerfile --layers all --cross mingw32 fedora-38 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:37 +FROM registry.fedoraproject.org/fedora:38 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 7eb4a5dba2..b6c1a6a339 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross mingw64 fedora-37 qemu +# $ lcitool dockerfile --layers all --cross mingw64 fedora-38 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:37 +FROM registry.fedoraproject.org/fedora:38 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 3a69eefdda..8a35a17617 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all fedora-37 qemu +# $ lcitool dockerfile --layers all fedora-38 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:37 +FROM registry.fedoraproject.org/fedora:38 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 5d36a62b10..5e06fb2cf5 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -119,7 +119,7 @@ try: generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("debian-amd64", "debian-11", trailer="".join(debian11_extras)) - generate_dockerfile("fedora", "fedora-37") + generate_dockerfile("fedora", "fedora-38") generate_dockerfile("opensuse-leap", "opensuse-leap-15") generate_dockerfile("ubuntu2004", "ubuntu-2004") generate_dockerfile("ubuntu2204", "ubuntu-2204") @@ -169,12 +169,12 @@ try: trailer=cross_build("s390x-linux-gnu-", "s390x-softmmu,s390x-linux-user")) - generate_dockerfile("fedora-win32-cross", "fedora-37", + generate_dockerfile("fedora-win32-cross", "fedora-38", cross="mingw32", trailer=cross_build("i686-w64-mingw32-", "i386-softmmu")) - generate_dockerfile("fedora-win64-cross", "fedora-37", + generate_dockerfile("fedora-win64-cross", "fedora-38", cross="mingw64", trailer=cross_build("x86_64-w64-mingw32-", "x86_64-softmmu")) From patchwork Fri Jun 23 12:20:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695243 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1920794wrm; Fri, 23 Jun 2023 05:24:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4VmCxM126IRCwkce6Kw/egfzHEvSoU5C/znZVOJd7lih/Xkr+RTT7oSAB1QkkYrGABc711 X-Received: by 2002:a05:620a:19a0:b0:765:392b:203d with SMTP id bm32-20020a05620a19a000b00765392b203dmr6088012qkb.19.1687523067733; Fri, 23 Jun 2023 05:24:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523067; cv=none; d=google.com; s=arc-20160816; b=GEOd+kJkxcM/EF4Tg0h4nrNcIPs5YFH0tRseC9GcvaWTn+E4XS7/ELXC4AGGHsmsHE W5rL9qjN5wFeewjoPu6Wop2202yAM7CkhB9aj4Ob6Iuuoz3vM5lBagUqglNtxBGiIcip 8fV7sP9//q5rcAsGgrbN5Tvsr1rTyB1p7bXJUvHNq0ULCm/ykLFl4/zgZPAZ1PvAZFIH CaBizV8QprTzd6Io9qLBtuVdQDnFS7ttKMwfxVICezSdniMuCZ3jfjbXXFouTOQqQjIY 4qlrSIV3zKSd9A3sOkaLH8buiACpzRWp7MTXwQRO6NHAu11y3nM/XeDxg9B8oyY2tJtM MKxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1l1lsbfw4bSxGd90NtaE4vKULowZxXwBNTWJjDPGTPM=; b=ZxXdzceBwsQ9tZPGleeVj1vKeO1dRbm59xyetFv1hA8VeOqqBQBpOva5hs/hPHk3QI Ts6CTqBMAxjOzG61D7mgH1EgQHvxQyT/x41JShAXXQQHbR8MKrYxw4/Cc3SB/LfSUeW7 pRhga4kr4o2G2m2li2ThUkDYQVi7p42eR/sDtPC2BVYd22h5nKfhnMLe2GjLeVHGuWDH wIRslzW/PY4mFDIuH8a7mJgmZ/9cQB0yy3n+f8Nvwgbwl8+uR237XcfrUf5mago4nkcW a3PTrqBn7niQhFHC2T96nVHF0iRv4E4xK3NAam3/nbPaglhz+DxFrC1al7CEzGnLjDqm KFww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ekLeF5oG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p24-20020a05620a22f800b0075ec6c3d6e2si3575916qki.294.2023.06.23.05.24.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:24:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ekLeF5oG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfo5-00053k-7J; Fri, 23 Jun 2023 08:22: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 1qCfmu-0003o4-Mb for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:18 -0400 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfmo-0003j5-9t for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:13 -0400 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4f8775126d3so661170e87.1 for ; Fri, 23 Jun 2023 05:21:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522868; x=1690114868; 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=1l1lsbfw4bSxGd90NtaE4vKULowZxXwBNTWJjDPGTPM=; b=ekLeF5oGLpKM2Cz3D9AFjWzNEhFXiU+9ZJUSBMvZf2PMexzazQPM7gwWOSMGYuPDUU LHIoFKNtHOcQhmVGCnlRihRyxDEwTasBbqYJoHOJ6fvyMKkJl3u0qC1fdtQ+0/1CieVR T6b+JZOmmM3cP5nPATZ+eXwO77aANn9ZEXzdxbt0qzGH/femc0djX1WwAV79rMxppw79 /PAq/nKBEl8P5kviRHpWv6wHMjWK4EvolGC9Mq8HgIob1RLv54fzkfoFNdzAX3B3rhei N7eCp02MDwK4hmxGooZn+KRCLzpH4glC/pkWia3sCuA4+MV0veqhpqNQuZafMCmugbuO MeXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522868; x=1690114868; 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=1l1lsbfw4bSxGd90NtaE4vKULowZxXwBNTWJjDPGTPM=; b=bEP3GpY4W0w105F+EDofn5bZQk+D2b/WJISn2h7IA1ZeJEamsKCcPAV7Ycc+M3FnF5 ft4/wpLItugvgeXkc4FouYQS7xYELo3b/6JlQ5quKSCNgoE+zj62fSUW3k9STN91sECe K6A4Vi6iryfizuTGY/02Z3TgxNhJjj4Sr08uLShQjiXOpjlI7XUHCVOYEtoUAJRG5Mz9 eyQDc6a/9JCYnJ6wiuj56BTXjBVqTW8gQn/ibIGws0eh/Mv5wNM5LPclg0GprVMNHZ1W d7WbNGLZzVqKSdx2QWrZOhDCSRuydJXEpyCieEJUxe5RJYpW5HKIVpNWZA8FfsFir+5j JlyA== X-Gm-Message-State: AC+VfDxEfYyb6qyt5iMcUU5qBPr2KgrgzCISVXidpyTG6dLJrsj3cjgz CCyoBjHRSPvfz0odKsijv/5oiw== X-Received: by 2002:a19:710f:0:b0:4f7:3ee8:eede with SMTP id m15-20020a19710f000000b004f73ee8eedemr14211775lfc.61.1687522867875; Fri, 23 Jun 2023 05:21:07 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z20-20020a05600c221400b003f8f8fc3c32sm2187755wml.31.2023.06.23.05.21.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2EC0B1FFBE; Fri, 23 Jun 2023 13:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 14/26] tests/lcitool: add an explicit gcc-native package Date: Fri, 23 Jun 2023 13:20:48 +0100 Message-Id: <20230623122100.1640995-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::132; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x132.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We need a native compiler to build the hexagon codegen tools. In our current images we already have a gcc as a side effect of a broken dependency between gcovr and lcov but this will be fixed when we move to bookworm. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=987818 for details. Update the packages while we are at it. Signed-off-by: Alex Bennée Acked-by: Richard Henderson --- tests/docker/dockerfiles/debian-amd64-cross.docker | 1 + tests/docker/dockerfiles/debian-arm64-cross.docker | 1 + tests/docker/dockerfiles/debian-armel-cross.docker | 1 + tests/docker/dockerfiles/debian-armhf-cross.docker | 1 + tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 + tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 + tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 + tests/docker/dockerfiles/debian-s390x-cross.docker | 1 + tests/docker/dockerfiles/fedora-win32-cross.docker | 1 + tests/docker/dockerfiles/fedora-win64-cross.docker | 1 + tests/lcitool/projects/qemu.yml | 1 + 11 files changed, 11 insertions(+) diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 40a2b6acc4..016c2321f1 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index c99300bbfa..3c114efa11 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index 5db5c78b31..dfbd47db89 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index ae6600b25f..4e0084e896 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index daa2d48e36..88adf333e9 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 5af04e2054..256e8b5dfe 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 1eeba7fcab..4d19cd2bd7 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index 52e89a6dab..642bbde3d1 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index a0a3cd9e5b..e3dfd68bed 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -29,6 +29,7 @@ exec "$@"\n' > /usr/bin/nosync && \ diffutils \ findutils \ flex \ + gcc \ gcovr \ git \ glib2-devel \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index b6c1a6a339..0e15c9643a 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -29,6 +29,7 @@ exec "$@"\n' > /usr/bin/nosync && \ diffutils \ findutils \ flex \ + gcc \ gcovr \ git \ glib2-devel \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index 566db8313b..21fd3d2cf9 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -24,6 +24,7 @@ packages: - fuse3 - g++ - gcc + - gcc-native - gcovr - gettext - glib2 From patchwork Fri Jun 23 12:20:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695241 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1920747wrm; Fri, 23 Jun 2023 05:24:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5/GEVXh3ij2vcP325Hkav6WjzAyVe+oCYRgsT2wctPuaN4B24wI5wCrHCJ/Ng2B8tJGro0 X-Received: by 2002:a05:6214:e8e:b0:626:1e4e:b5b7 with SMTP id hf14-20020a0562140e8e00b006261e4eb5b7mr26623456qvb.59.1687523061554; Fri, 23 Jun 2023 05:24:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523061; cv=none; d=google.com; s=arc-20160816; b=PGzJkVZ8VnYh9KDLRM0BKHd7+Cq2Tjpi5fqk+NP4fB5TV1lvB5bgb114XCEAxbISVJ ak83jYn64SbndtpMoIfOlCDq5g18bhrjOPyDr8VFOHi3fkAZFIjGeVHOQDEUtoOXf3Gn a7fE5ikpmQ3a/dj/u5/XUNd7VuzuCLnro0qygYNa7IzT0xzAtFyFpN8ui1GipIDO2vcG ED5HZRfGKM8P+HgiIDEsiuhw3i34o8b5PI6yGWjuShxaUFVBhkrCMU4jhcC6ryUzdhqx ZAEZEgWgbFUaG4+CWlPg32Gc/vJdBKJv76IgeSvR21p+6s6f21U93h8SuF/NC0eF4cRm Bw9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=45GYP/JtJUGxc1t0ZJqBnVyPwHBwWmagxJQ92CrfkDY=; b=H0BM4BO5ZZtMUbBXX1c2WB1yu9NwnStyhEYo1B0ucYq/o2bCdxfcaZHchpXLSMqu+0 tuGBNl7KNKZW9FBMDzIJhhZxXpnUUxCMC6J4uK1zR9k7yzDZuteJjfusYI6Zx0P9rYoP qqaXRIwrzViejOGsqrDqq/MQX/5GFfBA9Zu2YVvJZl+Qt0MrlMHrYcZmGUqt4AMmPSut G4KdUkA2dQW0T5RnwX2O+hVVb7DCOGvdVJIeJ6EXrtnK7m5jv9veiWPbpbLP3Bdm/wig PLcxx+AeRa3vLYJ4Z2rWiYpa54sQnUWqvTuvva/LQ9XIfxzAXqv1JcddVVNiEqsjLDgR cYww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MASR4jub; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id hf12-20020a0562140e8c00b006211ca1a17esi3565823qvb.481.2023.06.23.05.24.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:24:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MASR4jub; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfoS-0006QC-Cc; Fri, 23 Jun 2023 08:22:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCfn3-0003pS-Ne for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:27 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfmp-0003iv-Uh for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:20 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f90b4ac529so7561095e9.0 for ; Fri, 23 Jun 2023 05:21:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522867; x=1690114867; 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=45GYP/JtJUGxc1t0ZJqBnVyPwHBwWmagxJQ92CrfkDY=; b=MASR4jubaJF4yMx6QhLUzaP0taiF6ciJadXweFghiMDBZn38BORedd9C+r5UZ6+ffI 5xMfWHW8jaYB+m+CBv2zY5Co6Gd3n+qU39sjYwxB9lVcn1R6GeuwXCrdwsLjKpqznRn4 hSLRj1yQqCVHeEnqrX4deIMJ6WiQtnRNfnstVQxiryci+OkYNFY9Nao48jBk5d6eZNvu WXeCRHjDNYqmH/emssg4BqmsTzPjKuWvg7Mi0fgc60aIg0Brw6nSaefYzqWIzU0yFh1U 2nRS9nQtJRDdw03zRxCJQ6RCNA8Sf9UELJxN1Gyj+VQFNjc0BEmC616FwZhyrYxbthV6 p0rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522867; x=1690114867; 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=45GYP/JtJUGxc1t0ZJqBnVyPwHBwWmagxJQ92CrfkDY=; b=dvTps9ZnubmpUK6xnf4znOx+gZYf9GPjY2nfiq+ploAno1QTEtQCewW0TZ+jfAaqdH SrRlUP8EYVDDMI7p472iAsgx3hpU7GSV+KqeoW7IwMsMMGOCTUKXSXQt5ZAY93pIbI9G N2r8j5BpiyjUDVGrubMl7TrkdNXQE+C43yzNQZHny4aWQfYNs+PTUPXvi9QPBHjx0AcJ hMGmpw8tO8aL8juFdnP3o5HOUJzm6vIl0Z0boQMPFtJy0cyVOMYAqT0CUXqyot9uBgEQ XqUQb/N3dMkC5c90jf4WrtzVjTGBJQN0JGbOqopgLFxPArN5yXzK7nhhiQ7w2f2uuHaE ehtw== X-Gm-Message-State: AC+VfDzy47XyhzDB2e/gPLcNaPBkCSBuRxGTxEne1DUg6uhT+jn9/2ev gXfI/2Cvk6NZstG4Hxbgv1Qkjg== X-Received: by 2002:a7b:c017:0:b0:3f7:aad8:4e05 with SMTP id c23-20020a7bc017000000b003f7aad84e05mr16715012wmb.11.1687522867668; Fri, 23 Jun 2023 05:21:07 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id b13-20020a5d4d8d000000b003048477729asm9433125wru.81.2023.06.23.05.21.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 489A91FFC6; Fri, 23 Jun 2023 13:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 15/26] tests/lcitool: introduce qemu-minimal Date: Fri, 23 Jun 2023 13:20:49 +0100 Message-Id: <20230623122100.1640995-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This is a very bare bones set of dependencies for a minimal build of QEMU. This will be useful for bootstrapping cross compile images based on things like Debian Sid where stuff isn't always in sync. Signed-off-by: Alex Bennée --- tests/lcitool/projects/qemu-minimal.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 tests/lcitool/projects/qemu-minimal.yml diff --git a/tests/lcitool/projects/qemu-minimal.yml b/tests/lcitool/projects/qemu-minimal.yml new file mode 100644 index 0000000000..507f1f6881 --- /dev/null +++ b/tests/lcitool/projects/qemu-minimal.yml @@ -0,0 +1,23 @@ +# Very minimal set of qemu packages, used for early bootstrap +--- +packages: + - bash + - bc + - bison + - flex + - g++ + - gcc + - gcc-native + - glib2 + - glib2-native + - glib2-static + - libc-static + - libfdt + - libffi + - make + - meson + - ninja + - pixman + - pkg-config + - python3 + - python3-venv From patchwork Fri Jun 23 12:20:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695234 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1920077wrm; Fri, 23 Jun 2023 05:22:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6OTE6LEMjlLvZlLZWSMi2Xd7bnoYUwz0TL2huPSCuebQI7WrxX6gs7zqLQGdGPVrH09gcp X-Received: by 2002:a05:622a:1445:b0:400:826c:1064 with SMTP id v5-20020a05622a144500b00400826c1064mr3905971qtx.48.1687522962509; Fri, 23 Jun 2023 05:22:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687522962; cv=none; d=google.com; s=arc-20160816; b=h3I9BHetgLSrYSGjZKki9II5l/9M60nW9aDQ3vpYBmaKnjCmx5wAoZDCUKQ52+u8Wn Xql+p7Cno2GLGLmoH4XZvFR1S7gEDOCmYUKgMOJHsilToIPU9RK2xmc4VmSMQZYMZ7ee 8eN8g2mY/TGg+/0dLZTj4y2YmdBwRxqRp/A+R40/x9zXVSx/R/NZVrmAJlD07a+SziI/ ekCkLg2GSrkbUfahySHvVgeyfeQLB7xV7zlbjRF0f93Evs0pA63jH/FghF7+XXM8lsY6 DbKXr/xjkmrbUwxCoXeKFXXbdP16JRveFPKLvfCAwGshYRuWobmFTndsXtRr8DpeWGft HDlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Vv2C4CFn6Lr0T9Mz9pvxjFBBHMbmfA6gshE/i5YJ3wY=; b=mZk8p2a/+s76gihcNcq7nzGRHWQR+ZRBLVflQD1HG2IldiWgjAHL0JsKk9EtwCVhqK r1ChLenyz0L/d+aMkVbhBKkfi5YxuS99/0OQ9VB3A8+NhE+6E2SqebfzSDWN8PU5fOce ml9ErpMbXwDDfS5u8SxbcXxrl/piFAlIBo+gcX8KWA8/5IZSm/3PC8eT1np236ugcEsc WohVCpRk9WVdDuk/4qBwRouyz7nTJ+0QNhfGwuiydqm+92wgKj8a5aORy5PXNMLSSxsF mEytBaq+5NCbSUmH3upeXxxX/gFnBpn6G+zT0QK6RpthXz1bpHulvjlV3krAnA66zeh6 4+IA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xUmj3em9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q9-20020a05622a04c900b003f392403260si3536524qtx.329.2023.06.23.05.22.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:22:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xUmj3em9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfo8-0005GT-Ux; Fri, 23 Jun 2023 08:22:33 -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 1qCfmv-0003oG-M0 for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:19 -0400 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfmo-0003jZ-KF for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:14 -0400 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-4f86d8a8fd4so709364e87.3 for ; Fri, 23 Jun 2023 05:21:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522869; x=1690114869; 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=Vv2C4CFn6Lr0T9Mz9pvxjFBBHMbmfA6gshE/i5YJ3wY=; b=xUmj3em90TfJf9oMaTvIiRbrRmmnnBJBvZoKf/zJ2R+D7Rt58YhH/8xIojjZ7ANs4m MFLeFWRXQT0g+ZakayLcjuhtkzGXhkmFWXmX5/T+H22csgHJE/mRONYmO+I0tBQI1AVt D0PYIccqSCXb+4l1t8xC2hYitwrwo/Eba/qJJs9dNfKfV+WyVslWJKjCatbHtaUO8AaG e1GWG3CYW4atNTIjLBHOhxemqp/dmMQ15aGcx1wmbu/N/QyM7g4E6iwxYLVs71qTtDDe V4oY4fmvxFTJtcDDwjBqI7j8fvkbysIooIF1jZvfFGWphf+/dKgg4aP0iaA/ovD7f8J3 dNzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522869; x=1690114869; 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=Vv2C4CFn6Lr0T9Mz9pvxjFBBHMbmfA6gshE/i5YJ3wY=; b=OMgRTqlzV4hSLjkymOhGhS90k8zla2JhyUOZwCDFasgr91Ip+qkoDJSwEmvzpyVwQH +H+5Qnyv8uo5uVnhgpqJcA5Hz24tfboZQkm8FI7QNlPaPHewrcJxOM2kvd/MqM4LE5Bp oB+dtvIueu43leXGeFBMAgGbygXm9HgaJTeTEYVzj9yB4ddAPdFPQVVp45RzZmm7Aktd 7+o8O3NhDZuf7s91BMflwk5sT21WV3uAbuNDibUtyXhIHH6ltXWJwWov71GNP/tO/Y2b fgjJyiGsNCeVIBURm3kwvcUuH0fPU/RCZrcWKWHewqsYb13TuRkiA8jaFhB8Scix6q6A p2qw== X-Gm-Message-State: AC+VfDxPFla70yDhkCkpF12bNKk4paad+/BCT19wls1PxAz9Fg3gknJt yoTa4nlDSpmQhYUTSjZlFsCBMw== X-Received: by 2002:a05:6512:60a:b0:4f8:560e:f4d8 with SMTP id b10-20020a056512060a00b004f8560ef4d8mr14531452lfe.6.1687522868850; Fri, 23 Jun 2023 05:21:08 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 7-20020a05600c230700b003fa7b39f13esm1935658wmo.12.2023.06.23.05.21.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6631D1FFC7; Fri, 23 Jun 2023 13:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 16/26] tests/docker: convert riscv64-cross to lcitool Date: Fri, 23 Jun 2023 13:20:50 +0100 Message-Id: <20230623122100.1640995-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::131; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x131.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We still need to base this on Debian Sid until riscv64 is promoted to a release architecture (or another distro provides a full cross compile target). We use the new qemu-minimal project description to avoid bringing in all the extra dependencies because every extra package is another chance for sid to fail. Signed-off-by: Alex Bennée --- .../dockerfiles/debian-riscv64-cross.docker | 119 +++++++++++------- tests/lcitool/projects/qemu-minimal.yml | 4 + tests/lcitool/refresh | 10 +- 3 files changed, 87 insertions(+), 46 deletions(-) diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker index 081404e014..a2d879ee1f 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -1,54 +1,85 @@ +# THIS FILE WAS AUTO-GENERATED # -# Docker cross-compiler target for riscv64 +# $ lcitool dockerfile --layers all --cross riscv64 debian-sid qemu-minimal # -# Currently the only distro that gets close to cross compiling riscv64 -# images is Debian Sid (with unofficial ports). As this is a moving -# target we keep the library list minimal and are aiming to migrate -# from this hack as soon as we are able. -# -FROM docker.io/library/debian:sid-slim +# https://gitlab.com/libvirt/libvirt-ci -# Add ports -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata apt update -yy && \ - DEBIAN_FRONTEND=noninteractive eatmydata apt upgrade -yy - -# Install common build utilities -RUN DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \ - bison \ - bc \ - build-essential \ - ca-certificates \ - debian-ports-archive-keyring \ - dpkg-dev \ - flex \ - gettext \ - git \ - libglib2.0-dev \ - ninja-build \ - pkg-config \ - python3 \ - python3-venv +FROM docker.io/library/debian:sid-slim -# Add ports and riscv64 architecture -RUN echo "deb http://ftp.ports.debian.org/debian-ports/ sid main" >> /etc/apt/sources.list -RUN dpkg --add-architecture riscv64 +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bison \ + ca-certificates \ + ccache \ + findutils \ + flex \ + gcc \ + git \ + libglib2.0-dev \ + locales \ + make \ + meson \ + ninja-build \ + pkgconf \ + python3 \ + python3-venv \ + sed \ + tar && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - gcc-riscv64-linux-gnu \ - libc6-dev-riscv64-cross \ - libfdt-dev:riscv64 \ - libffi-dev:riscv64 \ - libglib2.0-dev:riscv64 \ - libpixman-1-dev:riscv64 +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture riscv64 && \ + eatmydata apt-get install debian-ports-archive-keyring && \ + eatmydata echo 'deb http://ftp.ports.debian.org/debian-ports/ sid main' > /etc/apt/sources.list.d/ports.list && \ + eatmydata echo 'deb http://ftp.ports.debian.org/debian-ports/ unreleased main' >> /etc/apt/sources.list.d/ports.list && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + g++-riscv64-linux-gnu \ + gcc-riscv64-linux-gnu \ + libc6-dev:riscv64 \ + libfdt-dev:riscv64 \ + libffi-dev:riscv64 \ + libglib2.0-dev:riscv64 \ + libpixman-1-dev:riscv64 && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + printf "[binaries]\n\ +c = '/usr/bin/riscv64-linux-gnu-gcc'\n\ +ar = '/usr/bin/riscv64-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/riscv64-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/riscv64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'riscv64'\n\ +cpu = 'riscv64'\n\ +endian = 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-gcc -# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV ABI "riscv64-linux-gnu" +ENV MESON_OPTS "--cross-file=riscv64-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=riscv64-linux-gnu- ENV DEF_TARGET_LIST riscv64-softmmu,riscv64-linux-user # As a final step configure the user (if env is defined) diff --git a/tests/lcitool/projects/qemu-minimal.yml b/tests/lcitool/projects/qemu-minimal.yml index 507f1f6881..a977a51ab6 100644 --- a/tests/lcitool/projects/qemu-minimal.yml +++ b/tests/lcitool/projects/qemu-minimal.yml @@ -4,6 +4,8 @@ packages: - bash - bc - bison + - ccache + - findutils - flex - g++ - gcc @@ -21,3 +23,5 @@ packages: - pkg-config - python3 - python3-venv + - sed + - tar diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 5e06fb2cf5..b54566edcc 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -63,12 +63,12 @@ add_user_mapping = [ " id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi\n" ] -def generate_dockerfile(host, target, cross=None, trailer=None): +def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None): filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker") cmd = lcitool_cmd + ["dockerfile"] if cross is not None: cmd.extend(["--cross", cross]) - cmd.extend([target, "qemu"]) + cmd.extend([target, project]) if trailer is not None: trailer += "\n".join(add_user_mapping) @@ -164,6 +164,12 @@ try: trailer=cross_build("powerpc64le-linux-gnu-", "ppc64-softmmu,ppc64-linux-user")) + generate_dockerfile("debian-riscv64-cross", "debian-sid", + project="qemu-minimal", + cross="riscv64", + trailer=cross_build("riscv64-linux-gnu-", + "riscv64-softmmu,riscv64-linux-user")) + generate_dockerfile("debian-s390x-cross", "debian-11", cross="s390x", trailer=cross_build("s390x-linux-gnu-", From patchwork Fri Jun 23 12:20:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695266 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1926429wrm; Fri, 23 Jun 2023 05:37:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Tig9hpEzHgCii1bH3Y+y3ZQAz7sV9u/mtvZvlN1HFaM8AXOLKmOhhJytpUKKUhFqkE5CL X-Received: by 2002:a05:622a:130d:b0:400:8d7a:a302 with SMTP id v13-20020a05622a130d00b004008d7aa302mr778431qtk.18.1687523823984; Fri, 23 Jun 2023 05:37:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523823; cv=none; d=google.com; s=arc-20160816; b=LACyxpkmwoCUdcHelQFqYHI+B+bwh8adTPspGVTq93Q1jIcxe1VGF28X4da3M502wE q2VXhVfGFXA04gMTWr2ZwIfarOSjEwynv6V4bJLhEhOiOBOdj+Ws9a45OK8WRo2yN1qS 0KY6Ln8Xo1ZPnikrPpFZzRieeo7ONRrMGjqq/foZyHue6qN2L8O1PvgPVgp8YnhAYExH murf/tenbjBhGWey1JuoDVH/qhs1HnOex/y/hPL6QKTxQVtsAI3vAxq+QzyJSYxB3wQH G36ET72QBXOMcau42q0pdawJQHe/NmjWPUxyqyV5YJXkL7WYXRd0PQ9g+0Cl9NP5q/bM e+Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KBdNTeWY2HuOCU9nu+Z3lWX8HamSwCQjIvaXqYAw/FM=; b=Q4nKC989fpRP5wYR4tx2p/rwkD26LB3cghl/txKBXSXqwxeletw672IGoBnRh12Swm iCWID0+Ay/6zqEFqPdPDbZ27MeMnQlFlFTeG1FDZxABaek6mQKLPhP9ZZLYztb/DH9SP YD4VuySQ6IAp1hz4am4cy3i5sPV+UfOGXj6IuPpZ1HNgO62txb7SXTRj2q7IKiUn59mV uRttFgs7BVatSURz+Y5D/Rca2IN23F1sXr7QYi/x6LcL0tF2Gus5ZCanLXcEfn5gt/9+ UArnSSnHt7ye4UozYnJXCJtaVSIfUbHB+0qgJl8bEsN4l+iz5qN+/TvzbWoQBACVNg/k FpZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cxAUoZ9Q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t17-20020a05622a149100b003ff212f9382si1033764qtx.478.2023.06.23.05.37.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:37:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cxAUoZ9Q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfwf-0001M9-H6; Fri, 23 Jun 2023 08:31: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 1qCfwJ-0001AQ-RF for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:31:01 -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 1qCfwD-0000UB-8z for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:30:58 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3112902f785so1715129f8f.0 for ; Fri, 23 Jun 2023 05:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687523452; x=1690115452; 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=KBdNTeWY2HuOCU9nu+Z3lWX8HamSwCQjIvaXqYAw/FM=; b=cxAUoZ9QqI5vpS0Gf2MwXF96k47tsBIYETssMEAeR/6PVVyCDclikStNnXkjx8jEaq 5dkTwIBzNHv4rPbznJfZwBQVQScBWuxUGRGIfTXSbdPY0VJy3wXz8NhxtaGKDt2VQuQe RQRHOyw+R3Cg4jxt9Aq8owKAeEJuTsrwr4zjGwQEa2PQS0YdbUYJxERZQiBFGcfkZXLe 1U+L8kWLZ26YRR82GVoLHa8zshMUblXGaq6qs9DdrXx4lw2kuLJq0X7oFDgeycdne2/A 5eobd08aeaafITnlD6Q+LuijM5592ZdbyXAmRvxDpy1CrCAKvLSF2OAKp+qWsZMt86l7 38QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687523452; x=1690115452; 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=KBdNTeWY2HuOCU9nu+Z3lWX8HamSwCQjIvaXqYAw/FM=; b=kwOLedQGFYp0OLv1N87j86C7sxHwpcmaTb+L6UC1J4QiQ2wffH2bMZLCYw+/kKwyKU wYQknVVeuR/hfggalorkYzzMfaVyR5tsucqeKK7e+Kpo/4kbM13jMYYdoUxKcKnXr+WO 9V7qlgp1caM4qvCc7jc8f9SoDaPRYyGb+0dY8GZo8PLKNfVVZP4Qmq1GcyGRoD0VmH16 vfspynKX0sEc6zByrZ8m6s7uLXz/qgrCZS6cnArMpSMfQboqw9UWz57n9TA8/gVpRtfc 0nn5oU1GKeobTW57j3QHkssO5xVUPkq8t7LQ5Vjy6EUgtOdqflB8vTCokRjoVyAqqVMc j7uA== X-Gm-Message-State: AC+VfDwf5zC5uqh+UU1rPdW4SlF0juvVpXUd4cAia5AKsvsq6W4YjVsi GezIiJ2vS0PWtXctG9pvzGR8jQ== X-Received: by 2002:adf:e403:0:b0:311:10ae:123e with SMTP id g3-20020adfe403000000b0031110ae123emr21026341wrm.2.1687523451874; Fri, 23 Jun 2023 05:30:51 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p16-20020a5d6390000000b003113943bb66sm9344371wru.110.2023.06.23.05.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:30:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7EF031FFC8; Fri, 23 Jun 2023 13:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 17/26] tests/avocado: update firmware to enable sbsa-ref/max Date: Fri, 23 Jun 2023 13:20:51 +0100 Message-Id: <20230623122100.1640995-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marcin Juszkiewicz Update prebuilt firmware images to have TF-A with FEAT_FGT support enabled. This allowed us to enable test for "max" cpu in sbsa-ref machine. Signed-off-by: Marcin Juszkiewicz Message-Id: <20230530152240.79160-1-marcin.juszkiewicz@linaro.org> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/avocado/machine_aarch64_sbsaref.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py index 0a79fa7ab6..35f8042416 100644 --- a/tests/avocado/machine_aarch64_sbsaref.py +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -29,23 +29,23 @@ def fetch_firmware(self): """ Flash volumes generated using: - - Fedora GNU Toolchain version 12.2.1 20220819 (Red Hat Cross 12.2.1-2) + - Fedora GNU Toolchain version 13.1.1 20230511 (Red Hat 13.1.1-2) - Trusted Firmware-A - https://github.com/ARM-software/arm-trusted-firmware/tree/5fdb2e54 + https://github.com/ARM-software/arm-trusted-firmware/tree/c0d8ee38 - Tianocore EDK II - https://github.com/tianocore/edk2/tree/494127613b - https://github.com/tianocore/edk2-non-osi/tree/41876073 - https://github.com/tianocore/edk2-platforms/tree/8efa4f42 + https://github.com/tianocore/edk2/tree/0f9283429dd4 + https://github.com/tianocore/edk2-non-osi/tree/f0bb00937ad6 + https://github.com/tianocore/edk2-platforms/tree/7880b92e2a04 """ # Secure BootRom (TF-A code) fs0_xz_url = ( - "https://fileserver.linaro.org/s/ATnSmq6k8SoXgbH/" + "https://fileserver.linaro.org/s/HrYMCjP7MEccjRP/" "download/SBSA_FLASH0.fd.xz" ) - fs0_xz_hash = "a210a09692bcbe0a3743ffd0df44e80e0c7ad8ab" + fs0_xz_hash = "447eff64a90b84ce47703c6ec41fbfc25befaaea" tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash) archive.extract(tar_xz_path, self.workdir) fs0_path = os.path.join(self.workdir, "SBSA_FLASH0.fd") @@ -93,15 +93,15 @@ def test_sbsaref_edk2_firmware(self): # AP Trusted ROM wait_for_console_pattern(self, "Booting Trusted Firmware") - wait_for_console_pattern(self, "BL1: v2.8(release):v2.8") + wait_for_console_pattern(self, "BL1: v2.9(release):v2.9") wait_for_console_pattern(self, "BL1: Booting BL2") # Trusted Boot Firmware - wait_for_console_pattern(self, "BL2: v2.8(release)") + wait_for_console_pattern(self, "BL2: v2.9(release)") wait_for_console_pattern(self, "Booting BL31") # EL3 Runtime Software - wait_for_console_pattern(self, "BL31: v2.8(release)") + wait_for_console_pattern(self, "BL31: v2.9(release)") # Non-trusted Firmware wait_for_console_pattern(self, "UEFI firmware (version 1.0") @@ -150,7 +150,7 @@ def test_sbsaref_alpine_linux_neoverse_n1(self): """ self.boot_alpine_linux("neoverse-n1") - @skip("requires TF-A update to handle FEAT_FGT") + @skipUnless(os.getenv("AVOCADO_TIMEOUT_EXPECTED"), "Test might timeout") def test_sbsaref_alpine_linux_max(self): """ :avocado: tags=cpu:max From patchwork Fri Jun 23 12:20:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695270 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1926746wrm; Fri, 23 Jun 2023 05:37:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6fcckXJgiYB+alQ4ukHwuv/VxWbTko9epYskXylXfwLlmkoCV0361KKRepbd9SLoBlLDPt X-Received: by 2002:a05:6214:2249:b0:626:3a5a:f8e9 with SMTP id c9-20020a056214224900b006263a5af8e9mr30313628qvc.54.1687523868151; Fri, 23 Jun 2023 05:37:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523868; cv=none; d=google.com; s=arc-20160816; b=fx881qd704TfAkpquC2d1d4/o4cl6+1GDqFy06+X5+8m2y9HAeBrRIOtgldjPI5B/v I4HCWZ81pgM5n6ZLmC1G1oo4B/rqgoypN8B6U6ddjCXnTcz1Oo7TuOfg1PKvr+TK6Tmz mrqiuxHwgjXyKvhFiyu3ihv2vs5OgE1AiTAykBptJgQFZ6CpwW8zVqX33AL/mCkGDCP/ 2LcvXUXDe62uPqevV3GeSaB+ty53GVWc3XhhMbni+mjaTtP8HVAYRWjyXVB4Ez3tZtUW ud6YdxmxEgSAEPu19MzGBsUEDS2Mid/NnCv7VwHc88h8V3K7hBkJgy/SafI98xoQBMv+ xCpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wPK5DhpLqyMeAkn7VW62bkSteaFXBRMZ0gmIHTqZJT4=; b=TYSvrlFUPKuqzL+H01Mu2TAqOMEkoVic9xyPHHOBCZmCf5Cpwrm30sxxqgsOor9/e8 q7K5CxVgCfQVDc56bNnn2rYEA1WaG5e2T135AgyGrOJVqkjBfRya1OTHj1iEcIo1scOj Gp6S3V0xvIrCVYIGdaJBG4ou8dTCpzFuunHBdN6tvVqInnH/iRB8GfzfVVo2WlNDy2bu YSikugeVXdQ3jBrz3EcBDowuq+YdTzHWJRNPAKEShlxcnJLhbJEyn8TeW2SvzfieRFIP ohKu0xELVrEmbOfB3aAIemrdmnPvBxfVvQAYvygKBxOEPY6WadZtUGhD6hy1YJOh5u1q 6xOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cKNCyNJy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q14-20020ad45cae000000b006300516b58dsi3672539qvh.185.2023.06.23.05.37.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:37:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cKNCyNJy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfwf-0001MC-N7; Fri, 23 Jun 2023 08:31: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 1qCfwL-0001C8-L7 for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:31:02 -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 1qCfwD-0000UN-NE for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:31:00 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3fa7512e599so7291545e9.2 for ; Fri, 23 Jun 2023 05:30:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687523452; x=1690115452; 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=wPK5DhpLqyMeAkn7VW62bkSteaFXBRMZ0gmIHTqZJT4=; b=cKNCyNJyofsKiPnT4DfdHk+eft5SPwCiYdQQFL43yFMUpsqigN9FbICQKaJocNDRqy E8afa9hufl/KDHOQPBASbaHV+usMtk6rg0WjURR93ztcufMG5E8q8Ns5CSnYcog4Msz1 S4fl6jUQVmY225/Pi2wUkUpcg4igpx6wlGPhGSQThF7mHeeaD64LYopk1OzTg3Iar62W BgMDDACtgnA4/nkcbhn6CQcgy8EpYPV+Y/S5w+kipbBL4El9CY34iTZoK68bkaQr9sEb MZfaVS2sKNyeKli+lmMYJ/m+5OyS1NXFx7VnP7nuMX4jjekgWqVOiBIj8ijHI0FcODgI yLNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687523452; x=1690115452; 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=wPK5DhpLqyMeAkn7VW62bkSteaFXBRMZ0gmIHTqZJT4=; b=AvuNffPJLEvE1j4x2HprjPV6RungRNtYgynkxeeRVo7Zp8xEHrcQA0pr+e0HViO9P8 yqEA/Xfk/IIvCVkRcir9ry27LZZwvBZnw4+gtPXjjww5LameMfdy3BY39CUNpeZ23r8k +lhC6c+Ok747QqhQ/XbS3eJePSGi9WhU59fhn8mplvJmvFl1TT6KyKMU263omF02pgie SMlbjxYap2dR/+RANdyfw/QGEb5aa9fMp9n3rOJBk08gVKeVD7I8Vw6FNWkBcf0ERZo2 RwWzbjgn6dTvbGFPn8umi4Qk5az0m9y5VrWgOmE1Ad9IBW2QRl5lmyTL49MSp4EsJ4yK 6x6g== X-Gm-Message-State: AC+VfDzXn0O8y+yfYOBFe+ODVrSBsTJ74WAsPy+1VDwgDtTfSdoB+7bl TqDHzgmel7YYmTGVXknznDgyrw== X-Received: by 2002:a05:600c:210d:b0:3fa:7994:5212 with SMTP id u13-20020a05600c210d00b003fa79945212mr2278826wml.36.1687523452061; Fri, 23 Jun 2023 05:30:52 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 21-20020a05600c22d500b003f9cb3c8958sm2299922wmg.3.2023.06.23.05.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:30:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A4B8E1FFC9; Fri, 23 Jun 2023 13:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= , Robert Henry , Aaron Lindsay Subject: [PATCH 18/26] plugins: force slow path when plugins instrument memory ops Date: Fri, 23 Jun 2023 13:20:52 +0100 Message-Id: <20230623122100.1640995-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The lack of SVE memory instrumentation has been an omission in plugin handling since it was introduced. Fortunately we can utilise the probe_* functions to force all all memory access to follow the slow path. We do this by checking the access type and presence of plugin memory callbacks and if set return the TLB_MMIO flag. We have to jump through a few hoops in user mode to re-use the flag but it was the desired effect: ./qemu-system-aarch64 -display none -serial mon:stdio \ -M virt -cpu max -semihosting-config enable=on \ -kernel ./tests/tcg/aarch64-softmmu/memory-sve \ -plugin ./contrib/plugins/libexeclog.so,ifilter=st1w,afilter=0x40001808 -d plugin gives (disas doesn't currently understand st1w): 0, 0x40001808, 0xe54342a0, ".byte 0xa0, 0x42, 0x43, 0xe5", store, 0x40213010, RAM, store, 0x40213014, RAM, store, 0x40213018, RAM And for user-mode: ./qemu-aarch64 \ -plugin contrib/plugins/libexeclog.so,afilter=0x4007c0 \ -d plugin \ ./tests/tcg/aarch64-linux-user/sha512-sve gives: 1..10 ok 1 - do_test(&tests[i]) 0, 0x4007c0, 0xa4004b80, ".byte 0x80, 0x4b, 0x00, 0xa4", load, 0x5500800370, load, 0x5500800371, load, 0x5500800372, load, 0x5500800373, load, 0x5500800374, load, 0x5500800375, load, 0x5500800376, load, 0x5500800377, load, 0x5500800378, load, 0x5500800379, load, 0x550080037a, load, 0x550080037b, load, 0x550080037c, load, 0x550080037d, load, 0x550080037e, load, 0x550080037f, load, 0x5500800380, load, 0x5500800381, load, 0x5500800382, load, 0x5500800383, load, 0x5500800384, load, 0x5500800385, load, 0x5500800386, lo ad, 0x5500800387, load, 0x5500800388, load, 0x5500800389, load, 0x550080038a, load, 0x550080038b, load, 0x550080038c, load, 0x550080038d, load, 0x550080038e, load, 0x550080038f, load, 0x5500800390, load, 0x5500800391, load, 0x5500800392, load, 0x5500800393, load, 0x5500800394, load, 0x5500800395, load, 0x5500800396, load, 0x5500800397, load, 0x5500800398, load, 0x5500800399, load, 0x550080039a, load, 0x550080039b, load, 0x550080039c, load, 0x550080039d, load, 0x550080039e, load, 0x550080039f, load, 0x55008003a0, load, 0x55008003a1, load, 0x55008003a2, load, 0x55008003a3, load, 0x55008003a4, load, 0x55008003a5, load, 0x55008003a6, load, 0x55008003a7, load, 0x55008003a8, load, 0x55008003a9, load, 0x55008003aa, load, 0x55008003ab, load, 0x55008003ac, load, 0x55008003ad, load, 0x55008003ae, load, 0x55008003af (4007c0 is the ld1b in the sha512-sve) Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Cc: Robert Henry Cc: Aaron Lindsay --- include/exec/cpu-all.h | 2 +- include/hw/core/cpu.h | 17 +++++++++++++++++ accel/tcg/cputlb.c | 4 +++- accel/tcg/user-exec.c | 6 +++++- target/arm/tcg/sve_helper.c | 4 ---- tests/tcg/aarch64/Makefile.target | 8 ++++++++ 6 files changed, 34 insertions(+), 7 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 09bf4c0cc6..2b10173c61 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -301,7 +301,7 @@ CPUArchState *cpu_copy(CPUArchState *env); * be signaled by probe_access_flags(). */ #define TLB_INVALID_MASK (1 << (TARGET_PAGE_BITS_MIN - 1)) -#define TLB_MMIO 0 +#define TLB_MMIO (1 << (TARGET_PAGE_BITS_MIN - 2)) #define TLB_WATCHPOINT 0 #else diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 4871ad85f0..21c672ae4e 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -980,6 +980,23 @@ void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint); void cpu_watchpoint_remove_all(CPUState *cpu, int mask); #endif +/** + * cpu_plugin_mem_cbs_enabled() - are plugin memory callbacks enabled? + * @cs: CPUState pointer + * + * The memory callbacks are installed if a plugin has instrumented an + * instruction for memory. This can be useful to know if you want to + * force a slow path for a series of memory accesses. + */ +static inline bool cpu_plugin_mem_cbs_enabled(const CPUState *cpu) +{ +#ifdef CONFIG_PLUGIN + return !!cpu->plugin_mem_cbs; +#else + return false; +#endif +} + /** * cpu_get_address_space: * @cpu: CPU to get address space from diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 14ce97c33b..e2888a7e7a 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1544,7 +1544,9 @@ static int probe_access_internal(CPUArchState *env, target_ulong addr, *pfull = &env_tlb(env)->d[mmu_idx].fulltlb[index]; /* Fold all "mmio-like" bits into TLB_MMIO. This is not RAM. */ - if (unlikely(flags & ~(TLB_WATCHPOINT | TLB_NOTDIRTY))) { + if (unlikely(flags & ~(TLB_WATCHPOINT | TLB_NOTDIRTY)) + || + (access_type != MMU_INST_FETCH && cpu_plugin_mem_cbs_enabled(env_cpu(env)))) { *phost = NULL; return TLB_MMIO; } diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index dc8d6b5d40..633eee7699 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -745,6 +745,10 @@ static int probe_access_internal(CPUArchState *env, target_ulong addr, if (guest_addr_valid_untagged(addr)) { int page_flags = page_get_flags(addr); if (page_flags & acc_flag) { + if ((acc_flag == PAGE_READ || acc_flag == PAGE_WRITE) + && cpu_plugin_mem_cbs_enabled(env_cpu(env))) { + return TLB_MMIO; + } return 0; /* success */ } maperr = !(page_flags & PAGE_VALID); @@ -767,7 +771,7 @@ int probe_access_flags(CPUArchState *env, target_ulong addr, int size, g_assert(-(addr | TARGET_PAGE_MASK) >= size); flags = probe_access_internal(env, addr, size, access_type, nonfault, ra); - *phost = flags ? NULL : g2h(env_cpu(env), addr); + *phost = (flags & TLB_INVALID_MASK) ? NULL : g2h(env_cpu(env), addr); return flags; } diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index 0097522470..7c103fc9f7 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -5688,9 +5688,6 @@ void sve_ldN_r(CPUARMState *env, uint64_t *vg, const target_ulong addr, flags = info.page[0].flags | info.page[1].flags; if (unlikely(flags != 0)) { -#ifdef CONFIG_USER_ONLY - g_assert_not_reached(); -#else /* * At least one page includes MMIO. * Any bus operation can fail with cpu_transaction_failed, @@ -5727,7 +5724,6 @@ void sve_ldN_r(CPUARMState *env, uint64_t *vg, const target_ulong addr, memcpy(&env->vfp.zregs[(rd + i) & 31], &scratch[i], reg_max); } return; -#endif } /* The entire operation is in RAM, on valid pages. */ diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 3430fd3cd8..cec1d4b287 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -91,6 +91,14 @@ sha512-vector: sha512.c TESTS += sha512-vector +ifneq ($(CROSS_CC_HAS_SVE),) +sha512-sve: CFLAGS=-O3 -march=armv8.1-a+sve +sha512-sve: sha512.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) + +TESTS += sha512-sve +endif + ifeq ($(HOST_GDB_SUPPORTS_ARCH),y) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py From patchwork Fri Jun 23 12:20:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695242 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1920749wrm; Fri, 23 Jun 2023 05:24:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5+Z6WZcnRiz7WoYMRmlFrR/9eUNuenXXSV1A8SVVKProybAMJXYMOU5GV8ZiDOErdDrAk9 X-Received: by 2002:a05:6214:500c:b0:62f:ebc4:89c1 with SMTP id jo12-20020a056214500c00b0062febc489c1mr32150766qvb.55.1687523061588; Fri, 23 Jun 2023 05:24:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523061; cv=none; d=google.com; s=arc-20160816; b=Hc9Mz9W5GrVGf+UQj2y79oXLU2s6+YRBJQFh9N+V/eZK/7d8KK+ROjtLmdGMiSmDBP GiVax+ZEfoU3RbV/Bcw3Vc5he56YuhLMR5KWqfggB2xBIE325UTvQTdEQuLvS9JNIx2u t6wfZb9hMi/Eb31SvZHK2okrZze2T7w/mg676ylCgq9Q8Rpq5rWVG265dxaczYhjnJJL TiZP/O4zjXmdtlkl5W1g2SXQeDZLrPBOOa460sP5LwHLgvj2tc4wN8VSHwiIctFrOA9A xY5i7lCk/MfVkPHfrEiXXhr8Oid3SwnahMQrLBKzKqN3LR6qsrCW/MDmj3XClfrxWoIt wI0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DQhWpZw084Ja0HJjsgxPSzSU22UDw5r1FrOeDB0PeQQ=; b=ah6ImA4cqLRvND9H3tuVAUnDYnJz8GkuyY8BmSFUu8/Od7ljIrdeh3P2k9DMGNVcHI gJreX8QB1wPkLYpccga8bOefaL/iWtyqre36OEMnKwGr8fVA26ex0MSjnxARLGwgG+8i Q1BlbiBppeqIPYtNabxKM1g4l+lBxGDu4Lf93rrpOoxBaQXZe0LTaaHx6mDMN/yALwfN 3eAd6SJZxlMfuJCh9JbmSwMZT04aX50B4tI36WCYEu0YpmDtkoZqsVKCpJkWtuqFy8tw 3WZJRvSuBWzgZY1Xm+wp55bXq5Z2UsEOre4RR0/18UlB21wpPb+RHT1mYmJYUWZj99yy WO1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GbbzEd+r; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 1-20020a0562140d4100b0063017dd53fbsi3561984qvr.372.2023.06.23.05.24.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:24:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GbbzEd+r; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfoS-0006Pf-9a; Fri, 23 Jun 2023 08:22:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCfn3-0003pa-Re for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:27 -0400 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfmq-0003jm-JK for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:21:20 -0400 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-4f955def3a5so689444e87.0 for ; Fri, 23 Jun 2023 05:21:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687522869; x=1690114869; 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=DQhWpZw084Ja0HJjsgxPSzSU22UDw5r1FrOeDB0PeQQ=; b=GbbzEd+rGxZc3MA+oOcAL5QGFnsZYNSjdqKC+IO98AYrHiIviDCI9Aor99VSRmWfrd a0+HUhPmJd0p9Q2d8E+q7m0WDI3fLz4XBCIzkLlqbVplULPX2luzvBB8Bt1QOrEr3Rz0 +LG7Rj4eneS1DRJ6p3TfeexkTal4eYi6hU88vuuMY/dbT0LUlrd339IUcXo9gCmb3CWg 34YLcPW0y6rpGmwtPN/x0vcuVsxtMpTUXqnpDWCJKLQ3hCmSKLqn7i6D2orqXRP19c6N lX1i7WL3O/B9QiiCk3iv/dtN+d5AxrMsKLsarkiEjwA1rZG4cVe3wP7RsVcMn4+2NFfL TOAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687522869; x=1690114869; 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=DQhWpZw084Ja0HJjsgxPSzSU22UDw5r1FrOeDB0PeQQ=; b=ZaeD0RiNxZPLX8SL+KUuRZ+wDidtl39If2lUO0YpszEV0Pz+P1dQKdpgQL3WbxtTux zQ36o6fBmCh7Z75iy9oMz5YvPHMW5/z+Q2JNX4fR/U3lG9DM2mE3V2t++VwVK3mwI4wP z55y167ozOLULBNP238Io4TEbuLKmDgKMS57nq4JPDm2K+lLP+VDoLaWGBqMDav2yCnc 9iK0oLw9nW7se7O5cBWddhdB4Vd6IU55Diz1TzbmFfTjKt7EGfBm7D9fa9HgL0GpYKMr dQuCA8h3+6gx6Fc1cDXZRL44uPK7fDVQpPxJBGzAI3XyVaznn9x+16OaBTfJRYyzQTCz bBeQ== X-Gm-Message-State: AC+VfDx0o0y/lIRUFtnl1DJX+fCbxqkol7IYLdUXXJGo6BzgxFrcFrZu qNCAazF62iJh1UXjkmPgtrOdKw== X-Received: by 2002:a19:f201:0:b0:4f7:b640:fa40 with SMTP id q1-20020a19f201000000b004f7b640fa40mr11602940lfh.43.1687522869138; Fri, 23 Jun 2023 05:21:09 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a6-20020adffac6000000b0030aefa3a957sm9442679wrs.28.2023.06.23.05.21.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:21:08 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D844C1FFCA; Fri, 23 Jun 2023 13:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 19/26] plugins: fix memory leak while parsing options Date: Fri, 23 Jun 2023 13:20:53 +0100 Message-Id: <20230623122100.1640995-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::133; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x133.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org It was hard to track down this leak as it was an internal allocation by glib and the backtraces did not give much away. The autofree was freeing the allocation with g_free() but not taking care of the individual strings. They should have been freed with g_strfreev() instead. Searching the glib source code for the correct string free function led to: G_DEFINE_AUTO_CLEANUP_FREE_FUNC(GStrv, g_strfreev, NULL) and indeed if you read to the bottom of the documentation page you will find: typedef gchar** GStrv; A typedef alias for gchar**. This is mostly useful when used together with g_auto(). So fix up all the g_autofree g_strsplit case that smugly thought they had de-allocation covered. Message-Id: <20230519170454.2353945-3-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- contrib/plugins/cache.c | 2 +- contrib/plugins/drcov.c | 2 +- contrib/plugins/execlog.c | 2 +- contrib/plugins/hotblocks.c | 2 +- contrib/plugins/hotpages.c | 2 +- contrib/plugins/howvec.c | 2 +- contrib/plugins/hwprofile.c | 2 +- contrib/plugins/lockstep.c | 2 +- tests/plugin/bb.c | 2 +- tests/plugin/insn.c | 2 +- tests/plugin/mem.c | 2 +- tests/plugin/syscall.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/plugins/cache.c b/contrib/plugins/cache.c index 2e25184a7f..5036213f1b 100644 --- a/contrib/plugins/cache.c +++ b/contrib/plugins/cache.c @@ -772,7 +772,7 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, for (i = 0; i < argc; i++) { char *opt = argv[i]; - g_autofree char **tokens = g_strsplit(opt, "=", 2); + g_auto(GStrv) tokens = g_strsplit(opt, "=", 2); if (g_strcmp0(tokens[0], "iblksize") == 0) { l1_iblksize = STRTOLL(tokens[1]); diff --git a/contrib/plugins/drcov.c b/contrib/plugins/drcov.c index b4a855adaf..686ae0a537 100644 --- a/contrib/plugins/drcov.c +++ b/contrib/plugins/drcov.c @@ -148,7 +148,7 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, int argc, char **argv) { for (int i = 0; i < argc; i++) { - g_autofree char **tokens = g_strsplit(argv[i], "=", 2); + g_auto(GStrv) tokens = g_strsplit(argv[i], "=", 2); if (g_strcmp0(tokens[0], "filename") == 0) { file_name = g_strdup(tokens[1]); } diff --git a/contrib/plugins/execlog.c b/contrib/plugins/execlog.c index e255bd21fd..7129d526f8 100644 --- a/contrib/plugins/execlog.c +++ b/contrib/plugins/execlog.c @@ -227,7 +227,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, for (int i = 0; i < argc; i++) { char *opt = argv[i]; - g_autofree char **tokens = g_strsplit(opt, "=", 2); + g_auto(GStrv) tokens = g_strsplit(opt, "=", 2); if (g_strcmp0(tokens[0], "ifilter") == 0) { parse_insn_match(tokens[1]); } else if (g_strcmp0(tokens[0], "afilter") == 0) { diff --git a/contrib/plugins/hotblocks.c b/contrib/plugins/hotblocks.c index 062200a7a4..6b74d25fea 100644 --- a/contrib/plugins/hotblocks.c +++ b/contrib/plugins/hotblocks.c @@ -135,7 +135,7 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, { for (int i = 0; i < argc; i++) { char *opt = argv[i]; - g_autofree char **tokens = g_strsplit(opt, "=", 2); + g_auto(GStrv) tokens = g_strsplit(opt, "=", 2); if (g_strcmp0(tokens[0], "inline") == 0) { if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &do_inline)) { fprintf(stderr, "boolean argument parsing failed: %s\n", opt); diff --git a/contrib/plugins/hotpages.c b/contrib/plugins/hotpages.c index 0d12910af6..8316ae50c7 100644 --- a/contrib/plugins/hotpages.c +++ b/contrib/plugins/hotpages.c @@ -169,7 +169,7 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, for (i = 0; i < argc; i++) { char *opt = argv[i]; - g_autofree char **tokens = g_strsplit(opt, "=", -1); + g_auto(GStrv) tokens = g_strsplit(opt, "=", -1); if (g_strcmp0(tokens[0], "sortby") == 0) { if (g_strcmp0(tokens[1], "reads") == 0) { diff --git a/contrib/plugins/howvec.c b/contrib/plugins/howvec.c index 4a5ec3d936..0ed01ea931 100644 --- a/contrib/plugins/howvec.c +++ b/contrib/plugins/howvec.c @@ -333,7 +333,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, for (i = 0; i < argc; i++) { char *p = argv[i]; - g_autofree char **tokens = g_strsplit(p, "=", -1); + g_auto(GStrv) tokens = g_strsplit(p, "=", -1); if (g_strcmp0(tokens[0], "inline") == 0) { if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &do_inline)) { fprintf(stderr, "boolean argument parsing failed: %s\n", p); diff --git a/contrib/plugins/hwprofile.c b/contrib/plugins/hwprofile.c index 691d4edb0c..739ac0c66b 100644 --- a/contrib/plugins/hwprofile.c +++ b/contrib/plugins/hwprofile.c @@ -263,7 +263,7 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, for (i = 0; i < argc; i++) { char *opt = argv[i]; - g_autofree char **tokens = g_strsplit(opt, "=", 2); + g_auto(GStrv) tokens = g_strsplit(opt, "=", 2); if (g_strcmp0(tokens[0], "track") == 0) { if (g_strcmp0(tokens[1], "read") == 0) { diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c index a41ffe83fa..e36f0b9562 100644 --- a/contrib/plugins/lockstep.c +++ b/contrib/plugins/lockstep.c @@ -323,7 +323,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, for (i = 0; i < argc; i++) { char *p = argv[i]; - g_autofree char **tokens = g_strsplit(p, "=", 2); + g_auto(GStrv) tokens = g_strsplit(p, "=", 2); if (g_strcmp0(tokens[0], "verbose") == 0) { if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &verbose)) { diff --git a/tests/plugin/bb.c b/tests/plugin/bb.c index 7d470a1011..df50d1fd3b 100644 --- a/tests/plugin/bb.c +++ b/tests/plugin/bb.c @@ -104,7 +104,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, for (i = 0; i < argc; i++) { char *opt = argv[i]; - g_autofree char **tokens = g_strsplit(opt, "=", 2); + g_auto(GStrv) tokens = g_strsplit(opt, "=", 2); if (g_strcmp0(tokens[0], "inline") == 0) { if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &do_inline)) { fprintf(stderr, "boolean argument parsing failed: %s\n", opt); diff --git a/tests/plugin/insn.c b/tests/plugin/insn.c index cd5ea5d4ae..e251a84d86 100644 --- a/tests/plugin/insn.c +++ b/tests/plugin/insn.c @@ -196,7 +196,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, { for (int i = 0; i < argc; i++) { char *opt = argv[i]; - g_autofree char **tokens = g_strsplit(opt, "=", 2); + g_auto(GStrv) tokens = g_strsplit(opt, "=", 2); if (g_strcmp0(tokens[0], "inline") == 0) { if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &do_inline)) { fprintf(stderr, "boolean argument parsing failed: %s\n", opt); diff --git a/tests/plugin/mem.c b/tests/plugin/mem.c index 4570f7d815..f3b9f696a0 100644 --- a/tests/plugin/mem.c +++ b/tests/plugin/mem.c @@ -83,7 +83,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, for (int i = 0; i < argc; i++) { char *opt = argv[i]; - g_autofree char **tokens = g_strsplit(opt, "=", 2); + g_auto(GStrv) tokens = g_strsplit(opt, "=", 2); if (g_strcmp0(tokens[0], "haddr") == 0) { if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &do_haddr)) { diff --git a/tests/plugin/syscall.c b/tests/plugin/syscall.c index 96040c578f..72e1a5bf90 100644 --- a/tests/plugin/syscall.c +++ b/tests/plugin/syscall.c @@ -121,7 +121,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, for (int i = 0; i < argc; i++) { char *opt = argv[i]; - g_autofree char **tokens = g_strsplit(opt, "=", 2); + g_auto(GStrv) tokens = g_strsplit(opt, "=", 2); if (g_strcmp0(tokens[0], "print") == 0) { if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &do_print)) { From patchwork Fri Jun 23 12:20:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695249 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1924200wrm; Fri, 23 Jun 2023 05:32:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ693kXo1qucEnbI8x5ckLzInopGgnbRPRbgEBn12+o0FI/nUeHiaJFW5ZexMJyUZk97RH5v X-Received: by 2002:a05:620a:28c1:b0:75d:50bb:b173 with SMTP id l1-20020a05620a28c100b0075d50bbb173mr25693807qkp.16.1687523532847; Fri, 23 Jun 2023 05:32:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523532; cv=none; d=google.com; s=arc-20160816; b=dPHKnlkW6OiYPdhek5KbaN2GHqlWrovmbcLRGtbZzjRfQsnYR30XK9kKBgNavPlP+4 UBW05S+8mD/LtGHCY9/4lTNMo+yhW+cab3ik7A5kVxHCWLlZ2UGJOUU8J7NZiaRhsEEO IH6+4ghZdbpF1f9gQJvV0xa70VYFm5es+RSGrcFwOo/QBtW1jnlTNxynCVeCEiMh0vRD 5r890gdtXC07XshHE4gzGBYLNg4rutRRzBEcWt2YQArLDBRbDrGECQSf+9P8C+0h9jgc uwHzw4u5ID+cLscYKMhGsQY/+ROEBqn61sFNl1czw+8JssaliGZOk9Ux+/ODXB1G21tC Jw3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BBI1EKXYVa+WMuYu7l3ZX5976guHRdH5nUfqC+4pCho=; b=I9k9kdKA4e4i7wdp4g10WAfEHac1an/6DziGGGyO7r5ATBBSGj2RHdLkdfLZ4ZyD1y HKQb2YgSC5uqKvMPergJXN9ncWl4F8MfDhzIZH8fnATzjRDR34T9mfjnlgQvZcwt2QHg JdOgU+ZM+MflVhe3vufAdMYu/4RMg2blVYK/EAxO9O/nq1sKRRlOjDN7RbbLo9k9xsPD 3L+ordbtFRa9uE19dySGHdM9NTqxIkFVus6oxdC4x1WjQ9jKYut6/wpOsKha6u2FXCT7 BlPgwYjakzbBSBYe8TkfybGn6W/sXmM3VFjf8kqj1NuxhHFWvujSYtuGx3hHCcPV854T sdUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TIWrp0BC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ow16-20020a05620a821000b0075cb1002290si3375143qkn.590.2023.06.23.05.32.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:32:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TIWrp0BC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfwb-0001H6-Hh; Fri, 23 Jun 2023 08:31: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 1qCfwI-0001AL-AQ for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:31:01 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfwC-0000Tr-7w for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:30:57 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f9bece8d1bso7659455e9.0 for ; Fri, 23 Jun 2023 05:30:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687523450; x=1690115450; 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=BBI1EKXYVa+WMuYu7l3ZX5976guHRdH5nUfqC+4pCho=; b=TIWrp0BCzxQkJ0LPWHq/g0lwhYCV84al3ki/W6O+bDBF2xprlhhhtZGIhRrJDJ5BNL YR4NSNIwiOtoPvSxK1JfDL2zbpA8qN70ZVGN6qc47FoIPgtpKgg6NWxrUt4a264SU2Nq Vj1BgPA1FfsWm02/f0ftezMT442ZoB0R/PnGc2N+yw4TpRQ+pUckDIL+PpBrYaXwVXZ0 2lAYw9r+WqCIr32nMijfkjcQrEqhIME4xTtm8xOSiUNizbSy+lurCPrTosVtdV5njgOs j/Lzz1cALP+XNm3WqzKSjE+oa/Z/5GVzFHmEAvI/cZfJykz4JvxMQ6S8U/6p/uLntw8H V+eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687523450; x=1690115450; 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=BBI1EKXYVa+WMuYu7l3ZX5976guHRdH5nUfqC+4pCho=; b=N7etKSkSYCnkBv8zGIi8rX1WhDd357FX1DzvPSquhwzfUuj6YLAX854PVh2pYDXiTw lOSN7cASMs2+OVHC+7V3tw0eZiR3ubRxuAPbxSP+nGv4mcmYAH4zw38iG1Kob4wJgueB dbrr72orEK7JnLZFbgdfEJYRiyirIkzMD/lf7/MGInE6P/H98usjmCMWWu7CgYra17Uv U+LCWPveS8R6ieOraQcAQY8QmB9mJ7WHUQINEy0Y/sTOMJN7uQBdo9aVjW7JJccFWAu7 MkdyDad3fW1BNWU9RNHrnb0r9uqQyPkEvVvOKsSVie4YxCSFTmDkvuX2cg3xhMWP93c7 Ulfw== X-Gm-Message-State: AC+VfDx9EeHSo4Okrl7gkXS9AknE0a6bnzMrIsOgmPtZGxgM5Xlk/jo/ kKnbkZLKqSLZveQkmratBi6sug== X-Received: by 2002:a05:600c:22c1:b0:3fa:7c4f:1f18 with SMTP id 1-20020a05600c22c100b003fa7c4f1f18mr1343311wmg.21.1687523450542; Fri, 23 Jun 2023 05:30:50 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u8-20020a05600c00c800b003f70a7b4537sm2207963wmm.36.2023.06.23.05.30.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:30:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F0DC71FFCB; Fri, 23 Jun 2023 13:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 20/26] plugins: update lockstep to use g_memdup2 Date: Fri, 23 Jun 2023 13:20:54 +0100 Message-Id: <20230623122100.1640995-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The old g_memdup is deprecated, use the replacement. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- contrib/plugins/lockstep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c index e36f0b9562..3614c3564c 100644 --- a/contrib/plugins/lockstep.c +++ b/contrib/plugins/lockstep.c @@ -130,7 +130,7 @@ static void report_divergance(ExecState *us, ExecState *them) } } divergence_log = g_slist_prepend(divergence_log, - g_memdup(&divrec, sizeof(divrec))); + g_memdup2(&divrec, sizeof(divrec))); /* Output short log entry of going out of sync... */ if (verbose || divrec.distance == 1 || diverged) { From patchwork Fri Jun 23 12:20:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695263 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1925620wrm; Fri, 23 Jun 2023 05:35:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Drybjcqz/EqTAza/OF4vXcnhXLXOPfcbKQGglcqgxZ/ogXaU6sTxfKQuO4Y9aH6EX0814 X-Received: by 2002:a05:622a:215:b0:3f6:910a:aace with SMTP id b21-20020a05622a021500b003f6910aaacemr29972399qtx.23.1687523717416; Fri, 23 Jun 2023 05:35:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523717; cv=none; d=google.com; s=arc-20160816; b=pjofKMyrkYaRQT0l4fqGDvpzZZDG4WvFY1kQWBCRwVnzqRZcaT2l530YMceLylFdDo JI2Yv11evoAwCi2X+A37YGwu1RlOzRHsRKUuZ/OlOTZ8yQerX2jY1WACa16kMOPSjPFp 8Hg5z1ZeRoGKn1NFiG0tATpJSgDRGbZ6BpAIW2bYEsWlGSS+ZqpfpkgYsinPZMmDXxeS 8Ogh40hsQJZQL9zcVcxt5mIL30opTWx2JRZDWkjGEAgkDfvbMgZJ6eJrJPfX++WDbuTn kr7nIUHFJIP7kbeF9SEiZAL9ZGELJvQXvmdFiN22z3UBt1GQVubG9qG5hE9lPUExoxGh gv8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zOww9rbYnTUV82Nt8luSAT3uGVvZz6IBM9I4dizL0VQ=; b=W86kmqGBUXtlec/5qrMmxwxsffOmsDpGmy3js4UA5DinFL7iTfOTN3Ji6LkWIDB2Cz ibr1MsgszLNxP5cKDdD6CTuLmyJn9ZopGlgmBGOAIRmky/9Uut8bx/BZTuOxdWReV+HM dRuftcIOzH6kHyRbpy6Ntg348GdpJaui2wu4oS7+F+skYa4M3zx4FLc2ei/iySLxR13a GpmDf8BcIkqHTbAbHtScNqPzWJvuWuENb5jBa0iOcAxAhtuTTglK1bAFLXreRUnNOSNR SGXRnXd2siiTy1VSr1McrvEEU7ziS/UgD7TktGwPhzw5UDaQvCkM4gpmwNTsdbNlb+W1 XHBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iXB8XtNZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y1-20020a05622a004100b003f3940c6a77si3518244qtw.10.2023.06.23.05.35.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:35:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iXB8XtNZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfwZ-0001Ej-05; Fri, 23 Jun 2023 08:31:15 -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 1qCfwG-00019a-9X for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:30:57 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfwB-0000T5-6A for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:30:55 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3129c55e1d1so675832f8f.0 for ; Fri, 23 Jun 2023 05:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687523449; x=1690115449; 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=zOww9rbYnTUV82Nt8luSAT3uGVvZz6IBM9I4dizL0VQ=; b=iXB8XtNZCXPeU1aBUK6ybgZYU9vS5QZRQc+LRLIPKqJvJaUs4T2sztPICo2jIDbsf2 +BmtzItp31WLuamO1qlA5RPlp4yYhXC155vDdm4INsMJaAI6wRXmYdgbcYtKMaQidxum YH+ECyyrGF/U23u711tC9pg8jkHqw41aNpOCobYx7Acpq1Bv4nm6F55392Y5TEkEPX45 ZN0XnrHkkRI7QQd+E4AOoduyQpJg/63AuIpVoaufNzXhUTBxx4pd4K1NOfRfIrcmYF2w cg1hZFqcdh5EC8tp2vGlI9WFj1gbUMZbqSFEa18OWSkOKlOgDpb1X8FMXazJ10+lzXBy WYeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687523449; x=1690115449; 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=zOww9rbYnTUV82Nt8luSAT3uGVvZz6IBM9I4dizL0VQ=; b=cWf3GkW5ljfxonVk1OLO0pB2C+hZhRLundBn1ioRIz/WJKxvA5l8tZiNbcKrc5jQer 46QrtzZgln2eAKWpR3ENiw+9Fwpl2As/DGuU1ue7KZqGsy/QRbCN5T3VGmR6yBZl6tIG /gNIl8Iigf3Pa8mJx5b6QgvZ9gnsqtv5GIPXgabfsGJ0uu1wOvlqptghoBgcOGTKifjC cdWJXIrgXcT/jRf/TKEzmwsJCIO9dru8oZVoleAJw1+2QU6EdycLD64K/76HNe6yrd5/ BgxOQGdHKLdPna6l67vpncT39OCzHQZ6gdVcnWhQkpX9QrLEEO7slo859q7w2LLG2MH4 ofiA== X-Gm-Message-State: AC+VfDyhhxxSkosRQeTmfSq6gVHYyPqIazry5fWkdoZu4hN/1hk8+Osg 5tZHBNOlzDDUy+sgSrwa3rmHtg== X-Received: by 2002:a05:6000:1191:b0:30a:b147:69db with SMTP id g17-20020a056000119100b0030ab14769dbmr19275521wrx.24.1687523449514; Fri, 23 Jun 2023 05:30:49 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a16-20020adfe5d0000000b0030e5a63e2dbsm9481515wrn.80.2023.06.23.05.30.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:30:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1C6901FFBF; Fri, 23 Jun 2023 13:21:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 21/26] docs/devel: add some front matter to the devel index Date: Fri, 23 Jun 2023 13:20:55 +0100 Message-Id: <20230623122100.1640995-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Give an overview of the most useful bits of the devel documentation to read depending on what the developer wants to do. Reviewed-by: Peter Maydell Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20230619171437.357374-2-alex.bennee@linaro.org> --- v2 - removed excessive start --- docs/devel/index-process.rst | 2 ++ docs/devel/index-tcg.rst | 2 ++ docs/devel/index.rst | 24 ++++++++++++++++++++++-- docs/devel/tcg.rst | 2 ++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/docs/devel/index-process.rst b/docs/devel/index-process.rst index d50dd74c3e..362f97ee30 100644 --- a/docs/devel/index-process.rst +++ b/docs/devel/index-process.rst @@ -1,3 +1,5 @@ +.. _development_process: + QEMU Community Processes ------------------------ diff --git a/docs/devel/index-tcg.rst b/docs/devel/index-tcg.rst index b44ff8b5a4..a992844e5c 100644 --- a/docs/devel/index-tcg.rst +++ b/docs/devel/index-tcg.rst @@ -1,3 +1,5 @@ +.. _tcg: + TCG Emulation ------------- diff --git a/docs/devel/index.rst b/docs/devel/index.rst index 09cfb322be..abf60457c2 100644 --- a/docs/devel/index.rst +++ b/docs/devel/index.rst @@ -2,10 +2,30 @@ Developer Information --------------------- -This section of the manual documents various parts of the internals of QEMU. -You only need to read it if you are interested in reading or +This section of the manual documents various parts of the internals of +QEMU. You only need to read it if you are interested in reading or modifying QEMU's source code. +QEMU is a large and mature project with a number of complex subsystems +that can be overwhelming to understand. The development documentation +is not comprehensive but hopefully presents enough to get you started. +If there are areas that are unclear please reach out either via the +IRC channel or mailing list and hopefully we can improve the +documentation for future developers. + +All developers will want to familiarise themselves with +:ref:`development_process` and how the community interacts. Please pay +particular attention to the :ref:`coding-style` and +:ref:`submitting-a-patch` sections to avoid common pitfalls. + +If you wish to implement a new hardware model you will want to read +through the :ref:`qom` documentation to understand how QEMU's object +model works. + +Those wishing to enhance or add new CPU emulation capabilities will +want to read our :ref:`tcg` documentation, especially the overview of +the :ref:`tcg_internals`. + .. toctree:: :maxdepth: 1 diff --git a/docs/devel/tcg.rst b/docs/devel/tcg.rst index b4096a17df..2786f2f679 100644 --- a/docs/devel/tcg.rst +++ b/docs/devel/tcg.rst @@ -1,3 +1,5 @@ +.. _tcg_internals: + ==================== Translator Internals ==================== From patchwork Fri Jun 23 12:20:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695248 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1924002wrm; Fri, 23 Jun 2023 05:31:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ40hnXVGEXCr1ACrPQdPdRI9lXx39RBY/ExXFR4xj5PL5+PvY1kBCjh8f7VXt3738i/dNPV X-Received: by 2002:a05:620a:22e8:b0:762:4657:57a9 with SMTP id p8-20020a05620a22e800b00762465757a9mr15577652qki.1.1687523510705; Fri, 23 Jun 2023 05:31:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523510; cv=none; d=google.com; s=arc-20160816; b=xMCNMdYJqrp+UUEaNViu21gR8yTYC+OaDJcOrsG//PPLnnqa+M/UNGxHl0oIwRSBTG dQs5iY/mzNCcPVEZi+P58WIxXkr3Jhuv7WXuZcs/woWAVFWSa+0FBL4eFY9Mq/Exvt5s FUIu9PVBLCrXtpeo0rNG9KV/LU6CwxX8k15JOpDwL1vusqS5NQdQj93kBYQ9UaVqHqRZ rs9F/Qgpgmztdp8evSkkiaC6Xv+YvLFpre0CcayEP1pjimavePbVAbNI09vQou3Apz/P WQeTI1Fc3JTuZvO2as1KVvjKOSSclfcbjm12bVAY9KlHJXFpfccAYSSFbjVaVi0+2w17 9Rww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/lZ58MHVs7VVcDhLDA+codKww1SNsRkU8Vn2ofdw4A8=; b=AxeNK+LVYEfEC9S9S91g1/RSYBeecwNpkr6QHTYe7r3IqZ6KDCz9lyFeVgHC1Qxvr0 +YUe9IEcXToa1DHd5A48YLHROqj44jqsC70c4xxWCEE6I5zTc/zRcZsQDXsapY+E6dPy RUGLh/rX4es+N1Exr7VZIWZ6McJC7ml/SZIQfT5+layrbaR4b6ZNrPGzYThrr6T6RDfy +grMABiq3KHYoExD8c2bKR4SNhdryIxO/BILm45Ed+2mwNrs8TZt9zFKUTLi7N0xq6Xo DqkjFjb+vNF7w0TfjezDWRFbZUIhwy/V5EaRnq5BstYtUlaKG2iGSh8CdT8BL7BZ+Q/4 tRpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XSqIJteZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j12-20020a05620a000c00b00763dd7ab3d1si1934476qki.471.2023.06.23.05.31.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:31:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XSqIJteZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfwU-0001Cp-Dp; Fri, 23 Jun 2023 08:31:11 -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 1qCfwE-00018v-5s for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:30:55 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfwB-0000Sw-3u for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:30:53 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-31129591288so571631f8f.1 for ; Fri, 23 Jun 2023 05:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687523449; x=1690115449; 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=/lZ58MHVs7VVcDhLDA+codKww1SNsRkU8Vn2ofdw4A8=; b=XSqIJteZOMQV1Jwrm7ChEhfzxCaxgq+bxtHm2yPKMUz3H34yqD887cwrFG1szKNQsl CANqxVPCUDqHZGfIX8xGZKnm5IjCLHpj9ykq5aNqyPU945dlm15J0Cp5+Bxnv/5/UVTE l8TRtY2viRzxV7qyZ5lVKirMTRWSR4gD0Eb9Rymuiazv1k6VKtDI0ngzPB+vzwdGHOin 3G+j1IOG4tXHAnTY3iQfqo6I50pOf+DegwVWlfC9YZ99dhSHttNTybsjgqGN4BNWAJYQ BFu5577xL1hSN2kDfeHlSgnwkhfe/6Pc59hnLbHWNwulQMFteNjSRJAkDJzu/pJF9OSn Rxpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687523449; x=1690115449; 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=/lZ58MHVs7VVcDhLDA+codKww1SNsRkU8Vn2ofdw4A8=; b=f0ciuWperg1bWAK57M6/1EusLbkXeBDb04Yf/utUBIvye+hlV5dYVZqNSSUmcpROAD YHLzBdkM6nWE/YEyIzoIr+hHvVB2fCBV15SXvzUFNLsBlDD5b3wHlj/0V5FjlvecQFmK 2aDVN1qrba5+UQPGGneb52GYHSxSN7ObGEQXhhQp4n6u7z/geEI9k4DDgNJdziCxk4kW wUtJDWMgX0hfQZa+HR+OSJO/f3W2PBh6j+UoM93M6dopbd9zOda9xOTS6fGUmt0rIakS /Nko44UTdyu3ZpsyNxvPyFgD6NTxQf0qbrGfacJ5FtcRQnu+daiCZzA3GkO2PvVYj/KI MNqw== X-Gm-Message-State: AC+VfDxO6/qVkzQMYn+TFCGxztWqV787lOrKi+Z/rvNveZb3esPv/uDD 241fPehKDxWHp7sTPx3I2TJf0g== X-Received: by 2002:adf:ee4e:0:b0:309:49e3:efb4 with SMTP id w14-20020adfee4e000000b0030949e3efb4mr14037477wro.63.1687523449292; Fri, 23 Jun 2023 05:30:49 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j18-20020adff012000000b0030e56a9ff25sm9484366wro.31.2023.06.23.05.30.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:30:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 34A091FFCC; Fri, 23 Jun 2023 13:21:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 22/26] include/migration: mark vmstate_register() as a legacy function Date: Fri, 23 Jun 2023 13:20:56 +0100 Message-Id: <20230623122100.1640995-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Mention that QOM-ified devices already have support for registering the description. Reviewed-by: Juan Quintela Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Acked-by: Peter Xu Signed-off-by: Alex Bennée Message-Id: <20230619171437.357374-3-alex.bennee@linaro.org> --- include/migration/vmstate.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 084f5e784a..35579b2c1f 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -1209,7 +1209,14 @@ int vmstate_register_with_alias_id(VMStateIf *obj, uint32_t instance_id, int required_for_version, Error **errp); -/* Returns: 0 on success, -1 on failure */ +/** + * vmstate_register() - legacy function to register state serialisation description + * + * New code shouldn't be using this function as QOM-ified devices have + * dc->vmsd to store the serialisation description. + * + * Returns: 0 on success, -1 on failure + */ static inline int vmstate_register(VMStateIf *obj, int instance_id, const VMStateDescription *vmsd, void *opaque) From patchwork Fri Jun 23 12:20:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695265 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1925640wrm; Fri, 23 Jun 2023 05:35:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6rjp4UROZgxZW9i72XYR6CTDirCOlXQ9pVcDyhiwQk1yhmR+o1b1hU8BRLpiFnC4kMBO1h X-Received: by 2002:a05:622a:1116:b0:3f6:c253:a738 with SMTP id e22-20020a05622a111600b003f6c253a738mr27911584qty.41.1687523719163; Fri, 23 Jun 2023 05:35:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523719; cv=none; d=google.com; s=arc-20160816; b=I12KTawBLDQaRhvE1hviebsLFGNHasCJgNzLMWe6HzZdJkiKQ/Cs0e/qMeh+umO+ib 5acd75VuvnncnwqXvd4N6o7gZVNwrYKaIv7fdVG7qMMFFfqheq2A8UlyonEeXkAYjIRc eRUOuuqT4uqpt5DcmwSlsvyfHtR51x9DYcLN6lmEC4F+sTXACkGmzWaP91AYK1wGoj58 2cu7M3tNVkgdggo8kXRwVob0UiGwG/S0PDwTHe8kZlY5iYd8s5umflM7zuCIcxryzjZ0 8JeIMI+qj3mwzKe8sHn9DVtSwDqHItlCQrrtJQdNbeATc3iuXD+YvqbEm7NTGjMfwNuD T/FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TbjDA6/5bOs3H7Ssf20nW03+FRXs+W/n1dbicENLHRc=; b=cq3CyowyjEcGVy1KUL3endUMMteq1gsPYNpSnMnYJUvagIX/nFJSonuOG5tFdGZIX1 or0oew4Upmt5gIlcuKC1rVjeuudlrNCbB45+Ld7z6qL/J/ZqYjpjpfha/hhXOVfXJi/D lCeq9lqxRf0Hz3baJObb7pjPUhMTI6+KdpEvYGWNM8btc7zplHa70Qw/Qlg6Gqii5LM9 Db5JKgWEdeszdk89mJ1eSNb0avaLlZZNRX8ZBNgquzCUa/IX6G/Ok+Hc3UrDTvasHVZL YQN/KZndOHTDvYFDfhJ4Eh+btE7aU2G7KJqD4x3DAsKw0DPeELs4RG5eIEn63xJ3vsWV rU/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j8+s5IWc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w13-20020ac87e8d000000b0040080b82139si1108157qtj.194.2023.06.23.05.35.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:35:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j8+s5IWc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfwc-0001JN-VZ; Fri, 23 Jun 2023 08:31:19 -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 1qCfwI-0001AI-8K for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:31:01 -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 1qCfwB-0000St-3s for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:30:56 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-311153ec442so577214f8f.1 for ; Fri, 23 Jun 2023 05:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687523449; x=1690115449; 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=TbjDA6/5bOs3H7Ssf20nW03+FRXs+W/n1dbicENLHRc=; b=j8+s5IWcxe5Km1Hek1q4bNIARLAGlEquRElLI0OusuwHbh7Phxjihk/e/eA2oqUNmy 70wP8HXjMV6TPfayR7/yQos7hnpyJOmuMt6k4+Yp6Byle48M/EFVNvDI/p/j/b2Gg0QX TzRn+ctSsJbArMfGxI1Z/SyI4Y4ZkCPGwqCxJue1NsSVYxOr2MGsYUPgo7X6qaN5q2As tO+vdA0Nk8/3iCEVHCCUgLNpIVJwhoYxV8XvTC31j709x9avsrhQOM1UzznDWZtdRk97 zrlu/DB1+C3Q9gpdFYFvk+4P/Ybsqw5WM9jYn2Tl2WOf9XakzGZbwua4Xe1/Lp1hFiqF XRwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687523449; x=1690115449; 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=TbjDA6/5bOs3H7Ssf20nW03+FRXs+W/n1dbicENLHRc=; b=go1noDvtyptNsCGOKU25r86tolcoD8+D7YeGJQchee5OWJnXWZrUcd6rHjdCs7JOCL R+36mcd0q+1IqiV1Kbf/Dj7BxsXmaxrDZedIyzla5OFSs4AaeGuRXKsuzwTEJvW+dw84 G0DA2D8n9PBhRrY9XsjTbXo20NRWE9/eLbCMrOpOjSgzvYQKW6y22Z+Clv5hDHHIiJDT nMbMPIAhKWQm3SnYMTl6ntgc71Ntn8K27CXiLefzjXnSg3CNKZhLQXm1pMAVfSvUTap8 f9vyQK8GWGoeNImaVAJh5xqq+EIX32SM8UIfuIoGkN9Q1D41/kTGj9nnBeNjpg1ANpaM e5YQ== X-Gm-Message-State: AC+VfDygbt2GM9pGd8YPk0TNLjLGLgWsO2V/HPEd2MtxYdV20At0icty EfshySRU1VPM3p59qbqlC7sM3g== X-Received: by 2002:a05:6000:923:b0:312:7d4d:f1c0 with SMTP id cx3-20020a056000092300b003127d4df1c0mr10105886wrb.32.1687523448887; Fri, 23 Jun 2023 05:30:48 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id hn31-20020a05600ca39f00b003f900678815sm2202585wmb.39.2023.06.23.05.30.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:30:48 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 51A3D1FFCD; Fri, 23 Jun 2023 13:21:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 23/26] include/hw/qdev-core: fixup kerneldoc annotations Date: Fri, 23 Jun 2023 13:20:57 +0100 Message-Id: <20230623122100.1640995-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Fix up the kerneldoc markup and start documenting the various fields in QDEV related structures. This involved: - moving overall description to a DOC: comment at top - fixing various markup issues for types and structures - adding missing Return: statements - adding some typedefs to hide QLIST macros in headers Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20230619171437.357374-4-alex.bennee@linaro.org> --- include/hw/qdev-core.h | 365 ++++++++++++++++++++++++++++------------- 1 file changed, 252 insertions(+), 113 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index f1070d6dc7..ef2b48db84 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -10,6 +10,65 @@ #include "hw/hotplug.h" #include "hw/resettable.h" +/** + * DOC: The QEMU Device API + * + * All modern devices should represented as a derived QOM class of + * TYPE_DEVICE. The device API introduces the additional methods of + * @realize and @unrealize to represent additional stages in a device + * objects life cycle. + * + * Realization + * ----------- + * + * Devices are constructed in two stages: + * + * 1) object instantiation via object_initialize() and + * 2) device realization via the #DeviceState.realized property + * + * The former may not fail (and must not abort or exit, since it is called + * during device introspection already), and the latter may return error + * information to the caller and must be re-entrant. + * Trivial field initializations should go into #TypeInfo.instance_init. + * Operations depending on @props static properties should go into @realize. + * After successful realization, setting static properties will fail. + * + * As an interim step, the #DeviceState.realized property can also be + * set with qdev_realize(). In the future, devices will propagate this + * state change to their children and along busses they expose. The + * point in time will be deferred to machine creation, so that values + * set in @realize will not be introspectable beforehand. Therefore + * devices must not create children during @realize; they should + * initialize them via object_initialize() in their own + * #TypeInfo.instance_init and forward the realization events + * appropriately. + * + * Any type may override the @realize and/or @unrealize callbacks but needs + * to call the parent type's implementation if keeping their functionality + * is desired. Refer to QOM documentation for further discussion and examples. + * + * .. note:: + * Since TYPE_DEVICE doesn't implement @realize and @unrealize, types + * derived directly from it need not call their parent's @realize and + * @unrealize. For other types consult the documentation and + * implementation of the respective parent types. + * + * Hiding a device + * --------------- + * + * To hide a device, a DeviceListener function hide_device() needs to + * be registered. It can be used to defer adding a device and + * therefore hide it from the guest. The handler registering to this + * DeviceListener can save the QOpts passed to it for re-using it + * later. It must return if it wants the device to be hidden or + * visible. When the handler function decides the device shall be + * visible it will be added with qdev_device_add() and realized as any + * other device. Otherwise qdev_device_add() will return early without + * adding the device. The guest will not see a "hidden" device until + * it was marked visible and qdev_device_add called again. + * + */ + enum { DEV_NVECTORS_UNSPECIFIED = -1, }; @@ -38,7 +97,7 @@ typedef void (*BusRealize)(BusState *bus, Error **errp); typedef void (*BusUnrealize)(BusState *bus); /** - * DeviceClass: + * struct DeviceClass - The base class for all devices. * @props: Properties accessing state fields. * @realize: Callback function invoked when the #DeviceState:realized * property is changed to %true. @@ -47,72 +106,36 @@ typedef void (*BusUnrealize)(BusState *bus); * @hotpluggable: indicates if #DeviceClass is hotpluggable, available * as readonly "hotpluggable" property of #DeviceState instance * - * # Realization # - * Devices are constructed in two stages, - * 1) object instantiation via object_initialize() and - * 2) device realization via #DeviceState:realized property. - * The former may not fail (and must not abort or exit, since it is called - * during device introspection already), and the latter may return error - * information to the caller and must be re-entrant. - * Trivial field initializations should go into #TypeInfo.instance_init. - * Operations depending on @props static properties should go into @realize. - * After successful realization, setting static properties will fail. - * - * As an interim step, the #DeviceState:realized property can also be - * set with qdev_realize(). - * In the future, devices will propagate this state change to their children - * and along busses they expose. - * The point in time will be deferred to machine creation, so that values - * set in @realize will not be introspectable beforehand. Therefore devices - * must not create children during @realize; they should initialize them via - * object_initialize() in their own #TypeInfo.instance_init and forward the - * realization events appropriately. - * - * Any type may override the @realize and/or @unrealize callbacks but needs - * to call the parent type's implementation if keeping their functionality - * is desired. Refer to QOM documentation for further discussion and examples. - * - * - * - * Since TYPE_DEVICE doesn't implement @realize and @unrealize, types - * derived directly from it need not call their parent's @realize and - * @unrealize. - * For other types consult the documentation and implementation of the - * respective parent types. - * - * - * - * # Hiding a device # - * To hide a device, a DeviceListener function hide_device() needs to - * be registered. - * It can be used to defer adding a device and therefore hide it from - * the guest. The handler registering to this DeviceListener can save - * the QOpts passed to it for re-using it later. It must return if it - * wants the device to be hidden or visible. When the handler function - * decides the device shall be visible it will be added with - * qdev_device_add() and realized as any other device. Otherwise - * qdev_device_add() will return early without adding the device. The - * guest will not see a "hidden" device until it was marked visible - * and qdev_device_add called again. - * */ struct DeviceClass { - /*< private >*/ + /* private: */ ObjectClass parent_class; - /*< public >*/ + /* public: */ + /** + * @categories: device categories device belongs to + */ DECLARE_BITMAP(categories, DEVICE_CATEGORY_MAX); + /** + * @fw_name: name used to identify device to firmware interfaces + */ const char *fw_name; + /** + * @desc: human readable description of device + */ const char *desc; - /* - * The underscore at the end ensures a compile-time error if someone - * assigns to dc->props instead of using device_class_set_props. + /** + * @props_: properties associated with device, should only be + * assigned by using device_class_set_props(). The underscore + * ensures a compile-time error if someone attempts to assign + * dc->props directly. */ Property *props_; - /* - * Can this device be instantiated with -device / device_add? + /** + * @user_creatable: Can user instantiate with -device / device_add? + * * All devices should support instantiation with device_add, and * this flag should not exist. But we're not there, yet. Some * devices fail to instantiate with cryptic error messages. @@ -120,25 +143,35 @@ struct DeviceClass { * behavior would be cruel; clearing this flag will protect them. * It should never be cleared without a comment explaining why it * is cleared. + * * TODO remove once we're there */ bool user_creatable; bool hotpluggable; /* callbacks */ - /* - * Reset method here is deprecated and replaced by methods in the - * resettable class interface to implement a multi-phase reset. + /** + * @reset: deprecated device reset method pointer + * + * Modern code should use the ResettableClass interface to + * implement a multi-phase reset. + * * TODO: remove once every reset callback is unused */ DeviceReset reset; DeviceRealize realize; DeviceUnrealize unrealize; - /* device state */ + /** + * @vmsd: device state serialisation description for + * migration/save/restore + */ const VMStateDescription *vmsd; - /* Private to qdev / bus. */ + /** + * @bus_type: bus type + * private: to qdev / bus. + */ const char *bus_type; }; @@ -167,37 +200,96 @@ typedef struct { bool engaged_in_io; } MemReentrancyGuard; + +typedef QLIST_HEAD(, NamedGPIOList) NamedGPIOListHead; +typedef QLIST_HEAD(, NamedClockList) NamedClockListHead; +typedef QLIST_HEAD(, BusState) BusStateHead; + /** - * DeviceState: - * @reset: ResettableState for the device; handled by Resettable interface. + * struct DeviceState - common device state, accessed with qdev helpers * * This structure should not be accessed directly. We declare it here * so that it can be embedded in individual device state structures. */ struct DeviceState { - /*< private >*/ + /* private: */ Object parent_obj; - /*< public >*/ + /* public: */ + /** + * @id: global device id + */ char *id; + /** + * @canonical_path: canonical path of realized device in the QOM tree + */ char *canonical_path; + /** + * @realized: has device been realized? + */ bool realized; + /** + * @pending_deleted_event: track pending deletion events during unplug + */ bool pending_deleted_event; + /** + * @pending_deleted_expires_ms: optional timeout for deletion events + */ int64_t pending_deleted_expires_ms; + /** + * @opts: QDict of options for the device + */ QDict *opts; + /** + * @hotplugged: was device added after PHASE_MACHINE_READY? + */ int hotplugged; + /** + * @allow_unplug_during_migration: can device be unplugged during migration + */ bool allow_unplug_during_migration; + /** + * @parent_bus: bus this device belongs to + */ BusState *parent_bus; - QLIST_HEAD(, NamedGPIOList) gpios; - QLIST_HEAD(, NamedClockList) clocks; - QLIST_HEAD(, BusState) child_bus; + /** + * @gpios: QLIST of named GPIOs the device provides. + */ + NamedGPIOListHead gpios; + /** + * @clocks: QLIST of named clocks the device provides. + */ + NamedClockListHead clocks; + /** + * @child_bus: QLIST of child buses + */ + BusStateHead child_bus; + /** + * @num_child_bus: number of @child_bus entries + */ int num_child_bus; + /** + * @instance_id_alias: device alias for handling legacy migration setups + */ int instance_id_alias; + /** + * @alias_required_for_version: indicates @instance_id_alias is + * needed for migration + */ int alias_required_for_version; + /** + * @reset: ResettableState for the device; handled by Resettable interface. + */ ResettableState reset; + /** + * @unplug_blockers: list of reasons to block unplugging of device + */ GSList *unplug_blockers; - - /* Is the device currently in mmio/pio/dma? Used to prevent re-entrancy */ + /** + * @mem_reentrancy_guard: Is the device currently in mmio/pio/dma? + * + * Used to prevent re-entrancy confusing things. + */ MemReentrancyGuard mem_reentrancy_guard; }; @@ -264,13 +356,24 @@ typedef struct BusChild { #define QDEV_HOTPLUG_HANDLER_PROPERTY "hotplug-handler" +typedef QTAILQ_HEAD(, BusChild) BusChildHead; +typedef QLIST_ENTRY(BusState) BusStateEntry; + /** - * BusState: + * struct BusState: + * @obj: parent object + * @parent: parent Device + * @name: name of bus * @hotplug_handler: link to a hotplug handler associated with bus. - * @reset: ResettableState for the bus; handled by Resettable interface. + * @max_index: max number of child buses + * @realized: is the bus itself realized? + * @full: is the bus full? + * @num_children: current number of child buses */ struct BusState { + /* private: */ Object obj; + /* public: */ DeviceState *parent; char *name; HotplugHandler *hotplug_handler; @@ -279,18 +382,24 @@ struct BusState { bool full; int num_children; - /* - * children is a RCU QTAILQ, thus readers must use RCU to access it, + /** + * @children: an RCU protected QTAILQ, thus readers must use RCU to access it, * and writers must hold the big qemu lock */ - - QTAILQ_HEAD(, BusChild) children; - QLIST_ENTRY(BusState) sibling; + BusChildHead children; + /** + * @sibling: next bus + */ + BusStateEntry sibling; + /** + * @reset: ResettableState for the bus; handled by Resettable interface. + */ ResettableState reset; }; /** - * GlobalProperty: + * typedef GlobalProperty - a global property type + * * @used: Set to true if property was used when initializing a device. * @optional: If set to true, GlobalProperty will be skipped without errors * if the property doesn't exist. @@ -324,7 +433,8 @@ compat_props_add(GPtrArray *arr, * This only allocates the memory and initializes the device state * structure, ready for the caller to set properties if they wish. * The device still needs to be realized. - * The returned object has a reference count of 1. + * + * Return: a derived DeviceState object with a reference count of 1. */ DeviceState *qdev_new(const char *name); @@ -334,16 +444,18 @@ DeviceState *qdev_new(const char *name); * * This is like qdev_new(), except it returns %NULL when type @name * does not exist, rather than asserting. + * + * Return: a derived DeviceState object with a reference count of 1 or + * NULL if type @name does not exist. */ DeviceState *qdev_try_new(const char *name); /** - * qdev_is_realized: + * qdev_is_realized() - check if device is realized * @dev: The device to check. * - * May be called outside big qemu lock. - * - * Returns: %true% if the device has been fully constructed, %false% otherwise. + * Context: May be called outside big qemu lock. + * Return: true if the device has been fully constructed, false otherwise. */ static inline bool qdev_is_realized(DeviceState *dev) { @@ -361,11 +473,11 @@ static inline bool qdev_is_realized(DeviceState *dev) * @dev must not be plugged into a bus already. * If @bus, plug @dev into @bus. This takes a reference to @dev. * If @dev has no QOM parent, make one up, taking another reference. - * On success, return true. - * On failure, store an error through @errp and return false. * * If you created @dev using qdev_new(), you probably want to use * qdev_realize_and_unref() instead. + * + * Return: true on success, else false setting @errp with error */ bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp); @@ -392,6 +504,8 @@ bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp); * for the only reference to the child device to be held by the parent * via the child<> property, and so the reference-count-drop done here * would be incorrect. For that use case you want qdev_realize(). + * + * Return: true on success, else false setting @errp with error */ bool qdev_realize_and_unref(DeviceState *dev, BusState *bus, Error **errp); @@ -420,16 +534,16 @@ void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, HotplugHandler *qdev_get_bus_hotplug_handler(DeviceState *dev); HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev); bool qdev_hotplug_allowed(DeviceState *dev, Error **errp); + /** - * qdev_get_hotplug_handler: Get handler responsible for device wiring - * - * Find HOTPLUG_HANDLER for @dev that provides [pre|un]plug callbacks for it. + * qdev_get_hotplug_handler() - Get handler responsible for device wiring + * @dev: the device we want the HOTPLUG_HANDLER for. * * Note: in case @dev has a parent bus, it will be returned as handler unless * machine handler overrides it. * - * Returns: pointer to object that implements TYPE_HOTPLUG_HANDLER interface - * or NULL if there aren't any. + * Return: pointer to object that implements TYPE_HOTPLUG_HANDLER interface + * or NULL if there aren't any. */ HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev); void qdev_unplug(DeviceState *dev, Error **errp); @@ -459,15 +573,15 @@ void qdev_del_unplug_blocker(DeviceState *dev, Error *reason); * qdev_unplug_blocked: Confirm if a device is blocked from unplug * * @dev: Device to be tested - * @reason: Returns one of the reasons why the device is blocked, - * if any + * @errp: The reasons why the device is blocked, if any * - * Returns: true if device is blocked from unplug, false otherwise + * Returns: true (also setting @errp) if device is blocked from unplug, + * false otherwise */ bool qdev_unplug_blocked(DeviceState *dev, Error **errp); /** - * GpioPolarity: Polarity of a GPIO line + * typedef GpioPolarity - Polarity of a GPIO line * * GPIO lines use either positive (active-high) logic, * or negative (active-low) logic. @@ -499,6 +613,8 @@ typedef enum { * connect another device's output GPIO line to this input. * * For named input GPIO lines, use qdev_get_gpio_in_named(). + * + * Return: qemu_irq corresponding to anonymous input GPIO line */ qemu_irq qdev_get_gpio_in(DeviceState *dev, int n); @@ -516,6 +632,8 @@ qemu_irq qdev_get_gpio_in(DeviceState *dev, int n); * array); this function will assert() if passed an invalid name or index. * * For anonymous input GPIO lines, use qdev_get_gpio_in(). + * + * Return: qemu_irq corresponding to named input GPIO line */ qemu_irq qdev_get_gpio_in_named(DeviceState *dev, const char *name, int n); @@ -523,7 +641,7 @@ qemu_irq qdev_get_gpio_in_named(DeviceState *dev, const char *name, int n); * qdev_connect_gpio_out: Connect one of a device's anonymous output GPIO lines * @dev: Device whose GPIO to connect * @n: Number of the anonymous output GPIO line (which must be in range) - * @input_pin: qemu_irq to connect the output line to + * @pin: qemu_irq to connect the output line to * * This function connects an anonymous output GPIO line on a device * up to an arbitrary qemu_irq, so that when the device asserts that @@ -594,6 +712,8 @@ void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n, * * You probably don't need to use this function -- it is used only * by the platform-bus subsystem. + * + * Return: qemu_irq associated with GPIO or NULL if un-wired. */ qemu_irq qdev_get_gpio_out_connector(DeviceState *dev, const char *name, int n); @@ -604,14 +724,17 @@ qemu_irq qdev_get_gpio_out_connector(DeviceState *dev, const char *name, int n); * @name: Name of the output GPIO array * @n: Number of the GPIO line in the array * - * This function is provided only for use by the qtest testing framework - * and is not suitable for use in non-testing parts of QEMU. + * .. note:: + * This function is provided only for use by the qtest testing framework + * and is not suitable for use in non-testing parts of QEMU. * * This function breaks an existing connection of an outbound GPIO * line from @dev, and replaces it with the new qemu_irq @icpt, as if * ``qdev_connect_gpio_out_named(dev, icpt, name, n)`` had been called. * The previously connected qemu_irq is returned, so it can be restored * by a second call to qdev_intercept_gpio_out() if desired. + * + * Return: old disconnected qemu_irq if one existed */ qemu_irq qdev_intercept_gpio_out(DeviceState *dev, qemu_irq icpt, const char *name, int n); @@ -683,9 +806,7 @@ void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins, const char *name, int n); /** - * qdev_init_gpio_in_named_with_opaque: create an array of input GPIO lines - * for the specified device - * + * qdev_init_gpio_in_named_with_opaque() - create an array of input GPIO lines * @dev: Device to create input GPIOs for * @handler: Function to call when GPIO line value is set * @opaque: Opaque data pointer to pass to @handler @@ -698,8 +819,11 @@ void qdev_init_gpio_in_named_with_opaque(DeviceState *dev, const char *name, int n); /** - * qdev_init_gpio_in_named: create an array of input GPIO lines - * for the specified device + * qdev_init_gpio_in_named() - create an array of input GPIO lines + * @dev: device to add array to + * @handler: a &typedef qemu_irq_handler function to call when GPIO is set + * @name: Name of the GPIO input (must be unique for this device) + * @n: Number of GPIO lines in this input set * * Like qdev_init_gpio_in_named_with_opaque(), but the opaque pointer * passed to the handler is @dev (which is the most commonly desired behaviour). @@ -762,14 +886,17 @@ int qdev_walk_children(DeviceState *dev, void *opaque); /** - * device_cold_reset: + * device_cold_reset() - perform a recursive cold reset on a device + * @dev: device to reset. + * * Reset device @dev and perform a recursive processing using the resettable * interface. It triggers a RESET_TYPE_COLD. */ void device_cold_reset(DeviceState *dev); /** - * bus_cold_reset: + * bus_cold_reset() - perform a recursive cold reset on a bus + * @bus: bus to reset * * Reset bus @bus and perform a recursive processing using the resettable * interface. It triggers a RESET_TYPE_COLD. @@ -777,14 +904,18 @@ void device_cold_reset(DeviceState *dev); void bus_cold_reset(BusState *bus); /** - * device_is_in_reset: - * Return true if the device @dev is currently being reset. + * device_is_in_reset() - check device reset state + * @dev: device to check + * + * Return: true if the device @dev is currently being reset. */ bool device_is_in_reset(DeviceState *dev); /** - * bus_is_in_reset: - * Return true if the bus @bus is currently being reset. + * bus_is_in_reset() - check bus reset state + * @bus: bus to check + * + * Return: true if the bus @bus is currently being reset. */ bool bus_is_in_reset(BusState *bus); @@ -797,7 +928,14 @@ char *qdev_get_own_fw_dev_path_from_handler(BusState *bus, DeviceState *dev); void device_class_set_props(DeviceClass *dc, Property *props); /** - * device_class_set_parent_reset: + * device_class_set_parent_reset() - legacy set device reset handlers + * @dc: device class + * @dev_reset: function pointer to reset handler + * @parent_reset: function pointer to parents reset handler + * + * Modern code should use the ResettableClass interface to + * implement a multi-phase reset instead. + * * TODO: remove the function when DeviceClass's reset method * is not used anymore. */ @@ -871,14 +1009,15 @@ void device_listener_register(DeviceListener *listener); void device_listener_unregister(DeviceListener *listener); /** - * @qdev_should_hide_device: + * qdev_should_hide_device() - check if device should be hidden + * * @opts: options QDict * @from_json: true if @opts entries are typed, false for all strings * @errp: pointer to error object * - * Check if a device should be added. - * When a device is added via qdev_device_add() this will be called, - * and return if the device should be added now or not. + * When a device is added via qdev_device_add() this will be called. + * + * Return: if the device should be added now or not. */ bool qdev_should_hide_device(const QDict *opts, bool from_json, Error **errp); From patchwork Fri Jun 23 12:20:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695272 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1927045wrm; Fri, 23 Jun 2023 05:38:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5XzZChiPbK/N5K2eRlAXyIpfmFK49BXZ/P+OmeuthzDpy5xzsQrZZiZk0QGCXZgnkPAxVT X-Received: by 2002:a1f:5c42:0:b0:46e:7158:1cf0 with SMTP id q63-20020a1f5c42000000b0046e71581cf0mr9218257vkb.10.1687523906273; Fri, 23 Jun 2023 05:38:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523906; cv=none; d=google.com; s=arc-20160816; b=BKlkgZae2/zMLAoaYWY1whjN9/AluTuikkam0VemJSKkX1YGeqA7ASBd+TVQuWQkq9 7SLYEfoDH6bath5bjKeHH+PkvjGyDABtZvkqe1ARjDOJE+EFK+/phOWUNe1zZJhlda2y Q4caJGqCk1wFTKJXMeUZbmZFFibRpOyCWa9lc0oVf/K2fNm/W8TuaWgtsy79wUrnRVYg ntygH74txFBDtdsYwRetqs/VO9DOqCHh3QYZGiZ6ggdk0eyABpZBKahElJYYjc5ro2YH VvszhFnECALrA4TLMz55TYZaI4XAQS2DCI3TVBEInmbwaLi86OVyx21y3or3RBLXSNqU BO3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3JC9WCIJtw9nwrfN71qlgt4usYXlUperbuOAmE+qnSw=; b=TWDvjSUBQ7sbsrrO3gb+haKkp+8101sMFEY0qs9mgtZd/5tCskRd35CIaRRkK/r/gg ZFliVFlI6DGjbqlIvTsdL4z7oarI86jAiFUZ8C2uZiiTgnexnwaqLnTGhsHNzh4Ud71b ym9vCdzsCVPxJ2isKL7bI1WdPkuVBnDVz/HJhAVs1+wmlbWBLaW+AjLfY3D2lExdHd3R wUVXIfXx6fcCp1C9dYAvSYBJ6MN9T5Pg5VySqWdYSARWAbXfcywHsVf617bMBER3WWKm QfdJiB1j7NshK9OTjiKuQzBFA7LReuME1iHyz+uuOY7wVs7goTMr+obgnM0A/Lp2Ov2t lKuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R6KhedFt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fq14-20020a056214258e00b00628476c02b4si3615673qvb.51.2023.06.23.05.38.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:38:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R6KhedFt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfwc-0001Il-GH; Fri, 23 Jun 2023 08:31: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 1qCfwG-00019Z-9A for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:30:57 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfwB-0000Sq-5L for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:30:55 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-31129591288so571628f8f.1 for ; Fri, 23 Jun 2023 05:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687523449; x=1690115449; 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=3JC9WCIJtw9nwrfN71qlgt4usYXlUperbuOAmE+qnSw=; b=R6KhedFtnu6PTl0OitwyK3DAfM3efg2iXiIje2RewhnZ+mwdBelbCd9OJYwTlogS8F a56ivXCEDJfdW6irOvsGs6QS/NTNWh9CIKhz0cqDwq55iTKACKBIXdJgEbJDhbQWAaJl GUknBFvKFKQiEqyCOW4dJJwoz0fGvm35SD+/j9nzhEF2Jy8UiHUG0pA6CG38Vg4HhTd4 2BNUgwTLXXEJ37HbqlQOIFOu6VYAch74oFpPSakqxZ+LlsXt8oYfKwmCZbOObMgqrW7Q uJpdbvsPiQa5TlEu5NBkckZ5mA2B4PxGYaOWM1PFn3gP+thw5NDCZwe4Job9DzMjEp+s KT7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687523449; x=1690115449; 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=3JC9WCIJtw9nwrfN71qlgt4usYXlUperbuOAmE+qnSw=; b=W828dJGConphMQ9m+veRjlWZJFzUBFf1Xcrnv2MD94XRBm42NqavWjBFq+szgfyQis OVmq8CMyvuLiJwmQ0ihM8vFT6nEL3gdgZyuEH6NJoUV6MbnGPKlc/4Iw6L8IeyAIWrd7 nFIN01wVp7h8Cc5N0WRVHUCejCBG+Pf12UNt5AjiG/WBcyihNQX6pDcmfMWdsj+PCdCV RUMp5HHpIvxieF9/FtwrwyrY16P2zqDYDSCdULFIosbi4o3HW7+b78LG1YXlUKl6Pgf1 N372NmXpoYcgQ7QB1NfZxboKOpYoR4Fnmthk9mU/EStffnBd6aMV3/E//e/xRfi16R+w X0DQ== X-Gm-Message-State: AC+VfDwM8JVlifJnrkx67m5rK4re4sAtPn9dLH1NK+vRMt7IZetC9wav hJQMMUCy5yXCvdqulrdJ0C5mUQ== X-Received: by 2002:a5d:591c:0:b0:311:1a9d:98e with SMTP id v28-20020a5d591c000000b003111a9d098emr13786973wrd.58.1687523449071; Fri, 23 Jun 2023 05:30:49 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o10-20020a5d58ca000000b003111fd2e33dsm9419650wrf.30.2023.06.23.05.30.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:30:48 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 69DF71FFCE; Fri, 23 Jun 2023 13:21:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= , BALATON Zoltan Subject: [PATCH 24/26] docs/devel/qom.rst: Correct code style Date: Fri, 23 Jun 2023 13:20:58 +0100 Message-Id: <20230623122100.1640995-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Per commit 067109a11c ("docs/devel: mention the spacing requirement for QOM"): For a storage structure the first declaration should always be called “parent_obj” and for a class structure the first member should always be called “parent_class” Adapt the QOM rST document accordingly. Reported-by: BALATON Zoltan Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20230622101717.70468-1-philmd@linaro.org> Signed-off-by: Alex Bennée --- docs/devel/qom.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/devel/qom.rst b/docs/devel/qom.rst index c9237950d0..2828843058 100644 --- a/docs/devel/qom.rst +++ b/docs/devel/qom.rst @@ -26,7 +26,7 @@ features: typedef DeviceClass MyDeviceClass; typedef struct MyDevice { - DeviceState parent; + DeviceState parent_obj; int reg0, reg1, reg2; } MyDevice; @@ -147,7 +147,7 @@ will also have a wrapper function to call it easily: typedef struct MyDeviceClass { - DeviceClass parent; + DeviceClass parent_class; void (*frobnicate) (MyDevice *obj); } MyDeviceClass; From patchwork Fri Jun 23 12:20:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695255 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1924662wrm; Fri, 23 Jun 2023 05:33:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7f6NXvQw/G0LSBcLOKhvElRMO0zSrYmfK0eUaKWjX33NF+ThQ4dKX6ajL+Qbhsr0YWHCd1 X-Received: by 2002:ad4:5bab:0:b0:633:45e2:5603 with SMTP id 11-20020ad45bab000000b0063345e25603mr1248239qvq.60.1687523594555; Fri, 23 Jun 2023 05:33:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523594; cv=none; d=google.com; s=arc-20160816; b=T3bB3U6HKhiwJNneHRgS5ihtwt4fJ8hYxdW1E2InsZVK4wN6IgmP/boXwkIajOz+Iz 5bZxUu44P1IkzYBSv2/BAU1gER69YGwy0gddfhsNEO0YwAa4uKMaK1zrOIsuiUlpXCcf k43LM8j3MHH5He4I6ktF8fQunaQ42mhNtDwNcUn9Ioiez4B1BYYGpN9DIJtNbq0OKW9c 2bZyh+oO9NYrU+AHUCSjs18L579i4PKa4Io7SALm6g+9y+Msvgxa0hSFNzsCgtgy5A8m w+h+9QnBurZ/tsgwQEqT+6iEB8dD0F8aMckOZ/NpK7BDm6PMJv5SPcVhRNDlKQqbJQ1S MZ3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MH8q2iOgTUeX14EJZw8vp3pnXPRkiEedRymAvSCpuUo=; b=qTL6pvsIR/n50AsAVbJ3UYnQucYCC/R4MP7BVnHh6W9NNGImdLYvTGHJ8sXdnQUWw3 3yH0OqCa4bzoJeyPty0NR5VpcRJ5wlL54mmdzZSdPjpc6PUIVcmvRYU7Y8HuXyC4fR05 6i/urFhYXfABIr1qI67yvPVWCXjzal93tiyr4vnFujHYU3USKDpaHqy4Bsh8nGzfD5WF VjI8B/+7DrVbMihL22BIrNl4EycAivsV5KMnJ7gD+uIxLSE2s4z7C/+tEHysV1qubEhn WvUylDeQyFNEPY0ELCsZFMmsIrpNRqCbF7pDNWIjBh6NLY1XPlketrTnfd4SagrVuB2j OaPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SuoHao7Z; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q6-20020a056214194600b0062ff9fa8d2csi3663619qvk.71.2023.06.23.05.33.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:33:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SuoHao7Z; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfwe-0001L5-IN; Fri, 23 Jun 2023 08:31: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 1qCfwK-0001AV-5A for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:31:01 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfwE-0000Up-Fy for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:30:59 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3f90b8acefdso6681915e9.1 for ; Fri, 23 Jun 2023 05:30:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687523452; x=1690115452; 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=MH8q2iOgTUeX14EJZw8vp3pnXPRkiEedRymAvSCpuUo=; b=SuoHao7Zwm8fDp6+rfCUOPx6ojzfiUHRaGmhqEtaaYkNxxm33csRVffHJZno6I8155 oW6EDJXWxmMDdHKZt/rjHqFb7Mo4o231+zL49Rltp66ZzaOjk957Vr0Kxce4UF5lAEC0 6yr2vIV4kFukUsW5QS3p/vsBJtW7YYmkGqyaUXPzMUmO5WO6+yUeBKHciPGvLs1oTIN6 JNCURXjfZ/6JnzlbtAdwnyr8fpU4DFa381DaTjJkjZ6R37KBpe1aFTyeyMNqPOK27QM4 Uy6Dpw9hoEjGfeUlxxJYrP5uVqIayaGhRVSh1xVpohn4hOkACRrYQVaOnF7bpih5papt wyww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687523452; x=1690115452; 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=MH8q2iOgTUeX14EJZw8vp3pnXPRkiEedRymAvSCpuUo=; b=JXcfPpAXXXA7kh7VXt2g5Nii0XA8mM8F5JvCmZnE8F2hpewOXdXEjpSTST9r0EcxQe lWhZObmlD+9msRt/u7UX1NarE7vA6nobhhek7CSsx4Aq6+hEuqoTm4Y0do8H0QZkh66o BHhFr903GjIwcInE1SiQcyQGvmYNOxNOZD4jZxJmUTOvAiK5VkjEdD1FDTdM+50hgMZU FJRqS40P3ynvaCeDJrf/ywloIESPvV84Yfr/d7X9ViZ5amILYMK7v6t3oDRCkYzt+kCV agl3n+j/C7CBVswbHxT6Yl6IEv51R+Yc8V5HCAP/ZdFoBzRmyJZHAjVPyrmwb/yBoWsG YNTA== X-Gm-Message-State: AC+VfDwfGzDecO89fKXxqIygW6CYluHU549VTcD/pGt7v/+E5K2OXJHI DyUL5BuGeJ66i2Gvm5IJfUOVSQ== X-Received: by 2002:a7b:cbd9:0:b0:3fa:7d9d:456f with SMTP id n25-20020a7bcbd9000000b003fa7d9d456fmr950487wmi.40.1687523451680; Fri, 23 Jun 2023 05:30:51 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z20-20020a05600c221400b003f8f8fc3c32sm2211198wml.31.2023.06.23.05.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:30:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 89A521FFC0; Fri, 23 Jun 2023 13:21:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 25/26] docs/devel: split qom-api reference into new file Date: Fri, 23 Jun 2023 13:20:59 +0100 Message-Id: <20230623122100.1640995-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Lets try and keep the overview of the sub-system digestible by splitting the core API stuff into a separate file. As QOM and QDEV work together we should also try and enumerate the qdev_ functions. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20230619171437.357374-5-alex.bennee@linaro.org> --- v2 - also include qdev API --- docs/devel/index-api.rst | 2 ++ docs/devel/qdev-api.rst | 7 +++++++ docs/devel/qom-api.rst | 9 +++++++++ docs/devel/qom.rst | 3 ++- 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 docs/devel/qdev-api.rst create mode 100644 docs/devel/qom-api.rst diff --git a/docs/devel/index-api.rst b/docs/devel/index-api.rst index 7108821746..539ad29c21 100644 --- a/docs/devel/index-api.rst +++ b/docs/devel/index-api.rst @@ -11,5 +11,7 @@ generated from in-code annotations to function prototypes. loads-stores memory modules + qom-api + qdev-api ui zoned-storage diff --git a/docs/devel/qdev-api.rst b/docs/devel/qdev-api.rst new file mode 100644 index 0000000000..3f35eea025 --- /dev/null +++ b/docs/devel/qdev-api.rst @@ -0,0 +1,7 @@ +.. _qdev-api: + +================================ +QEMU Device (qdev) API Reference +================================ + +.. kernel-doc:: include/hw/qdev-core.h diff --git a/docs/devel/qom-api.rst b/docs/devel/qom-api.rst new file mode 100644 index 0000000000..ed1f17e797 --- /dev/null +++ b/docs/devel/qom-api.rst @@ -0,0 +1,9 @@ +.. _qom-api: + +===================================== +QEMU Object Model (QOM) API Reference +===================================== + +This is the complete API documentation for :ref:`qom`. + +.. kernel-doc:: include/qom/object.h diff --git a/docs/devel/qom.rst b/docs/devel/qom.rst index 2828843058..c342ce18e3 100644 --- a/docs/devel/qom.rst +++ b/docs/devel/qom.rst @@ -387,4 +387,5 @@ OBJECT_DEFINE_ABSTRACT_TYPE() macro can be used instead: API Reference ------------- -.. kernel-doc:: include/qom/object.h +See the :ref:`QOM API` and :ref:`QDEV API` +documents for the complete API description. From patchwork Fri Jun 23 12:21:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 695259 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp1925093wrm; Fri, 23 Jun 2023 05:34:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7YX8tezHpRdvzNuclKaKPAEEBsy5awwXuXAbYsn2FEQV/IJu6ztDUNCT9LB/AR4JxljIZu X-Received: by 2002:a05:6214:411c:b0:62f:ebc4:89b7 with SMTP id kc28-20020a056214411c00b0062febc489b7mr22880342qvb.26.1687523647784; Fri, 23 Jun 2023 05:34:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687523647; cv=none; d=google.com; s=arc-20160816; b=D/2JLHkgBcdzCyb0EGJPrtRgte02FiMRGdirNhkabEtbX33XNXO5YY//Sg/uVe+Kmj zKCcKWZKB+MKnlgGS5LNN9QK+fnGV+N5zpuxdKIIyKfuz1eb6mY9jkKDv1JfnFE3T8ut nTe7u69Z+dOvfKPzF5w0DnciNuMMqLVCsI4KIMyiWcSmbJJrEz6qzbqerJgdLuU4bghz rdqCfVKoiGg/u+lhD/c2+DAid898naN9EhH0NqbYYCYyTiIhTKJYWfgnr4gHnXrJ9Wez mKx3DYt0WxpjGz7pRm+kBBAJ9yuqRIFhhsbRyXKJIuOTJICN13UAuYYLdIxHSl8p+hgd ZBEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=z+Ft1R3JBDSn9JTJ33FIkeeIZZV1IyyGZBrwy7UUFlQ=; b=QJ+TlSgfokhdyziZ1V8WO6WhZWQj2sN2Ti3fPxZ8rndW0/BJxDVJ3LHiMvj2SQ9QqU 4/ltRjAaqbOxNdSHVdYKtjq4vH8mf5h5nxwU5sTyLhDB4ZQj5b5zWt09zO7IYANpigwZ jTm7ktEEFKbD3Olnft66dxycTDLBOYXhOdH+2tFv+38UTT+P18QQGvcOKUGLgiz6Uxl6 RgeCBh7/D3ffktnzCHg8jSG4juuWYlIRDTemb1thMVZPoRVKETMeZJzPa60mp5vVyAJl 2F703NwiLbtDCnWc489tsSCbPqH3Rf+unk3sJMEGJMnmuMQsZMEkXgX0laCE981XJVwL Kgrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UrZpQuhJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g5-20020a0562141cc500b00631e793b9dcsi3616192qvd.541.2023.06.23.05.34.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jun 2023 05:34:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UrZpQuhJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCfwe-0001Kp-C0; Fri, 23 Jun 2023 08:31: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 1qCfwJ-0001AR-Sp for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:31:01 -0400 Received: from mail-lf1-x12d.google.com ([2a00:1450:4864:20::12d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCfwC-0000Tw-Nq for qemu-devel@nongnu.org; Fri, 23 Jun 2023 08:30:57 -0400 Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-4f86bc35f13so730075e87.1 for ; Fri, 23 Jun 2023 05:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687523451; x=1690115451; 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=z+Ft1R3JBDSn9JTJ33FIkeeIZZV1IyyGZBrwy7UUFlQ=; b=UrZpQuhJ+ELEtNGXLL+z+JySVvPbOrVLnheKfv0tZpfAEc4bttSAfyN5sp1TfFEy94 bR/7Ge85dIuxeFwTrYTkfvwRzEiqbMOxjiH+b7CQOSNVGwkzt96+s8f7gDllq0x7D0+P HNlt+/ykaqZ2Akdl5cnjLglFlppu64x7OMCiM5NB4PFfTWxlaRBWvzE1sIng6Ovr7i47 0FKZDSJvZ5ERU3dZhBrB6Rfc+MDALLdfnpGY68Uq4iFpBIMY33H1s9SDBxH04VzDo8JX lKOAMQTn1CVdYx9OOj3xggbWREqfBK2qigxbCAFmf61rLC+dRlsukZ+pWFroD16b7PHQ DgGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687523451; x=1690115451; 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=z+Ft1R3JBDSn9JTJ33FIkeeIZZV1IyyGZBrwy7UUFlQ=; b=MCljgqjY68fAl6M2WIUTpswihzvwxZLXfi2kqNHIt7iJGOp/9mNJl2iJQrfgwwMYaF FMFkfzX92hVM3q00gre7G/iv7oSo3nHgKEVxuv7jz22el4tjLuXIzG4PgQFuQ7EwwoFt uWEzMX8H4L6mH3uNTUVY3w1Vy5z5xK2k35dv7em9xNHJ15rh0sn5G+4YAL+Dseo2kqRl 0Omigfs38b/na2hmdKBfpHRc98gTuKj7gEWxuv4z7aHYNFfeKrvYhap8eWxWCt7QHYhq yDqeuXQhT40TQjkqpHEMIN+Cv7YEqeMp5ZNH/x5EuiWhJaFVitP2+ZcycpDWxrz2TgNk asrQ== X-Gm-Message-State: AC+VfDwJ3nFmBE/jh11GWraCerzqX2g09fBgQF3sInGyn6YnJY6/wVWX nx+wtXz7r8EbjDeHeDx7sqDhrQ== X-Received: by 2002:a19:e602:0:b0:4f9:5781:862a with SMTP id d2-20020a19e602000000b004f95781862amr5631412lfh.38.1687523450939; Fri, 23 Jun 2023 05:30:50 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 12-20020a05600c020c00b003f9bd9e3226sm2261931wmi.7.2023.06.23.05.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 05:30:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A2DC31FFCF; Fri, 23 Jun 2023 13:21:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Juan Quintela , Peter Maydell , Cleber Rosa , Darren Kenny , Alexandre Iooss , Peter Xu , qemu-arm@nongnu.org, Eduardo Habkost , Riku Voipio , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Bandan Das , Marcin Juszkiewicz , Radoslaw Biernacki , Alexander Bulekov , Leif Lindholm , Qiuhao Li , Wainer dos Santos Moschetta , Marcel Apfelbaum , Leonardo Bras , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Bin Meng , Thomas Huth , Beraldo Leal , Laurent Vivier , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 26/26] docs/devel: introduce some key concepts for QOM development Date: Fri, 23 Jun 2023 13:21:00 +0100 Message-Id: <20230623122100.1640995-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623122100.1640995-1-alex.bennee@linaro.org> References: <20230623122100.1640995-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12d; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x12d.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Using QOM correctly is increasingly important to maintaining a modern code base. However the current documentation skips some important concepts before launching into a simple example. Lets: - at least mention properties - mention TYPE_OBJECT and TYPE_DEVICE - talk about why we have realize/unrealize - mention the QOM tree Signed-off-by: Alex Bennée Message-Id: <20230619171437.357374-6-alex.bennee@linaro.org> --- docs/devel/qom.rst | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/docs/devel/qom.rst b/docs/devel/qom.rst index c342ce18e3..0113afb6e6 100644 --- a/docs/devel/qom.rst +++ b/docs/devel/qom.rst @@ -13,6 +13,53 @@ features: - System for dynamically registering types - Support for single-inheritance of types - Multiple inheritance of stateless interfaces +- Mapping internal members to publicly exposed properties + +The root object class is TYPE_OBJECT which provides for the basic +object methods. + +The Device Class +================ + +The TYPE_DEVICE class is the parent class for all modern devices +implemented in QEMU and adds some specific methods to handle QEMU +device model. This includes managing the lifetime of devices from +creation through to when they become visible to the guest and +eventually unrealized. + +Device Life-cycle +----------------- + +As class initialisation cannot fail devices have an two additional +methods to handle the creation of dynamic devices. The ``realize`` +function is called with ``Error **`` pointer which should be set if +the device cannot complete its setup. Otherwise on successful +completion of the ``realize`` method the device object is added to the +QOM tree and made visible to the guest. + +The reverse function is ``unrealize`` and should be were clean-up +code lives to tidy up after the system is done with the device. + +All devices can be instantiated by C code, however only some can +created dynamically via the command line or monitor. Likewise only +some can be unplugged after creation and need an explicit +``unrealize`` implementation. This is determined by the +``user_creatable`` and ``hotpluggable`` variables in the root +``DeviceClass`` structure. + +The QOM tree +------------ + +The QOM tree is a composition tree which represents all of the objects +that make up a QEMU "machine". You can view this tree by running +``info qom-tree`` in the :ref:`QEMU monitor`. It will contain both +objects created by the machine itself as well those created due to +user configuration. + +Creating a minimal device +========================= + +A simple minimal device implementation may look something like bellow: .. code-block:: c :caption: Creating a minimal type