From patchwork Tue Jul 30 22:19:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 815332 Delivered-To: patch@linaro.org Received: by 2002:a5d:4acf:0:b0:367:895a:4699 with SMTP id y15csp496114wrs; Tue, 30 Jul 2024 15:20:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJlE5szFGtITXplzhmuV1qUyShOWpvyQq0DZ2c3an4TWp+5RhwCjsPKtpuH6Mzptq6SK7C/d2WI0gCauhjZbJN X-Google-Smtp-Source: AGHT+IHI1Tn75s7yTLwskO0ZTt0Br2ULnungVTlz2Gl5kZuEZl1ZyKCVCT7az7MrWc3noaDB3Ajd X-Received: by 2002:a05:6214:260d:b0:6b4:fbf8:d652 with SMTP id 6a1803df08f44-6bb5597d578mr172610766d6.1.1722378033624; Tue, 30 Jul 2024 15:20:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722378033; cv=none; d=google.com; s=arc-20160816; b=XvBsVXSs9OukDt5EEwSRyzWBCFy2Uvw8PfdqPXuTyKvgA2mMH7SFA8mn9vpGEHjieK 1tz/iqpwmAV9+gK5ww1w23bM3ve6bRCOX8pb5p0jpxMjb/VHNkQTCQKgUgZiHWpW1MJm hY+JNkIsFNeiuf9WOdA4wPRLO2GI/LKUxpwE1AWAp6B3ICMWKLLWd/B3ih5AiRevl4oR 5XvSq1EDgcPEnCydvBsjpLY/giKHXRJX4ySiIz08qwxA+qk0ZBJAVah3cWw74bh7bSFz o9vnV3ODfzmm3U0H8C74hIwPQW0ompUnEPR6ayURCqwSBV6G05khzAeQhXV66AwVqI/r AFTA== 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=1/zGXteK/S9WGQeoxuzITGtgb8/HqBY0j6sCJN6VEFg=; fh=xnAl8QX98odZLqr6Xt1AlT8vDt8DqBCZvQH2nMnmf3Q=; b=jUDEJspHZDv1JOOysn/98+KOQeZq8Z5TZ9z0GXV06o/bTZ5x4g95sCz1QThB6Jhdvs A8cz6DaN0aIHQOouWb9MKCS0WDgw+l3gwHdf1XQkwPJx4EO2m6xlW6yMqK5I/ZEUKY9K D4QT/kpJnJXJ7FHP2n92NG84OLzo/+PVjUKO7+CzA2c/JGnZdzjGgLeAqYaJmcCR5lUr m6Yq9xD99F2gL05z8anYifHKrr7IEttRel/X1P51oJlXNdsJv+3tKeMPdlpkRPMYlUeM 3eTVxwND9elq1mPvs+bEIRIJuMIxLopkKv4J2I1SCR2PPBi7q4s/9KqN0lAxrv226P7f lZmQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UOLN2kkG; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6bb3f8cbcb2si140865336d6.62.2024.07.30.15.20.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Jul 2024 15:20:33 -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=UOLN2kkG; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sYvCU-0005OT-3U; Tue, 30 Jul 2024 18:20:10 -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 1sYvCS-0005GW-FK for qemu-devel@nongnu.org; Tue, 30 Jul 2024 18:20:08 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sYvCQ-0006hd-DY for qemu-devel@nongnu.org; Tue, 30 Jul 2024 18:20:08 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3687fd09251so2547751f8f.0 for ; Tue, 30 Jul 2024 15:20:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722378004; x=1722982804; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1/zGXteK/S9WGQeoxuzITGtgb8/HqBY0j6sCJN6VEFg=; b=UOLN2kkGPXYZVvydsiw5j9Hy5mzQ6srPmk8FRLd3TmN2lqHHFAucFquWGMLnZRjLcW A+o1O4bkfJhxkgfsJrI/OQXfate7/8s6woITO4MKAWdFF10ZTgfJaVh5yAmCXE/NEgCi GMuLni+UC7nZ4hHwOGy2gjvOQHNZ1SbCW4lxAYF4qXcFN9Zl3PjSOtdz5f6asmnO59J8 urmpiWczvA5DHqlXn+9sHL41zjjKQaSC+OR8mItzmKp1zdhriidf5nkQT+/jyQmuuZ/n +TMTvh8ZYdnjKDAXaaDVGCfwdNV/A0dADddB0dswcBO/bENRPzbzhPz+mGfYKc4p/Kdg qUuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722378004; x=1722982804; 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=1/zGXteK/S9WGQeoxuzITGtgb8/HqBY0j6sCJN6VEFg=; b=LuNg4Q/iFtIyc9IUgkIMRHRV4sPl9CBXCM3HT4vQZbEqyMOIhJrkvoWkxTALnT61UE PRkqQuAD+jRkYP4WbkFyhexooMwTbPiTgZflYjY2hedsrtcwFhjTW1TkhZKMRSdsmNKG X5DBIhrlhWxPYOAyucoleQjiibLZR91Yt99PTIKqddzSj1W0IAZTketKdMZHvFw5MX5S F9tziQI3oy4v27RIZ6jDJfhE1C4P7c3SRKgbh/owSKI/IGb2CZdMLD8IgQeNI2K5Wu+R QG/EiRTR46Z2/837v8Wsd7suGkSEt5oFFvNhZL6VdNW+RM75kHuKCMsrdfED3OqKG71Y ojKw== X-Gm-Message-State: AOJu0Yxo/QcjKIqTSXRFin8fDx09eY4DZCQmfGdvmAizDNhSlPs++dcx vWWhPHQoMRZ75TQIEaeJmkXVb+jNaX64X4mmpLZTa1OxvuUnmkhj7ibZsdLPRr5CUBAQkzbFacT gRys= X-Received: by 2002:a05:6000:156c:b0:369:b7e3:497b with SMTP id ffacd0b85a97d-36b5cee2f89mr8744490f8f.12.1722378004227; Tue, 30 Jul 2024 15:20:04 -0700 (PDT) Received: from localhost.localdomain ([78.196.4.158]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36b367c0338sm15798405f8f.1.2024.07.30.15.20.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Jul 2024 15:20:03 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P_=2E_Berrang=C3=A9?= , Markus Armbruster Subject: [PULL 1/6] docs: add test for firmware.json QAPI Date: Wed, 31 Jul 2024 00:19:52 +0200 Message-ID: <20240730221957.34533-2-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730221957.34533-1-philmd@linaro.org> References: <20240730221957.34533-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Weißschuh To make sure that the QAPI description stays valid, add a testcase. Suggested-by: Philippe Mathieu-Daudé Link: https://lore.kernel.org/qemu-devel/d9ce0234-4beb-4b90-b14c-76810d3b81d7@linaro.org/ Reviewed-by: Daniel P. Berrangé Acked-by: Markus Armbruster Signed-off-by: Thomas Weißschuh Tested-by: Philippe Mathieu-Daudé Message-ID: <20240724-qapi-firmware-json-v7-1-12341f7e362d@linutronix.de> Signed-off-by: Philippe Mathieu-Daudé --- docs/meson.build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/meson.build b/docs/meson.build index 9040f860ae..322452c877 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -99,3 +99,8 @@ if build_docs alias_target('html', sphinxdocs) alias_target('man', sphinxmans) endif + +test('QAPI firmware.json regression tests', qapi_gen, + args: ['-o', meson.current_build_dir() / 'qapi', + meson.current_source_dir() / 'interop/firmware.json'], + suite: ['qapi-schema', 'qapi-interop']) From patchwork Tue Jul 30 22:19:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 815336 Delivered-To: patch@linaro.org Received: by 2002:a5d:4acf:0:b0:367:895a:4699 with SMTP id y15csp496219wrs; Tue, 30 Jul 2024 15:20:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUojnNsvqPlrWl0mrZF/S0xsIJuVqHFQoNA+vsqupZFLIo/TvlS+BH4nNJsQcZLLIOBvCW0BU3EqJsSpeGy9U5L X-Google-Smtp-Source: AGHT+IEpA95w9pAY2mtAc5FN/GF9p2VkrZJJ2nHF5e+o0HDaetULi82/BvbE8F47Tlaot0bnmA6M X-Received: by 2002:a05:6808:bd5:b0:3da:a16e:1750 with SMTP id 5614622812f47-3db23a2ded5mr17059784b6e.33.1722378049962; Tue, 30 Jul 2024 15:20:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722378049; cv=none; d=google.com; s=arc-20160816; b=zlJMQJo1png+3WLAhYDpGDJV/aydRYiqc4A05s5KUDD8PJTm2WR98nHhCz+YCM0KC0 DPY4lxhA7qRUSZPKz5V/hQ7GCfhpV/Wahoqi2MAnE471DSe4+XaLVvy8l/3gFVRQLlgG 6xXEopkTjw9DWwqmKBghXc3eeb3beGhxHDGktxuJd6bWLGj44CzDCtBE29Uj7ICV2K4s S1qI25sLnRifKcfSPXBisLgZ5SQ4HUjODr4ZfjAMchzgwn+Wc4+QJh0MmdMLAnnHVX3z Ktj6jyIyBus40J4G575gEHnW0kKskvv8VH+NI0vbFlVFpPi44NyZIez+U/BDGJVacylj oGGw== 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=X07qTbL83zQOZhtssmu4m+yBs6p/aBS1K1qhIZAMOfc=; fh=LrPQuEKVF+Dsx2F4DCB8BVVQW8BdXsyh1KCq0lVL1mo=; b=ENWFINj6lA1GCFL7QEzAEy17eZvzNWTfWC31HOtH8Sp+r9WqigS3Gcs/0N+BP3qomI bUgrqJ9DGbgCrW5Kp2zELFa7Jeogb6NnyYfdW9OE3TgYn9C/Fa9n4TOb8OlGHAmzZ8Ie hkbimFieaPQ51qpGHkCrVFfcIT5HuIh8gu9IDHfCeDVLNr2+wvAQu9+lCMYKTW2Yf26i vAGfJG6pDMCM+9Y92szQ12C3hLNLHFFBnJ5ZzsF/Vu7DknTmKqa7H5GSJNa6ahW4E+Ye 4NbJnljrkU+fQVo5ob2ku/07evlgC0yXTXy4nk2UQ3iVHzB0HHBPbdGvsyI2/ZTiXbOv RJkA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RflqPW2N; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-44fe8137506si137526331cf.122.2024.07.30.15.20.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Jul 2024 15:20: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=RflqPW2N; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sYvCY-0005hI-RB; Tue, 30 Jul 2024 18:20:14 -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 1sYvCX-0005bu-GS for qemu-devel@nongnu.org; Tue, 30 Jul 2024 18:20:13 -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 1sYvCU-0006i6-WD for qemu-devel@nongnu.org; Tue, 30 Jul 2024 18:20:13 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4281e3b2f72so22163015e9.1 for ; Tue, 30 Jul 2024 15:20:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722378009; x=1722982809; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X07qTbL83zQOZhtssmu4m+yBs6p/aBS1K1qhIZAMOfc=; b=RflqPW2N+9sf1OruQg05FI3DZV7I+94gqUw6UdU/b6VH2GeJNdj/bm6izkxBbn5q6N GFF5QmnQNggF4xyBaJMjsF2ROsaTfYxqhHJ5h+AOCJAfkRL+JkNL4G8OILVjtio8AA51 S6ibcYfZ7H0eggrbc4r1tPBzGLqHUTGo0VnH0HSxEQVJi8qm1o/+bm9AdgT70YXdk4jn sWG2azUuBGAn6c2hB4MokunT0k0W3Xu/kFh4JrTs7OmDp7ycrLoz4DTpDGkAgcVEZYm0 Hi4tEXZAxSEvuy6GLw2gC7u6TNjd3kdI8w+eLckLKjhengZHdqq9sIA/xs0XfBQKo9HH zdaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722378009; x=1722982809; 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=X07qTbL83zQOZhtssmu4m+yBs6p/aBS1K1qhIZAMOfc=; b=s6q4g2nsixoyz6RNRj2kxyrl2i0CPOMzRA9ZRZGP4GYxm8SExJRwA/jb6Pyu/0LCI/ 8PI0ItV45HCCOfS9Z2Vn853EC0beDjZgMyHW2LnFJZcJ17hpHhCqMdJOyJTIQYdYKuBT S3703zRfqoAPiyDUrTW76hHw0iQsLxyG9BMe6nvkcNaIlYfUNKfGWQYpqFlsc9lL1x70 2/vNSSqAWMmteisSZFvo9gG9Oa1G8Acrv47dTo5d3z79EVcNda3F+58Fa+r/2hyqEuhB haDCARruvaG27C3/QEeVstXFEA+VNWnfnRjoM3KVGtKJ4wM5/xW0UeYMkXSQI+Oc6FVG 4Wsw== X-Gm-Message-State: AOJu0YyxrcA2nvshyAu2QuyY61tBDNDfBw7KW0EX6G3lsYnMch7ofFN5 ew6OWlFAbnrtK/gC6Y46gjlM9huh51Jh0bqSzwlUQ10SjQjqhHx1yKxHL6hBY+MRm9PzM+eB9PP MdXU= X-Received: by 2002:adf:f147:0:b0:367:95e8:3aef with SMTP id ffacd0b85a97d-36b5d0bc565mr6633811f8f.42.1722378008731; Tue, 30 Jul 2024 15:20:08 -0700 (PDT) Received: from localhost.localdomain ([78.196.4.158]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-428057b645dsm228583675e9.43.2024.07.30.15.20.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Jul 2024 15:20:08 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-stable@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 2/6] docs/sphinx/depfile.py: Handle env.doc2path() returning a Path not a str Date: Wed, 31 Jul 2024 00:19:53 +0200 Message-ID: <20240730221957.34533-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730221957.34533-1-philmd@linaro.org> References: <20240730221957.34533-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell In newer versions of Sphinx the env.doc2path() API is going to change to return a Path object rather than a str. This was originally visible in Sphinx 8.0.0rc1, but has been rolled back for the final 8.0.0 release. However it will probably emit a deprecation warning and is likely to change for good in 9.0: https://github.com/sphinx-doc/sphinx/issues/12686 Our use in depfile.py assumes a str, and if it is passed a Path it will fall over: Handler for event 'build-finished' threw an exception (exception: unsupported operand type(s) for +: 'PosixPath' and 'str') Wrapping the env.doc2path() call in str() will coerce a Path object to the str we expect, and have no effect in older Sphinx versions that do return a str. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2458 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20240729120533.2486427-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- docs/sphinx/depfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/depfile.py b/docs/sphinx/depfile.py index afdcbcec6e..e74be6af98 100644 --- a/docs/sphinx/depfile.py +++ b/docs/sphinx/depfile.py @@ -19,7 +19,7 @@ def get_infiles(env): for x in env.found_docs: - yield env.doc2path(x) + yield str(env.doc2path(x)) yield from ((os.path.join(env.srcdir, dep) for dep in env.dependencies[x])) for mod in sys.modules.values(): From patchwork Tue Jul 30 22:19:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 815334 Delivered-To: patch@linaro.org Received: by 2002:a5d:4acf:0:b0:367:895a:4699 with SMTP id y15csp496164wrs; Tue, 30 Jul 2024 15:20:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWXCuyvXvrqSpIMKgd6SnKndK5B+QU4zekZR5WlYRyLYipGdbsjCKm9Vni5fp8V0v0tekYqDaHAeFdGXLOjlbYH X-Google-Smtp-Source: AGHT+IHqV56fqs/ibulePuCFMfz+Yqx5Oqh4r0VHC4LDXauR9m/bHHPDgIZNhR72AzQgjCF+kaNd X-Received: by 2002:a05:620a:4308:b0:794:eb81:32c4 with SMTP id af79cd13be357-7a200ca77c7mr571468785a.10.1722378040718; Tue, 30 Jul 2024 15:20:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722378040; cv=none; d=google.com; s=arc-20160816; b=wEBCe5eUHYlJb9offyNctoYS4Z7xcbu1FatcQimFB4qVe9XO1B6ZhbN5qd3yT77lgC BsC2pukDcSBydGgc8PnE+AiyRBnPXU3AGfkUczCZ/wrMXsR74lsTkpRvO8xPXDPQq2Ei 2FQVx9OFAENTHRfTkR5HEXI2KFjGf/edTVjoIStlRtITBRppH+FXTua/1PY9YmtrlMdQ 7lTcn/e9He+O9aMYt5Uwpb/jmF+ycMBMEepob0zuxhi/FkJMWj88ZYYGBGIgb0WRecKN aLDgOosOE7xmZTtUe3aEXisPy2aE81kK0FOJIySmPZTEIhRM7pgZ0RgEGLzV2x2Q7zqV viRA== 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=24RQoEKyoT+5UpLOepmNrf2/RkiZNFw5AqywzTwtt80=; fh=2YuGMIHCKS5W/N503i7KJHequyP8t3veMFb+DWNaJwo=; b=jn4d0QKwj4wjuxH3aHvjolr5Kw5hoZfcxcDceCE2c/+9mrRX4Nli1a6P0LzP4+lZ0z A4I5zYqEuIOqB5eDW3YAd4hvfiVLtqfLFmQqGlyXqPBBV5qipY8okOF9A2eJgsRJv/jC 6rboy29PNb9oryeHYBjSRS0IWTmiFyDyDQaMheGa2rqfLN6HtmXy106TJaSNTMk4zIcN qpMUqzfuLO2FC9tg8RwateiOUCA1ZqrdjIB1ilX/i029iZHVuASyQrrHMHPiBDgKY2CQ y5bDg8jjyqB2fX24jtqUmZO1UAL+FatvGegDjGMJ8AQMWJ+je4FTu1MDZFGQBRwUBEbj sUDg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zGXGjZVb; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a1d7399655si1360313985a.136.2024.07.30.15.20.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Jul 2024 15:20: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=zGXGjZVb; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sYvCc-0005zj-Nb; Tue, 30 Jul 2024 18:20: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 1sYvCa-0005pM-Oj for qemu-devel@nongnu.org; Tue, 30 Jul 2024 18:20:16 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sYvCZ-0006iv-10 for qemu-devel@nongnu.org; Tue, 30 Jul 2024 18:20:16 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-368313809a4so178094f8f.0 for ; Tue, 30 Jul 2024 15:20:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722378013; x=1722982813; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=24RQoEKyoT+5UpLOepmNrf2/RkiZNFw5AqywzTwtt80=; b=zGXGjZVbbv7NTLfgx57Pmjdk7i2QwSJ6IWN9T5e6Yqj9uJzTC6KsOsSrO27i0t2ZvB nxCkFUhV6okfRDZJB5m1MR6JtR+0E+EeCnspq5RaYWIOV0AxtWs4eAExpcH3cVO4dceU Y+cCsxT4x5G9cPZF2TpZEbbDaB931NtXGU5ZZCfJVDfseIyazfwk3e8g5oL8P/6NMuvu KWIGlzmZttiHlb6JAfk4jcLkc3PVyuDllIHyWxLUPDYvFRfZfCntBLTXzWSIAlNlj5s3 OZCbkRzZLqF6WsOH80mjj51lBEt44p1V7mYrAD04Px9gwx5d7cnJLJoa60WJsZQ0Awk7 mEBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722378013; x=1722982813; 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=24RQoEKyoT+5UpLOepmNrf2/RkiZNFw5AqywzTwtt80=; b=rcgWAPP7mM/i/5f8Y7y49vx9SAKS9GibGkhWB98g4MCxOz+JUknVYxpHsFta+JENxJ rVauR5ghdaHSzfwTzPJp9I4/GFiomQsHEcLM76DuisZTglj5UtZfA76jZarMiJOBErtj N6AZ/8BdsSptt8h4zNVt34E5Wo0+jesSd8r93W3NUrmc58pUanUlVWZfng2OnFB5TMjt T172LXkKOaNDolo5aOUEYjyXhljrUASFDKCcvOSzn6YMGoh16hUObUDkX1vzOEbNMWXh V6TMCdJBFRbrauTaotnSw3E+eTCaBWPQYsvu+KGu8fZC272HQniRHCc2SETYiawia/5B aM1w== X-Gm-Message-State: AOJu0YwFPBSl+vrveEoXcc9OOaSbjcan+XHFdEWVNg0+YdfngL+ScVbv 9ROzVRldakHJMQdJe3MBswTEsSoXUZPHJwNAWLU+pOM0j89nbBmRdSuBUM4FSGgFq3Zh6DIVMpn G8Xs= X-Received: by 2002:adf:f6c3:0:b0:368:6bb:f79e with SMTP id ffacd0b85a97d-36b8c8d7eb2mr2009958f8f.4.1722378013231; Tue, 30 Jul 2024 15:20:13 -0700 (PDT) Received: from localhost.localdomain ([78.196.4.158]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36b36857eb7sm15585085f8f.66.2024.07.30.15.20.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Jul 2024 15:20:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 3/6] tests/avocado: mips: fallback to HTTP given certificate expiration Date: Wed, 31 Jul 2024 00:19:54 +0200 Message-ID: <20240730221957.34533-4-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730221957.34533-1-philmd@linaro.org> References: <20240730221957.34533-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Cleber Rosa The SSL certificate installed at mipsdistros.mips.com has expired: 0 s:CN = mipsdistros.mips.com i:C = US, O = Amazon, OU = Server CA 1B, CN = Amazon a:PKEY: rsaEncryption, 2048 (bit); sigalg: RSA-SHA256 v:NotBefore: Dec 23 00:00:00 2019 GMT; NotAfter: Jan 23 12:00:00 2021 GMT Because this project has no control over that certificate and host, this falls back to plain HTTP instead. The integrity of the downloaded files can be guaranteed by the existing hashes for those files (which are not modified here). Reviewed-by: Alex Bennée Signed-off-by: Cleber Rosa Reviewed-by: Akihiko Odaki Tested-by: Philippe Mathieu-Daudé Message-ID: <20240726134438.14720-2-crosa@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- tests/avocado/boot_linux_console.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index c35fc5e9ba..450d67be6a 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -299,7 +299,7 @@ def test_mips_malta32el_nanomips_4k(self): :avocado: tags=endian:little :avocado: tags=cpu:I7200 """ - kernel_url = ('https://mipsdistros.mips.com/LinuxDistro/nanomips/' + kernel_url = ('http://mipsdistros.mips.com/LinuxDistro/nanomips/' 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' 'generic_nano32r6el_page4k.xz') kernel_hash = '477456aafd2a0f1ddc9482727f20fe9575565dd6' @@ -312,7 +312,7 @@ def test_mips_malta32el_nanomips_16k_up(self): :avocado: tags=endian:little :avocado: tags=cpu:I7200 """ - kernel_url = ('https://mipsdistros.mips.com/LinuxDistro/nanomips/' + kernel_url = ('http://mipsdistros.mips.com/LinuxDistro/nanomips/' 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' 'generic_nano32r6el_page16k_up.xz') kernel_hash = 'e882868f944c71c816e832e2303b7874d044a7bc' @@ -325,7 +325,7 @@ def test_mips_malta32el_nanomips_64k_dbg(self): :avocado: tags=endian:little :avocado: tags=cpu:I7200 """ - kernel_url = ('https://mipsdistros.mips.com/LinuxDistro/nanomips/' + kernel_url = ('http://mipsdistros.mips.com/LinuxDistro/nanomips/' 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' 'generic_nano32r6el_page64k_dbg.xz') kernel_hash = '18d1c68f2e23429e266ca39ba5349ccd0aeb7180' From patchwork Tue Jul 30 22:19:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 815335 Delivered-To: patch@linaro.org Received: by 2002:a5d:4acf:0:b0:367:895a:4699 with SMTP id y15csp496204wrs; Tue, 30 Jul 2024 15:20:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX3jAHQ1sT2pBEx7g6A5XUgCfdZ0hSs0OH9FBMlPkY89zbSbneIDvlHfC7S5awpf8E5enIEr53Qo+WHDrBmyiUK X-Google-Smtp-Source: AGHT+IEoVaBmewtuKtqwJaWTqM/LWMCu9B3xyOPcAK+5hFmME8+0eH1JFekyy7P/6xFPCJUJQaQD X-Received: by 2002:a05:6358:60c8:b0:1ac:f3df:3bda with SMTP id e5c5f4694b2df-1adb243ebecmr1497906655d.1.1722378047875; Tue, 30 Jul 2024 15:20:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722378047; cv=none; d=google.com; s=arc-20160816; b=nP9rPtr99nD+BacJmEskUhVIAi5GtGHREss/d8vm+3G52gaz6Cp/sDL/R8nWd4Lqh1 C2aGIJwPBLQSP6SMVPSbfhlbwW1QaF8kpsdwXkPyLZ4WWd8Pb0gi6yFZa8Xl2f13SPrV mbyxectVnBb1dxDYYlxy+7NDMhkVi9yG4sN2BHU4rY9sJgvPoAv9nnFElP/v6JP1kCDd fyzRgYMzXJ5mmGINLlNaITh5vReRwj4sWqGsO7KEd3YZrp50beTjTGDUqTkBz4PbfTuo m3MEiGGBToVC9izZqF4aVCpkLXdqvLx7GBMuw1EgoMAaqt+UoOb8muTnR6fXc41zr9vU LpnQ== 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=zXdSwZIkaei7IVXcOo85+RXKqlbMq+68sLXgYS3E5lM=; fh=Wll5zcIshwC25KTNRStP4nPuF6V2l9tJ4yFbKqJqmtg=; b=umFSLygPuqgIPLKkDW9OSH6Q6efGNGKpXiE5oAuksp2S/nHddhZSq9ql0UQxo3L539 d/rVQxDYyF3yHLkjpqqwztqvyMxb+lfXohTK5MJEIe86r32fcfaNn5o9MoZa3dfUM0vF IFw5qXvL4hM3hzP6Nh1MsovLBODmtYp1c9nDt0c/oF8+uItKUQMd+O64M982z5CbJrsW RYNZl4NkjmPn8rQSCtv18w1TuUV2+3x+sngr4uuG7ZPYl0Lw9k+W+2Ip8dnWo4DQ0hQk 8cRnR1V45R23ygDH+xUyjUW/r7t3saumLEFZD1Lz1p7haiIqzAgLlqyYgqj3zGuwkYXf FCgA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bjkjlmx+; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6bb3fb07942si137153656d6.525.2024.07.30.15.20.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Jul 2024 15:20:47 -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=Bjkjlmx+; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sYvCh-0006OA-Gn; Tue, 30 Jul 2024 18:20:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sYvCf-0006HB-Mx for qemu-devel@nongnu.org; Tue, 30 Jul 2024 18:20:21 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sYvCd-0006jb-OF for qemu-devel@nongnu.org; Tue, 30 Jul 2024 18:20:21 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-368380828d6so3211431f8f.1 for ; Tue, 30 Jul 2024 15:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722378018; x=1722982818; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zXdSwZIkaei7IVXcOo85+RXKqlbMq+68sLXgYS3E5lM=; b=Bjkjlmx+97OBo1yFjl2ZIgRLBzvuaaDbVeYCFb3w4FRDnFqIHdo4tjFiti+xr/1eNK wtn0NfVqjHcNR0qIG3nepKRkMRHdsAz4uKj1zgGmkJCNSDcaRXcYVbHWQOYt2ZxzHPb3 YfCKw0PciGUYGLdZ9NE+T4Jk0bTxPoO6A8ORVJWzsVrUwCf7ht4F2TW0Kljg6YvFouY4 oWcaqXoJywDtO8nE3uOXuwZCg52Po57MqfIwS+OMpLkmPy6iRi9ohg0tIgsYAy+tZpQf f2l4xValW/8vQUwuDEHCyphmoLy93tfP4wlVbJHrVWC9cqhQPBFnXE8W1jYJ1zkdx2KA JwUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722378018; x=1722982818; 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=zXdSwZIkaei7IVXcOo85+RXKqlbMq+68sLXgYS3E5lM=; b=qyDka8q+wvI2idK9MFQwnpFXdAEWorCRubBM2zdPG33Jdw2jYKcopyD3MbO/d4A35r N+XBGv3l1Z6Dodb4eLpbRs3HSldYp7IS9bOZ8RUQJT8GMfaei/vIJ8h7YEb6Iki7kZ1a 2tMOtxIB62iQgfoJyh+4OnGfb6S93sUg84mA6nCnyiPp+qUJScx/bsqb0uCRO1RKDaYc JtWZjY83D1q04qgdISNyrlbZQQf1Ac0sfV0NozUbYEjrzQW3fkiBuIzHzoxWtSRlPxMT H4iKM+fgqDfJN1kEBYOA5jpSpWMXqjMdSnlly2rOJgE3tUDfTpqLSLQ0CI9gkXvbI03e +mNw== X-Gm-Message-State: AOJu0YziuGPZNqHSnSd7lFlz2FnM7UjcU56g2mLuyfVSSDqzIabuT2IZ 6C/NTBoR9oA8WFr8C6kjK7gsEEuajUyDvkK1oMc/fLO7VW98EBUcQr0WQL45QB1ojBI+m7ENnB3 LL2w= X-Received: by 2002:a05:6000:1187:b0:367:9b22:28cb with SMTP id ffacd0b85a97d-36b5d0cd7fcmr7436738f8f.59.1722378018069; Tue, 30 Jul 2024 15:20:18 -0700 (PDT) Received: from localhost.localdomain ([78.196.4.158]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36b367fc7c3sm15519178f8f.49.2024.07.30.15.20.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Jul 2024 15:20:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 4/6] tests/avocado: mips: add hint for fetchasset plugin Date: Wed, 31 Jul 2024 00:19:55 +0200 Message-ID: <20240730221957.34533-5-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730221957.34533-1-philmd@linaro.org> References: <20240730221957.34533-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Cleber Rosa Avocado's fetchasset plugin runs before the actual Avocado job (and any test). It analyses the test's code looking for occurrences of "self.fetch_asset()" in the either the actual test or setUp() method. It's not able to fully analyze all code, though. The way these tests are written, make the fetchasset plugin blind to the assets. This adds some more code duplication, true, but it will aid the fetchasset plugin to download or verify the existence of these assets in advance. Signed-off-by: Cleber Rosa Reviewed-by: Akihiko Odaki Tested-by: Philippe Mathieu-Daudé Message-ID: <20240726134438.14720-3-crosa@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- tests/avocado/boot_linux_console.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index 450d67be6a..b8b0a4df10 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -274,8 +274,7 @@ def test_mips64el_malta_5KEc_cpio(self): # Wait for VM to shut down gracefully self.vm.wait() - def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash): - kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + def do_test_mips_malta32el_nanomips(self, kernel_path_xz): kernel_path = self.workdir + "kernel" with lzma.open(kernel_path_xz, 'rb') as f_in: with open(kernel_path, 'wb') as f_out: @@ -303,7 +302,8 @@ def test_mips_malta32el_nanomips_4k(self): 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' 'generic_nano32r6el_page4k.xz') kernel_hash = '477456aafd2a0f1ddc9482727f20fe9575565dd6' - self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash) + kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + self.do_test_mips_malta32el_nanomips(kernel_path_xz) def test_mips_malta32el_nanomips_16k_up(self): """ @@ -316,7 +316,8 @@ def test_mips_malta32el_nanomips_16k_up(self): 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' 'generic_nano32r6el_page16k_up.xz') kernel_hash = 'e882868f944c71c816e832e2303b7874d044a7bc' - self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash) + kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + self.do_test_mips_malta32el_nanomips(kernel_path_xz) def test_mips_malta32el_nanomips_64k_dbg(self): """ @@ -329,7 +330,8 @@ def test_mips_malta32el_nanomips_64k_dbg(self): 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' 'generic_nano32r6el_page64k_dbg.xz') kernel_hash = '18d1c68f2e23429e266ca39ba5349ccd0aeb7180' - self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash) + kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash) + self.do_test_mips_malta32el_nanomips(kernel_path_xz) def test_aarch64_xlnx_versal_virt(self): """ From patchwork Tue Jul 30 22:19:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 815338 Delivered-To: patch@linaro.org Received: by 2002:a5d:4acf:0:b0:367:895a:4699 with SMTP id y15csp496401wrs; Tue, 30 Jul 2024 15:21:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW95WqqAYuhEDXurwQVT8lUBp0kG9N9zOjyxHWbpj1oA+VJ/DoQ7+0zkJeQJkZXG3V7OPvYMP0GlJuZJeS4Niuh X-Google-Smtp-Source: AGHT+IECIjgbe13Tw1VQXSylhv5uoj011ULYvWPHXc3AduneWcVozl7xCkjG6GGKUBso/J2u/j9U X-Received: by 2002:a05:622a:19a0:b0:44f:f188:5ecc with SMTP id d75a77b69052e-45004ddcee5mr153349961cf.33.1722378091824; Tue, 30 Jul 2024 15:21:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722378091; cv=none; d=google.com; s=arc-20160816; b=WoWVUJUGtNGMQs5B37zb1ufWVTbs5eoY6DUs3eTXt7oApQe6VSpIlnSrSKn4SEMhg6 bvk/G4SjaH3Mu8oB5PwZzl2ixolgFuUdbBLshHXwvg00cOlz3ot8PMDwFzcWXfrQPYEK wvKWyFlLXSwyNWqXQLGczcF5X4ZkPAg52PScdoqzUlQkT6Ia3QdWC2AYGYe+Acmq/OTK xGUbVPS45kJhgMpYetP4PkIn/WYhsdteVQfW8JC9NAWCSa9oylpVJk5cMm7oAvyhNtrr 2yDjixpFTwMDaO6YGdT79KzBnGK3k68F4usCgkcPZLUgzY26+GzfuHJKu68n5mSGOMig AnRQ== 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=jz7Ox8GZ4fBgHa8IWcCtoxPXphT3ERQSEGlUxQOFD08=; fh=PSVFDF1a+oVgWkrNnh7N8bjIsMUCUrL9kx2tVskKYTY=; b=pzIujShnETEDhwG93nWhdPsw3w4wxaAQALAI54QE837kEIxs8ZYwR83LmOovo5fJN0 6A0DD0TBUncTmeBTVDofnWt/6QtsFJMgazLEdwNoISYFtMMnzDZ+heKJBddN0zsb2W3E Js7AK6KGQZBEgVmhnKO11OZ3q85zJNy019PC2yRegMgWs5qSILkKRLKK/NxCkazreGL6 RmMcgtK8yZJr3UNyNnImQv96NJdWJY2obDO7cDRrsWG9k6/z4eZc2wfn4gQZKmoOX+pe ckwH2BOK46R+7OQQiH+09kS0ZmaqzdYf4/ZEeFoL8RhhPdEcZ6CKlVar7YLz6f1zjWqZ P71A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DM2fmEKV; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-44fe841f814si137293671cf.552.2024.07.30.15.21.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Jul 2024 15:21:31 -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=DM2fmEKV; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sYvCl-0006dK-48; Tue, 30 Jul 2024 18:20:27 -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 1sYvCj-0006Yu-WD for qemu-devel@nongnu.org; Tue, 30 Jul 2024 18:20:26 -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 1sYvCi-0006m2-Co for qemu-devel@nongnu.org; Tue, 30 Jul 2024 18:20:25 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-427b1d4da32so1835325e9.0 for ; Tue, 30 Jul 2024 15:20:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722378022; x=1722982822; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jz7Ox8GZ4fBgHa8IWcCtoxPXphT3ERQSEGlUxQOFD08=; b=DM2fmEKVt93XKNnMwiPXKkQrEpwf5+VqSjrqJtZ05bWrtoaOnCFpf6yOpZ8yQ1trYf 89LFLezi/ZgmozIah5i+pzX6sZzJpE0KswYKDgQkhKFdGTAg2liPrp3HntGU3OUdKuP8 atCq8BcQ3gDJUuxxPS7bQF469bjB2sIq3U9gLSjFYljggQON/6QD56XhkdxcKTAxF4I+ yCZNluWg0SNKeMsEn/c6yIUC5t5K2UGEfMqzOvcsNBjbChCinotfPAgYPa6f2kbhJl0h /kvMmR3CIRCp2CtP5kbNrr7PFuHOVJsswuuOPGfaZYeE9Ie1vjoMNtOD2rL4bPBgZLrd Dmaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722378022; x=1722982822; 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=jz7Ox8GZ4fBgHa8IWcCtoxPXphT3ERQSEGlUxQOFD08=; b=K7k1OCodBH9ye7+M7fSymGiJspLEeUJIo3e8lQvz2DakyNE+LptsfQgPzycAowoDxQ 5y5/7ktDtqXoSFwthLzqpFgW0ImBzPgHuYC5VCqDY1pvF8dsWLtdzFllFCzorllUoCQR wl8jDFJqFaLQsAX7/aiaTRTSMphKdZIn2jf/fSf+JxdmBH+ur8NLrm9e3LZHqxlMssZi S0yb3frgLHoFTKTMRpXFT05GnWtnZH2c4rifwsTRt7IsEZQpP5zxjhoSs7/hpx4/zwP+ sQAioWjuB1hUSRfvaQ5dyJ3bDQlwMzNncng2p8DV3aEXHWkgTh9PikqresgRJLSvl0+A ktUw== X-Gm-Message-State: AOJu0Yza0GZ+5t3k6jAdERa5bgFAI+zsJuKGjVRbCDd/l8lMvhpvNLOy oxymqwWBx+ljIrypvnc5qZHrDIzyPQXB1hu0kF8zXdfsPw4si46+jBSD8lKkP/TExJoYKSxYZ9C 0DDQ= X-Received: by 2002:a5d:69cf:0:b0:367:89b0:f584 with SMTP id ffacd0b85a97d-36b8c8df022mr2162689f8f.11.1722378022645; Tue, 30 Jul 2024 15:20:22 -0700 (PDT) Received: from localhost.localdomain ([78.196.4.158]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36b3685810csm15585144f8f.71.2024.07.30.15.20.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Jul 2024 15:20:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Akihiko Odaki , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Subject: [PULL 5/6] tests/avocado: test_arm_emcraft_sf2: handle RW requirements for asset Date: Wed, 31 Jul 2024 00:19:56 +0200 Message-ID: <20240730221957.34533-6-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730221957.34533-1-philmd@linaro.org> References: <20240730221957.34533-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Cleber Rosa The asset used in the mentioned test gets truncated before it's used in the test. This means that the file gets modified, and thus the asset's expected hash doesn't match anymore. This causes cache misses and re-downloads every time the test is re-run. Let's make a copy of the asset so that the one in the cache is preserved and the cache sees a hit on re-runs. Signed-off-by: Cleber Rosa Reviewed-by: Akihiko Odaki Reviewed-by: Daniel P. Berrangé Message-ID: <20240726134438.14720-9-crosa@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- tests/avocado/boot_linux_console.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index b8b0a4df10..2929aa042d 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -401,14 +401,16 @@ def test_arm_emcraft_sf2(self): 'fe371d32e50ca682391e1e70ab98c2942aeffb01/spi.bin') spi_hash = '65523a1835949b6f4553be96dec1b6a38fb05501' spi_path = self.fetch_asset(spi_url, asset_hash=spi_hash) + spi_path_rw = os.path.join(self.workdir, os.path.basename(spi_path)) + shutil.copy(spi_path, spi_path_rw) - file_truncate(spi_path, 16 << 20) # Spansion S25FL128SDPBHICO is 16 MiB + file_truncate(spi_path_rw, 16 << 20) # Spansion S25FL128SDPBHICO is 16 MiB self.vm.set_console() kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE self.vm.add_args('-kernel', uboot_path, '-append', kernel_command_line, - '-drive', 'file=' + spi_path + ',if=mtd,format=raw', + '-drive', 'file=' + spi_path_rw + ',if=mtd,format=raw', '-no-reboot') self.vm.launch() self.wait_for_console_pattern('Enter \'help\' for a list') From patchwork Tue Jul 30 22:19:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 815337 Delivered-To: patch@linaro.org Received: by 2002:a5d:4acf:0:b0:367:895a:4699 with SMTP id y15csp496353wrs; Tue, 30 Jul 2024 15:21:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXaz18Xd1WDaRJRJ6FZef5yh/OGmymmpMkqy03hrxRDtCkBLXsgxjEdne65mComH7rizAaBKONaNVvCMJ9/sSLb X-Google-Smtp-Source: AGHT+IG7AZvOFlsjjR+NGdStj1PO4qDUtl9pFWnqAjYt7J/q+i42ZoBrhKhFkQ/7ZksDpUYSwPaQ X-Received: by 2002:a05:6830:6a1b:b0:708:a11f:bb13 with SMTP id 46e09a7af769-70940c73d71mr10038469a34.34.1722378079677; Tue, 30 Jul 2024 15:21:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722378079; cv=none; d=google.com; s=arc-20160816; b=xCO1soOgY4wN6LV0w0z/iHOHsdJTCa/s/Y+rFARRT76hzD3tVHasIthvi9xivV6liy tRGH85x/b2hsilnZ7b9rJT0yEAOuRmXUouXkteAKVNoTpNEFap++ClS/2Bq1z/g2++HI sx9Kc3l9QgoXjOWI1SQCvoNkZrASfk8ojHGK4Wg1sdJxKoIiFZ1ujzHuqDY/3OOfq5x2 ivRptVFOaIhsVWVbYvTUaqhY1tv5jTR9suYXXHYHD8+s3y3fYpKUPhjLD9T0/UfyJlcE cjpkIeanYUKn+E5xMCIwpq3/hj4Sj+So5xa2ETZ2uQxKdUORAzBzEqK0YFW+HEYDk/na vA3w== 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=9Lc+azGwkwuTK4hgApgrGG827mAv+IHvwoS10S2KQ54=; fh=olQC+Fs/m5C58bHeKFSs78Jfcdpp3AVXj+W1M/uQ3hk=; b=Xw+KRIuTjVZi8nwiVSrKDWD0SznTqJeDnLkwDDbZkp2q2NsIlqQUROVCFvhq86EPEE bnerPIGm7iu+ZgfBlHEaoWRpog2JkGpdpKRAkReaKfYjiOrUXDZ8RGllRqYNn2B++W2W u9tIQNvix5BmBSyIb39AANQVnBw0Eh9JKyHhBfi6ZuR/2dLvK+lo0vmcoZBhkrhf/h14 g36mlP5R7kYfsnjg5bdWGY84tDQknKe8Wn/hCAf2xtpdzQatwgWJWd4vVxC/ZD9qtSdv qG0G4sufnTg4BxJ7LwUBTZCfVOtXwvxtNBQQo/tkcsDcivWPqCf1dCZW489VQujj47ZX kImw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j2trGSpO; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a1d74a146csi1395821585a.757.2024.07.30.15.21.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Jul 2024 15:21: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=j2trGSpO; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sYvCw-0007Bn-64; Tue, 30 Jul 2024 18:20:38 -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 1sYvCo-0006yL-Vi for qemu-devel@nongnu.org; Tue, 30 Jul 2024 18:20:30 -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 1sYvCn-0006pZ-3r for qemu-devel@nongnu.org; Tue, 30 Jul 2024 18:20:30 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-36865a516f1so3532784f8f.0 for ; Tue, 30 Jul 2024 15:20:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722378027; x=1722982827; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9Lc+azGwkwuTK4hgApgrGG827mAv+IHvwoS10S2KQ54=; b=j2trGSpOycL9mTldfJLKyX/GXcQz0c4t01TWyTjTBIoPxQW09HnJFNcqtlTtwwz68C reNJQWo6RZaAOP1ziBO0lKE/gJiZGe+ubU8DNlLTBBn53dx+qSuhI3fqAkIZ4gZ4QK1O f4LDT3qL6mKfzeMBwwHUElFe3htae0d+Fad+QwIrS6WF4SJQc3Gwdf7v0Nu6C9B9H553 aOGu135RP2NUBaKpdf/M4PES37C6Gi9bK/1XMAAXeW/Vvb6rk8f9g5vTqn0UFP6Pum4A z8GPvFsGhkyKvxZjdQqBwHSr+Vw/BqYSGeVbAM1o92bSMHDt5MpM+3lf44o2IUGT35zN 16tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722378027; x=1722982827; 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=9Lc+azGwkwuTK4hgApgrGG827mAv+IHvwoS10S2KQ54=; b=nHHuG6kgr3E0v5w3VKPfXp+yJOayxSNTERx61zLFB8R4GU/6EaeBjvCFkCycqN4CYS nVvRcdawN2WPphnC8qCDQRcbg6nvlsmtOUaPXx6nFfMvSDJDt0uGDcAHmxEy5LnujJW2 bxo5AfpRyew1cbXy7chpGwk8NLuWU0DiiUbdlYC5F46RmRxU3fU/NNknsAHYL6Yg4l6V 2hVUgSxEtB0FkxQklW5Juwfld5OXvgHquyYHWp2uZURySZTGEBBK96upTojZPm2lWy4m vkXBOuJDynrRmPti41rRlnMqn4hyXAlUmFqJr7QOWIE8tufSGaU2CDWROo36883/07+d 27fQ== X-Gm-Message-State: AOJu0YwN1oJWY8YdzxBl6E5sAfyfWAnG29r0sM4kBOwazZCF44Lnrvvr cXJ7wPLlPTqbo5q5pBS8/lw11GpcYfjMWo26z0BmrkZm5QzMOo64aozjgPyet6W5QRm1Y8vZaVd DY/c= X-Received: by 2002:adf:a31d:0:b0:368:7868:2d76 with SMTP id ffacd0b85a97d-36b5d2c9df1mr9009505f8f.51.1722378027088; Tue, 30 Jul 2024 15:20:27 -0700 (PDT) Received: from localhost.localdomain ([78.196.4.158]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36b36861b29sm15559499f8f.93.2024.07.30.15.20.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Jul 2024 15:20:26 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 6/6] osdep.h: Clean up no-longer-needed back-compat for macOS 10 Date: Wed, 31 Jul 2024 00:19:57 +0200 Message-ID: <20240730221957.34533-7-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730221957.34533-1-philmd@linaro.org> References: <20240730221957.34533-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@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 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: Peter Maydell Our official support policy only supports the most recent two versions of macOS (currently macOS 13 Ventura and macOS 14 Sonoma), and we already have code that assumes at least macOS 12 Monterey or better. In commit 2d27c91e2b72ac7 we dropped some of the back-compat code for older macOS versions, but missed the guard in osdep.h that is providing a fallback for macOS 10 and earlier. Simplify the ifdef to the "ifdef __APPLE__" that we use elsewhere for "is this macOS?". Signed-off-by: Peter Maydell Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20240730095939.2781172-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- include/qemu/osdep.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 191916f38e..720ed21a7e 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -786,8 +786,7 @@ size_t qemu_get_host_physmem(void); * Toggle write/execute on the pages marked MAP_JIT * for the current thread. */ -#if defined(MAC_OS_VERSION_11_0) && \ - MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0 +#ifdef __APPLE__ static inline void qemu_thread_jit_execute(void) { pthread_jit_write_protect_np(true);