From patchwork Fri Sep 17 16:23:22 2021 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: 514193 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2390668jao; Fri, 17 Sep 2021 09:27:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNddVVWICGzFi/mHHpCCzpqNBUZnFMy834ETX+YaAl+PZrKdsnwfMCmHlNU7BJBGEW2H4w X-Received: by 2002:a0c:8dcf:: with SMTP id u15mr11889189qvb.11.1631896022702; Fri, 17 Sep 2021 09:27:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631896022; cv=none; d=google.com; s=arc-20160816; b=VHU8mT6xZ5I57TLnW4Y+g6NWWaK+5psrmutZM8s3NXpWduA55/T78SiehK25b4kUOW 0aX6quQbjZv+9fUNPGgtoy+dIrd+VoTXb8wqNORFPbAuO1boyoC9EUMi3XsgQd/I9DYn SlivmPdArg8Mm7wYdQ70ThorvlBjB0660oqRjuCXabC3aG+g2RVaU+nuuI2V+LCc/+5D bABpt/9em0OFD55VmOvi8eh5qeYey4651/JX1BlKHBp1WwnNJMhse9r3C8ypExp16Ljm GhW7vb8nWRe57yP5h2pNqPZMCBpAsNjUEvVOSIGiVDUjaU4dLuh7dsxaZ5bStZklnxQh WW8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=lYHDsT18jOZsWv8rLeQ/NbBXoG8vS4UbmHbsvR70ru0=; b=S53yhidzGQacf/mxcjTVdkDn8fkuNZhftAkb6lYT7l9AOPA1UMF6S0WCJrUGA+KD2S zneIxcfugntmEf9dWjS0SCwFJqbusCrJ/fQHoVlbJ1WjSozRsMOVnc49iiJBaMETooZ4 lk4pTEr0Zxhs/whdnHT0zNZAQU4Z/4om55/oPM7+/+MQba5Aw4vu0OuMWuGdUId0OYFl nMJ416qV8J1XFQh9YFSGUO69TeMgx9WypeX2dakPmSIwSLkvXSTp6jdhf1d5W7X4skvT ACEsoLRKDRHbFur13Ju9o3QEBKjG/IPOGMYUYVVHcSv/RoFf4dD6UokbmIQITNaN9GZf iqJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=clOTxKZB; 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=fail (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 8si985194qvt.54.2021.09.17.09.27.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 09:27:02 -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=fail header.i=@linaro.org header.s=google header.b=clOTxKZB; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRGhZ-00071I-TQ for patch@linaro.org; Fri, 17 Sep 2021 12:27:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRGeM-0003Tv-2V for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:42 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:39536) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRGeJ-0005RF-Aj for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:41 -0400 Received: by mail-wr1-x42c.google.com with SMTP id u15so16075338wru.6 for ; Fri, 17 Sep 2021 09:23:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lYHDsT18jOZsWv8rLeQ/NbBXoG8vS4UbmHbsvR70ru0=; b=clOTxKZBGkpPoWeFfrz6SQNWY67RjGdntFLTxGkMQtx0jAJV6dus/22wHO8lbwKY1K csRr0DwvLJ6emnvuc0j8A5iVr4ogPXgoHFqx0m3dZQ8xVZkTqguvQjEE9vSaq00hEeBH qZ9ehDxBJXv+UYL8XNkY3d6+PIMd8+WcZW9pHh/YZgLH0vl5g2waVP3QKWf5JPfWP28f k/tp44A/snnFtt+/ENnRarhPc45pn73PMJu+VGFDO9/ge+YgM795tMOaIJppaf0hTfMs Sz8AqJprza/cm5XyZTciUViYMmUOOOvlD/TLZj2gBYX0RSEznFwASPko/+idER+fou1d uA8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lYHDsT18jOZsWv8rLeQ/NbBXoG8vS4UbmHbsvR70ru0=; b=c9f0ASCZjYvpbzPNfhtrfxHVhZurTQ8gr8ROCX65BkB0UiO6HTvMnZMx7kUNRUnIAs uhrNVpMn0pFQ0kpWb+4iT12FTLGzrA1HaBzajyz3OymD65y1QPIk79zOBmou73WB2mug 9ClDyj3oNHmoaEZvvBDWiOuo4gyTIXRsfJNWovVle20tux6iD+zcIZnDw2y0XEWT7mAC IfbD6joVorO5I1HZ4C1PK7CVXIv2xJBBfUXg7j29Umnjl+iTirqQtBlKm1qii2NQWD+I UYJb3ZwOkY1TTWoEQmsVfX227OkOXjdZalkRBi3iZr9oJ/hYpkbqXpXT9lwXPnxEoQPm w0Xw== X-Gm-Message-State: AOAM533r3X5+UlSZwlgOp4LVVquH7H5VpaVxy5/LaRUqZYJ/bk5iDfVB BWJjTxGKy04In6eqVK8VQx2sog== X-Received: by 2002:a05:6000:1379:: with SMTP id q25mr13047849wrz.280.1631895817014; Fri, 17 Sep 2021 09:23:37 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l2sm11364746wmi.1.2021.09.17.09.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:23:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 47F131FF98; Fri, 17 Sep 2021 17:23:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 01/11] configure: don't override the selected host test compiler if defined Date: Fri, 17 Sep 2021 17:23:22 +0100 Message-Id: <20210917162332.3511179-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210917162332.3511179-1-alex.bennee@linaro.org> References: <20210917162332.3511179-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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, Warner Losh , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There are not many cases you would want to do this but one is if you want to use a test friendly compiler like gcc instead of a system compiler like clang. Either way we should honour the users choice if they have made it. Signed-off-by: Alex Bennée Cc: Warner Losh --- configure | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.30.2 Reviewed-by: Warner Losh Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/configure b/configure index 1043ccce4f..049c50a933 100755 --- a/configure +++ b/configure @@ -1686,8 +1686,11 @@ case "$cpu" in # No special flags required for other host CPUs esac -eval "cross_cc_${cpu}=\$cc" -cross_cc_vars="$cross_cc_vars cross_cc_${cpu}" +if eval test -z "\${cross_cc_$cpu}"; then + eval "cross_cc_${cpu}=\$cc" + cross_cc_vars="$cross_cc_vars cross_cc_${cpu}" +fi + QEMU_CFLAGS="$CPU_CFLAGS $QEMU_CFLAGS" # For user-mode emulation the host arch has to be one we explicitly From patchwork Fri Sep 17 16:23:23 2021 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: 514197 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2396142jao; Fri, 17 Sep 2021 09:33:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZVpMyLlZNrx1ZLCPwagYv27Rsq5nCfZK61WDtLkqcPANJAWD1KX7NggxZShba6boBGowq X-Received: by 2002:a37:aa82:: with SMTP id t124mr11087906qke.293.1631896418718; Fri, 17 Sep 2021 09:33:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631896418; cv=none; d=google.com; s=arc-20160816; b=A+VbzEP7aL9OhAi/3JLr3UDDTa2m/Xn8VikFPwDeeUDWu4CBmdl27aQtDVO9wPSrUR vUY1JOfjJcn9po61Kz8kh6cB7nuNFTaqZjBcj2xhPZ6pNpqn05J0M/jhyL4+stTYbkOL d3aPumDPwS3EIVhdGH1YvzznnkTmng9OstHGUoIpFXJIO0/olZvoDt/PKLBecOH+GxN5 PxH5trJAewfDtgdqtuq9EXdrxzXNR6c0lqyfuehdwdf87cHuA7xt/2F0SOtgz0CtvKUl YTjA1yR3mZ863aweeszlRkBooJzCBEhGQ8ttrgmz9697TK/dDYzLOBh8MUvgvpt914mV Uiyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=ctCyxck4EL5Ky38T3SMMObhR0rKiRHYqaGdfnEA1vgQ=; b=TU+dDbWsDjP8RHnlZYKQARbL5u8QJA2mAX1JVBdpxXFWV+DUegkJ+Hij54IiZiKHMN goRLikcHsmt7WTg10JNsl95LL29chlAwQflHIZ493f0pBd4ebKULNQYNUF7qUIFS/y21 jRDJ9xdxnSBpDIBqps+aVm4camCWkJFW2iYjTYKn4qGntI8y/c0A7rOTHxs7VA/DZfcv 0/1TCFwcYUrm+oVQKhD+3NDTcSwLMq3xc895Xfuzt7UaFHiBHDki5bCUvgNzR+vjpSEv xXodOfp5JsWENFtfkhQRhk0CI5Mne8/LD43VCchSzoQwPv8nUTKW36KKgliIeNwBE9By RDXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Wj8QUPdI; 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=fail (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 y6si4028263qtn.21.2021.09.17.09.33.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 09:33: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=fail header.i=@linaro.org header.s=google header.b=Wj8QUPdI; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRGny-0000Wp-89 for patch@linaro.org; Fri, 17 Sep 2021 12:33:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRGeK-0003T6-BG for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:40 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:33616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRGeG-0005PK-MO for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:40 -0400 Received: by mail-wr1-x433.google.com with SMTP id t18so16145302wrb.0 for ; Fri, 17 Sep 2021 09:23:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ctCyxck4EL5Ky38T3SMMObhR0rKiRHYqaGdfnEA1vgQ=; b=Wj8QUPdIh0XAfjh5lrXE+fCygtR0mzfy7j4WmJpkhAQnru/v5aqvs5AGX76iKNTYGa nYq2nd6F3FdZZDnSCS9aZ3Io7jUAnX172XECQGtWLpvEgB0fib07hQOd0Wr1zFpdT372 6n1vHI7dFptV1POk0icVuZRwtQYDqaaP2bMwBwOIqva9o1dOfE02yXDr6V2pkyACIyxn cmdThjN6MECfr7UeaMIxeFxy9qNbCE0eUptGjtnmBijNAzZB/zKSX0zzVZIyAip1218x hZYcDU4Dh/p8rdJva2LpNQ+9oTLgIttog8q88m8M3ioGjLMpwxpUl/wYQJathoJttQJX XzHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ctCyxck4EL5Ky38T3SMMObhR0rKiRHYqaGdfnEA1vgQ=; b=Yyg8l1xDreEriRMde6ZT3Qhuw+SWGLcfyM8mx9Nh0K7xrCQ+eVmkqkj0e9cfmlr9CI mj5MbrT31slLTJUmq8KYQBRc/W+wYmiSL+DTkqNPesc678ZS+mD+dZwykSE3Bl21Updn +wny0ZZkAfv/7ShMmZDfydLF4/ddnC8v3DBbrEC/L5Gm4/YbFXKSwmtBnREaRfu2XFpb pu2rYEPdRHDMT4Z3aPcNuUjV22m/pdSRmKQLsY8otE/R3zpqTtzTOH9edhmeUW1opNiW ZkJNs+iIm21kNzkdDruId9CoZANONpZswszeQcIy6j30O0YkYc9HqtILYcl1qkfKr1XZ ym5A== X-Gm-Message-State: AOAM5331RxVoiKKbYCJOZ1NGMEh9JYTn4oyPwHO5GNKjJHybbUXoLZNO syTiyeKsAiFansAmoMAvu2b/zQ== X-Received: by 2002:a05:6000:1ac5:: with SMTP id i5mr2290225wry.292.1631895814741; Fri, 17 Sep 2021 09:23:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g1sm12758034wmk.2.2021.09.17.09.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:23:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5E76A1FF99; Fri, 17 Sep 2021 17:23:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 02/11] tests/tcg/sha1: remove endian include Date: Fri, 17 Sep 2021 17:23:23 +0100 Message-Id: <20210917162332.3511179-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210917162332.3511179-1-alex.bennee@linaro.org> References: <20210917162332.3511179-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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, Warner Losh , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This doesn't exist in BSD world and doesn't seem to be needed by either. Signed-off-by: Alex Bennée Reviewed-by: Warner Losh --- tests/tcg/multiarch/sha1.c | 1 - 1 file changed, 1 deletion(-) -- 2.30.2 diff --git a/tests/tcg/multiarch/sha1.c b/tests/tcg/multiarch/sha1.c index 87bfbcdf52..0081bd7657 100644 --- a/tests/tcg/multiarch/sha1.c +++ b/tests/tcg/multiarch/sha1.c @@ -43,7 +43,6 @@ void SHA1Init(SHA1_CTX* context); void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len); void SHA1Final(unsigned char digest[20], SHA1_CTX* context); /* ================ end of sha1.h ================ */ -#include #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) From patchwork Fri Sep 17 16:23:24 2021 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: 514194 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2392277jao; Fri, 17 Sep 2021 09:29:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAEqjqqP46QqZGhkn9MzDrswn+ShS+4Mi9AO91Wq+5AOPSSVkCQ0avGCuU4/4VxqO2rmNq X-Received: by 2002:ae9:ef96:: with SMTP id d144mr11497340qkg.9.1631896156837; Fri, 17 Sep 2021 09:29:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631896156; cv=none; d=google.com; s=arc-20160816; b=QRzp9S5qPsFkeCleYaV5n9Au+gg4mU/s2bvLZD1WvYlgg6I6zbJxxb/MBYg2L5fRvx PAw1oFkxbHuoA/gzSzNuZYZSRHpfv/xh9BUOd80qo8cVSOvdGPpS6Aiwl5Ye0kX+TsxY atCCAovTg83LODSIaZgR+oSAke8PxMU72Ewd0Cj06VtPFxdVZq7snK72t/kl9Dti5zpI sB7qtO6kQHkurthtRSf3rG5gzIo4xsutc4iYFFz7SSv3RvQuHOyEKk+M31rYsc5SeGfk mjp68yHNLfTLwcbPOsecv5prTuO0M22eBFkAsyj4tUFtikCCWAy+HmnOF80nWJGgrdm4 NbIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=QLy3JwK0ppKXnHHIzD0bw9+kzczMVllLeYg1SGrrrRE=; b=ZCsnE/52+VU1+i4lUHNUUyFLfVQjadjbnaDj9DDHcsK2qyTh6nq+4t213ol1H/KY5x 2hEQFNBCKx/xxkLGRPTEkbCzOFRR6H40siFxQQNf9Jn2VI55DhUUyGv1oobMsU/VXvYT VFLGGOPbagpqDZtMEzZYtGxDb8I9Y0jFrLI9lqKZEBCpQksiC0LronzvfwHjv9zYUEdW HCsD3p8GQY9X3/o6yUhlBgfu1IgAcDRSml7BcLHKUOVJo4G/NFzwO/yKX8MXLkjPG+ws gX8XGvTE4wjTaH++uGGR/G5hSolaTV7/U9YlSYBFd3NAlqfI7YKWOPqozU6VoWWqelkq bCyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GsgiXVwN; 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=fail (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 x13si4231633qvj.150.2021.09.17.09.29.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 09:29:16 -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=fail header.i=@linaro.org header.s=google header.b=GsgiXVwN; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRGjk-0002rN-AK for patch@linaro.org; Fri, 17 Sep 2021 12:29:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRGeM-0003Ua-Q7 for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:42 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:38686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRGeK-0005Ru-0X for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:42 -0400 Received: by mail-wr1-x42b.google.com with SMTP id u18so14342325wrg.5 for ; Fri, 17 Sep 2021 09:23:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QLy3JwK0ppKXnHHIzD0bw9+kzczMVllLeYg1SGrrrRE=; b=GsgiXVwNNcrb9njFsGN/7AelnxVTWrg7GaalHcM9Cmq3feoyrr5oPFha0hcG/Aineg nQ7QCU1Mk0oe+iFOXrzXFrmCqLxVG6l2uGJfNJ9RM/XHqIR9l+AB0NY88+un32LcsShf j77ovHhuR0i72lvGtnSZk0oPA2QbuaOK3uFBkYP1seGdbOrFpeZnZjciyKKPhtWC0Gdv FxcWrWxq74vkDhs/YGGaIcmWgnAJP4uQbsShYN1qdzUv1LocWwjWftmnDBkdJ/qfn4JV wBB9yaaAYOyTPQ9nemQxIZP4QtjGIZl4BxVdtnmKsfHMUOOue//NHwT9OlKZQ3+SyLRk IEMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QLy3JwK0ppKXnHHIzD0bw9+kzczMVllLeYg1SGrrrRE=; b=6LFX9aUGKCP7jQu5EOh6mOLd1MNRpgmYIf9AJ3IByS+G5rWZyvns6obLhSF0tL+/xH YOkPLs3p5IAB4ByP1e7/m0tMHE1suk1ladZ54ShMzicZBkXlU4KKh0BrNZ0NQm0T0g71 3rl99d4IXoaLp4Vnu5b0bCHeZtmwYLmJCDQthzp2WkbN3jgrzwh3uS9+RhNefuXZTgK6 52twP8weKelG2qb8fo8ZviaXnO2DSReXnOYwyOEtg5k4YI7QbrDXt9d5N6znysPVPZ3W oEukM7jLK5gEj64v0H2h+sIp4LfjaVbOI3LJfmLcPdzBfRDC5dGKrh2pHLG1I9L0pRzw Y/9g== X-Gm-Message-State: AOAM533OQJnYAEf6I89CL8geyZljPeqn2Pr9gjLT4zEvH+uW8PVT3fxm 4WkdExDC+nb9rvCNFOiYEJ6IaQ== X-Received: by 2002:a5d:6307:: with SMTP id i7mr13244611wru.395.1631895817767; Fri, 17 Sep 2021 09:23:37 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 4sm6434433wmv.42.2021.09.17.09.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:23:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 791AC1FF9A; Fri, 17 Sep 2021 17:23:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 03/11] tests/tcg: move some multiarch files and make conditional Date: Fri, 17 Sep 2021 17:23:24 +0100 Message-Id: <20210917162332.3511179-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210917162332.3511179-1-alex.bennee@linaro.org> References: <20210917162332.3511179-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Eduardo Habkost , Richard Henderson , f4bug@amsat.org, Warner Losh , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We had some messy code to filter out stuff we can't build. Lets junk that and simplify the logic by pushing some stuff into subdirs. In particular we move: float_helpers into libs - not a standalone test linux-test into linux - so we only build on Linux hosts This allows for at least some of the tests to be nominally usable by *BSD user builds. Signed-off-by: Alex Bennée Cc: Warner Losh --- tests/tcg/multiarch/{ => libs}/float_helpers.c | 2 +- tests/tcg/multiarch/{ => linux}/linux-test.c | 0 tests/tcg/multiarch/Makefile.target | 15 ++++++++++----- tests/tcg/x86_64/Makefile.target | 4 ++++ 4 files changed, 15 insertions(+), 6 deletions(-) rename tests/tcg/multiarch/{ => libs}/float_helpers.c (99%) rename tests/tcg/multiarch/{ => linux}/linux-test.c (100%) -- 2.30.2 Reviewed-by: Warner Losh Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/tcg/multiarch/float_helpers.c b/tests/tcg/multiarch/libs/float_helpers.c similarity index 99% rename from tests/tcg/multiarch/float_helpers.c rename to tests/tcg/multiarch/libs/float_helpers.c index bc530e5732..4e68d2b659 100644 --- a/tests/tcg/multiarch/float_helpers.c +++ b/tests/tcg/multiarch/libs/float_helpers.c @@ -22,7 +22,7 @@ #include #include -#include "float_helpers.h" +#include "../float_helpers.h" #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) diff --git a/tests/tcg/multiarch/linux-test.c b/tests/tcg/multiarch/linux/linux-test.c similarity index 100% rename from tests/tcg/multiarch/linux-test.c rename to tests/tcg/multiarch/linux/linux-test.c diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index 85a6fb7a2e..3763df2019 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -8,18 +8,23 @@ MULTIARCH_SRC=$(SRC_PATH)/tests/tcg/multiarch # Set search path for all sources -VPATH += $(MULTIARCH_SRC) -MULTIARCH_SRCS =$(notdir $(wildcard $(MULTIARCH_SRC)/*.c)) -MULTIARCH_TESTS =$(filter-out float_helpers, $(MULTIARCH_SRCS:.c=)) +VPATH += $(MULTIARCH_SRC) +MULTIARCH_SRCS = $(notdir $(wildcard $(MULTIARCH_SRC)/*.c)) +ifneq ($(CONFIG_LINUX),) +VPATH += $(MULTIARCH_SRC)/linux +MULTIARCH_SRCS += $(notdir $(wildcard $(MULTIARCH_SRC)/linux/*.c)) +endif +MULTIARCH_TESTS = $(MULTIARCH_SRCS:.c=) +$(info SRCS=${MULTIARCH_SRCS} and ${MULTIARCH_TESTS}) # # The following are any additional rules needed to build things # float_%: LDFLAGS+=-lm -float_%: float_%.c float_helpers.c - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< $(MULTIARCH_SRC)/float_helpers.c -o $@ $(LDFLAGS) +float_%: float_%.c libs/float_helpers.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< $(MULTIARCH_SRC)/libs/float_helpers.c -o $@ $(LDFLAGS) run-float_%: float_% $(call run-test,$<, $(QEMU) $(QEMU_OPTS) $<,"$< on $(TARGET_NAME)") diff --git a/tests/tcg/x86_64/Makefile.target b/tests/tcg/x86_64/Makefile.target index 2151ea6302..d7a7385583 100644 --- a/tests/tcg/x86_64/Makefile.target +++ b/tests/tcg/x86_64/Makefile.target @@ -8,8 +8,12 @@ include $(SRC_PATH)/tests/tcg/i386/Makefile.target +ifneq ($(CONFIG_LINUX),) X86_64_TESTS += vsyscall TESTS=$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64 +else +TESTS=$(MULTIARCH_TESTS) +endif QEMU_OPTS += -cpu max test-x86_64: LDFLAGS+=-lm -lc From patchwork Fri Sep 17 16:23:25 2021 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: 514198 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2397982jao; Fri, 17 Sep 2021 09:35:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6wpSvZXoamEKPYEtbM/SbKj0atT3IJcbHJT2ZlJTibUp+0cZMBZtTRlHd/CRkQQ3uGiPT X-Received: by 2002:a05:622a:1456:: with SMTP id v22mr11018361qtx.275.1631896535677; Fri, 17 Sep 2021 09:35:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631896535; cv=none; d=google.com; s=arc-20160816; b=PEk0dRt3Dxj7WEbyZEMJ81+i8uT7gub8hLzLL2GUgrgL22j8bYKB2zWIbdiYgmFOGb JWL09DDjz/ztni+g8+AD4aFVQClEYuQyLpqC2l6fo7loVNvIyMabSPGR517pTxKzea2j V1CwSoJZ2GsYrptxPjOOQNVlpllaO6Otf7f8ofG9uQlt7gN3Jr9s2MYUsNBwDMgm5zzH O5YwABIfBM4etu4nOiATTteGlNex2Yq+Frz8FRZFAvqAul8nrIrlx6zG0VwYz5CQoE3g IWz/mkDM9mel+TUIjpj+9rmSj6/PAf7gCa30zgkxt7c/nOz3mRe+T/0pr1aWazxNSn+K mQcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=jr+p0pukkZcez10LfB9z0Jh9oZrpZIn9A0EB/trEXmg=; b=UmyI5o2g5aCQrEf8jx/+agLq7hvPgACzC8RFy35/rZEVXhiBnGk3QZuhH9JZ5eINJx RJdKgTr+b2q4YRHjwNxcytobuipKzeYX9d1RPToCDASIubi7I2Cmq/x2Q/8cuWuwGrzX 5jazh0ldRTNoua/Q1pzziJIDgcMfQFZLsAWY6jbAGFk96uKDN+KvL01Cy7cPXLofoXBA mZnzvAoKh51TDq9pZ5fVjk6d9P/g/zucSD3hzH0NNRSkvEKbJZmkPHWJsRO9qu1oINhn lK2exxJOH4rTNusnG5QLLmwyHubAvstMv7DccCWUCMq/4ra1Oada5aAb7gbOk7xMq+tY i0NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xGbwMFVE; 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=fail (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 gg7si1355319qvb.50.2021.09.17.09.35.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 09:35:35 -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=fail header.i=@linaro.org header.s=google header.b=xGbwMFVE; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRGpr-0004n5-55 for patch@linaro.org; Fri, 17 Sep 2021 12:35:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRGeN-0003Vi-OJ for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:46 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:33608) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRGeL-0005Tz-Qh for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:43 -0400 Received: by mail-wr1-x429.google.com with SMTP id t18so16145810wrb.0 for ; Fri, 17 Sep 2021 09:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jr+p0pukkZcez10LfB9z0Jh9oZrpZIn9A0EB/trEXmg=; b=xGbwMFVEx2KhUxYh8v6cDRnPmNV4u/ouYx4llkX5l8G+Q4tuNJE2l+Gk9JXqMvQwKK ZNG6hWdrmZj8hQ2H8cJ30NA30aevhed/VVjlO1KKy8djUglzvWi8nKkSg+8aO3LSu7na vpX6khvn5mduo8zCMF1K3fsmmnicrHLPpPiFPDWnWxQddkpCVo8+WEojSpFAq+wJoj1K e9E+eLBQjl2+iQ/3/z3lzj3lgw8BCeDSWYY3Hc9wqX4NKbiavv1LKIInJr4CuoPqsXpU iB3GnI0KVlT058NUKOjfMMwnoGdru8S9GxCy0lywBMQrvQKlqjG3g9lhPJcm6EeoEiBH 4r5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jr+p0pukkZcez10LfB9z0Jh9oZrpZIn9A0EB/trEXmg=; b=dLgxy3RL8hFf/dGjLjjYLE6dYTyqaKWkx93NlBEYQabn17Q6j9uErDiWEycCyB+mi9 wBcOaEnak6BSUwM/cbL0b3UxuieUVuGBaW8X48epcYzavUjxvFYqWAkdrugNtv8coBpl m0hs5r6xtftBoPBjGypwADWE/X/bWNFJ7fMB1Ms2y7EVo04jWozgZRUyyfDsc157fqvm ZR9Zm8z+VmHqMSMwq1SHLeC+L0DkbUA+CFrtwthQeoE0eomigTIqHpLWu/c7VE4V7MwH T1YwND6UA3JQHe8tu+18rvb3tBbPtPC3z1YbMaaLOzFMMRe7moToEW2w+Huv5StBRgow v4Fw== X-Gm-Message-State: AOAM532/3d8zspFeV628tTcYP4Bc/dYSGNY+LuYiethU/9K4hDDki6Kj fqke1xhDIZFYUuseaak0PIu3Zw== X-Received: by 2002:a5d:608e:: with SMTP id w14mr13259245wrt.18.1631895820072; Fri, 17 Sep 2021 09:23:40 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i1sm6843941wrb.93.2021.09.17.09.23.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:23:36 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 954921FF9B; Fri, 17 Sep 2021 17:23:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 04/11] tests/docker: promote debian-riscv64-cross to a full image Date: Fri, 17 Sep 2021 17:23:25 +0100 Message-Id: <20210917162332.3511179-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210917162332.3511179-1-alex.bennee@linaro.org> References: <20210917162332.3511179-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Richard Henderson , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" To be able to cross build QEMU itself we need to include a few more libraries. These are only available in Debian's unstable ports repo for now so we need to base the riscv64 image on sid with the the minimal libs needed to build QEMU (glib/pixman). The result works but is not as clean as using build-dep to bring in more dependencies. However sid is by definition a shifting pile of sand and by keeping the list of libs minimal we reduce the chance of having an image we can't build. It's good enough for a basic cross build testing of TCG. Cc: "Daniel P. Berrangé" Signed-off-by: Richard Henderson Message-Id: <20210914185830.1378771-2-richard.henderson@linaro.org> [AJB: tweak allow_failure] Signed-off-by: Alex Bennée --- v2 - allow_failure: true --- .gitlab-ci.d/container-cross.yml | 3 +- tests/docker/Makefile.include | 2 - .../dockerfiles/debian-riscv64-cross.docker | 46 +++++++++++++++++-- 3 files changed, 43 insertions(+), 8 deletions(-) -- 2.30.2 diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 0fcebe363a..a3b5b90552 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -134,7 +134,8 @@ ppc64el-debian-cross-container: riscv64-debian-cross-container: extends: .container_job_template stage: containers-layer2 - needs: ['amd64-debian10-container'] + # as we are currently based on 'sid/unstable' we may break so... + allow_failure: true variables: NAME: debian-riscv64-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ff5d732889..3b03763186 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -141,7 +141,6 @@ docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-mips64el-cross: docker-image-debian10 docker-image-debian-mipsel-cross: docker-image-debian10 docker-image-debian-ppc64el-cross: docker-image-debian10 -docker-image-debian-riscv64-cross: docker-image-debian10 docker-image-debian-s390x-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 @@ -180,7 +179,6 @@ DOCKER_PARTIAL_IMAGES += debian-arm64-test-cross DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross -DOCKER_PARTIAL_IMAGES += debian-riscv64-cross DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross DOCKER_PARTIAL_IMAGES += debian-tricore-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker index 2bbff19772..594d97982c 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -1,12 +1,48 @@ # -# Docker cross-compiler target +# Docker cross-compiler target for riscv64 # -# This docker target builds on the debian Buster base image. +# 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 qemu/debian10 +FROM docker.io/library/debian:sid-slim + +# 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 \ + bc \ + build-essential \ + ca-certificates \ + debian-ports-archive-keyring \ + dpkg-dev \ + gettext \ + git \ + ninja-build \ + pkg-config \ + python3 + +# 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 + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ - gcc-riscv64-linux-gnu \ - libc6-dev-riscv64-cross + gcc-riscv64-linux-gnu \ + libc6-dev-riscv64-cross \ + libffi-dev:riscv64 \ + libglib2.0-dev:riscv64 \ + libpixman-1-dev:riscv64 + +# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV QEMU_CONFIGURE_OPTS --cross-prefix=riscv64-linux-gnu- +ENV DEF_TARGET_LIST riscv64-softmmu,riscv64-linux-user From patchwork Fri Sep 17 16:23:26 2021 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: 514202 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2401096jao; Fri, 17 Sep 2021 09:39:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQfKhjfnOKSDjPC0gz/F7CERVRVm3R0oLuPC822JnqehZFrCeyO8xHWKCUzfBPa3IYRvtk X-Received: by 2002:a37:607:: with SMTP id 7mr11483559qkg.0.1631896769977; Fri, 17 Sep 2021 09:39:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631896769; cv=none; d=google.com; s=arc-20160816; b=Odg5NQzZ6LTYOjDWf74Ytdr0cXcbhBGYuhdmfUqYZZuN6QFK95+yOtJWZAqS9lwmmO OGQMohQl6WZMQ6PppN2RhWZPUz7Ag/YhPIYjdOFPW/uSKwnERiycemjislxRhgwW3+a7 py4P1CgaDvHupQiVERHjkkCm+dIBEdDoDGWXG+F6q1VulDSc4KwNWoaB2MxHtxJtd+QU 9cYdQl7qYlMZJO6WajDe5AY9+4fxmU4MEYMmbBKBLRyzLli/lRCudt8DeUO3f1B1zVkO hJmNh52PmiZ+nNffMfJbhzRhfuNy1CX0zbNlXZT0i7sU9H9k7h9syj7JdnbgZVHSJYX/ UCtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=554gJAf51sCeJWu+v3QBNYrShBWM+FpQpxvcowr/wK0=; b=fzoAMvV3PGa75Ze/w3u6SIDaIMT/HPI76LVLyotk6SBNJupwgHmZ/u7cIRowreyWqU yy06LFq6K/K/j1ng2Q/8TgthCfwqmm/Cl66SUAwbBjYLZWgT5fyoL6p0LvpY8UrVLOR5 mlxtMCckqUakkYHi+5BUBXIO2J2wXmgvb2RhIGer4ke3T4x+bSRTZFRjyo8Gc1AJ0tyU 5RmG9zeKp02BlCfaozQGy6TWZ4kvjswskQm3qAocJBJ1bX5xQDXzqn330xcbrXhQazMP h8UQ/3Rg3GGlEeDmPqTrWyVkzj7V3dHeuLKeUadw3F8LmStlo+akTVRt4r9hOuvPZnez YuPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HeZX23b4; 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=fail (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 e19si4154856qtw.128.2021.09.17.09.39.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 09:39:29 -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=fail header.i=@linaro.org header.s=google header.b=HeZX23b4; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRGtd-000416-H0 for patch@linaro.org; Fri, 17 Sep 2021 12:39:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRGeP-0003Vl-28 for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:46 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:40883) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRGeN-0005Ut-ID for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:44 -0400 Received: by mail-wm1-x335.google.com with SMTP id b21-20020a1c8015000000b003049690d882so10395985wmd.5 for ; Fri, 17 Sep 2021 09:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=554gJAf51sCeJWu+v3QBNYrShBWM+FpQpxvcowr/wK0=; b=HeZX23b4MfsPjAESFRt2N5WQrnxZMmB0QFVbppTuOkqEEqAkpqSTSzDBqqT3qbCCLS l9XSir7tJHI+0Ed/9m9gkaXNE4HCAXysjOVux8uOYz2lLhz2e2Z8o+P4UJYXzTWyrzuU Wn9ciDSE6D6zibPpDlJTm++DZO0b/ZN32tjSF9YfM6tUbnwrQkvreFXYLGdhQdHamO5h ypsxzB0nQ/YHX8xqLBY6pPLTvAB/QbRLJ+XjIBeQFo2JAcA3iHQE/IXrDk0kArvDPU0I wDZ3pPfAOPW9BnuSz6q87b523kJwuHfbmeDHwc3K3XHCOwD8B3YAbwR0+ko7vyArY+gn SmIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=554gJAf51sCeJWu+v3QBNYrShBWM+FpQpxvcowr/wK0=; b=wDz56kbzrMi8aguJAUcTMfAhKOCV02qODekPDihiD1u/fmWhTd6hKJvAVtjsyw63ci OWbvoq38KHcWndSlbbINpa3URBHwwDsEo3BZeVKLmnIP/ZM0PdHiR85fRShu0hTWpWzU Zh68t16jqefU5jblQtt/jwEzQ0DvKmBYayANc1f2ksPyV4GCLITJtP/y4qZovIJoYiBU 3M+zLi19z0q36RNpTVRcMhtGuPcM8uPYkqV12+bd/oPF04ZyDbQAntrjB0tExUqPcaZP 9QTS87sirfK1p8O68v9nVN2wONHAmXI9QZkdMRguBehyXUZwSpEacUVOMcdOgzn0Numy yOlQ== X-Gm-Message-State: AOAM532fQ/NEhI+Z1EtecVQ398M46GazDAYAgfIv1RSyknVQ67teVXMy bVYrIcjSEyHB8dRFmSXyYIQYww== X-Received: by 2002:a1c:cc16:: with SMTP id h22mr11387291wmb.117.1631895822099; Fri, 17 Sep 2021 09:23:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q11sm11246390wmc.41.2021.09.17.09.23.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:23:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A20011FF9C; Fri, 17 Sep 2021 17:23:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 05/11] gitlab: Add cross-riscv64-system, cross-riscv64-user Date: Fri, 17 Sep 2021 17:23:26 +0100 Message-Id: <20210917162332.3511179-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210917162332.3511179-1-alex.bennee@linaro.org> References: <20210917162332.3511179-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Richard Henderson , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson Message-Id: <20210914185830.1378771-3-richard.henderson@linaro.org> [AJB: add allow_failure] Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo --- v2 - allow_failure: true --- .gitlab-ci.d/crossbuilds.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) -- 2.30.2 diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index f10168db2e..17d6cb3e45 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -124,6 +124,25 @@ cross-ppc64el-user: variables: IMAGE: debian-ppc64el-cross +# The riscv64 cross-builds currently use a 'sid' container to get +# compilers and libraries. Until something more stable is found we +# allow_failure so as not to block CI. +cross-riscv64-system: + extends: .cross_system_build_job + allow_failure: true + needs: + job: riscv64-debian-cross-container + variables: + IMAGE: debian-riscv64-cross + +cross-riscv64-user: + extends: .cross_user_build_job + allow_failure: true + needs: + job: riscv64-debian-cross-container + variables: + IMAGE: debian-riscv64-cross + cross-s390x-system: extends: .cross_system_build_job needs: From patchwork Fri Sep 17 16:23:27 2021 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: 514195 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2395072jao; Fri, 17 Sep 2021 09:32:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4u8ffMs2yiXcbIYkUXFDwc20AVhXNTPMCVMxIo6048uMtpNtTAiPz4uYikmJ21r47mJyT X-Received: by 2002:ac8:6690:: with SMTP id d16mr1756947qtp.285.1631896346322; Fri, 17 Sep 2021 09:32:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631896346; cv=none; d=google.com; s=arc-20160816; b=kquC04JC8yD5GIpWm8RPZkCH7KNu+cUsO7TzAISRrS4P7wPJ0sB48RhCLuu4CsbYq/ 6K9p2t0f9AoLrmgczTwVGa/dBk9KkS1725a3yuDeyoAPO/8KhnGoQ4/JKqHp9UaH3rzY He6tYbnwipKnkM5+INzf4HCt2D9MqoBVVWoRd5/DvVFJa5OrD4VFFdb10c+wSuBFwB7+ Y6KgYdNH/5jup0GIQng0A4ypQLk6keoy3hY8fZCHEEX8ynAKNohTQ65mKFaX7YiJ8oan eWpWymDt9FUa3L+vn4JaolQM+ci95q2cIqUs7cCKPPUBWL2cwd1D+YawAl7sSBkYGk6O wJZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=6650I+sSBOEI7t+EMaHgrH7WtFrcTMt2scZY/FxCdUo=; b=IZ0dVZpqjqZEAMRFze0j9NwUzH2FAyQd1qjoG0D0+V6D9tuorcs38e+JFaviK82F5C NFbB+u83z7YjinZOxPUdSYgHvN8xJGWmdtztvWgIQgMemdULasegkYfBMrXT6E0hNTDk jGk+P3MsnDK0rzW6UFMJc3YrcbVKYGQMPelFqG63YEECkjKgJXrw00RpcTgLkfB4ZsMM z6twgKi4U6OplN24AC11L5zNWgM1R+rYRifvirMAvPo7rAsEChq60P675vkwGbU23pZW MPqRvdGLU9jmQl56EEbgMc5A3ywVWyfH1CdsvvuV893bXCYCfaZv2h1iAKSADEA5RfGa FhTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DBFcLQWE; 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=fail (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 l28si3712915qtu.103.2021.09.17.09.32.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 09:32: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=fail header.i=@linaro.org header.s=google header.b=DBFcLQWE; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRGmn-0007zV-QI for patch@linaro.org; Fri, 17 Sep 2021 12:32:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRGeS-0003Xk-M1 for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:50 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:33617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRGeQ-0005Xo-7V for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:48 -0400 Received: by mail-wm1-x331.google.com with SMTP id 192-20020a1c04c9000000b002f7a4ab0a49so7881148wme.0 for ; Fri, 17 Sep 2021 09:23:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6650I+sSBOEI7t+EMaHgrH7WtFrcTMt2scZY/FxCdUo=; b=DBFcLQWEEe/rbjcBv9MGtHw7F6smFCW+8N1DpFY8NFhHLiv10JLZ3bjg7/RxuaCMW4 9g6j+G+FQkju3M/QjE1vKwbJftLaRob1eZMfxjhDS2UkNFswAl3LS25H9wjfYQ0xQe8Y E6cFK49on4CBo+cMIzRJYU7YtRJFr2XC9E09u37xmnZ8KZPOsfZccgjeDluNYc4o2ByV n8ZC8uxfT6ndI/G3KxCS1XtTi+SxVut5YXZ0WgUqTWi6a4Tz8O0qGt3zBbaS1v3rRsH/ 6Bx0ammYrgVTpmSgrHYjtA5hCVHPVyISKKoRcEnnnUyJRU/3QQ1N7SRxCd5pA2nUXMk2 t/HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6650I+sSBOEI7t+EMaHgrH7WtFrcTMt2scZY/FxCdUo=; b=q62e6iHELbDJ4ssSyhBCrImgom7qQOZiBRmtD/hndi17wLQ4T3TQPk2gGu3/ljb3oI giF1C1DE0o9TGZsTirYnwOHDAD1ZoeGs/qM74SvCnFqkgkPli63J1b40ofpAEIQM4/gZ vTyP55OtrOmCgKF3p0cdn/1bO7Vlybhx15m0qt6j/rg7g6PFIwe/pHqjeYwoY8qabLUW zTXxZBdifVte6fUQB8CdDM544iZPjwohRbE6GHhBn+A+JSHM6pzNCwBZkvU9IfP02taG 5V8gbfA/FujFzEFh6ur9nh8OAwes6kBGdM907EGICQt4pFK+OiA0Vupem9vrbu3EV+Ow s9dg== X-Gm-Message-State: AOAM533Ic4Tg+C4snEAho2R1y8sjA+HSP2iwjgbTlzydahas0E+kUHXa GAnvc2+jCzm08mR+HvrhohQleg== X-Received: by 2002:a1c:ed0a:: with SMTP id l10mr11535695wmh.140.1631895824891; Fri, 17 Sep 2021 09:23:44 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s24sm6522268wmh.34.2021.09.17.09.23.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:23:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BA0C91FF9D; Fri, 17 Sep 2021 17:23:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 06/11] python: Update for pylint 2.10 Date: Fri, 17 Sep 2021 17:23:27 +0100 Message-Id: <20210917162332.3511179-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210917162332.3511179-1-alex.bennee@linaro.org> References: <20210917162332.3511179-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Eduardo Habkost , =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, John Snow , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: John Snow A few new annoyances. Of note is the new warning for an unspecified encoding when opening a text file, which actually does indicate a potentially real problem; see https://www.python.org/dev/peps/pep-0597/#motivation Use LC_CTYPE to determine an encoding to use for interpreting QEMU's terminal output. Note that Python states: "language code and encoding may be None if their values cannot be determined" -- use a platform default as a backup. Signed-off-by: John Snow Message-Id: <20210916040955.628560-2-jsnow@redhat.com> Reviewed-by: Alex Bennée Tested-by: Alex Bennée Signed-off-by: Alex Bennée --- python/qemu/machine/machine.py | 9 ++++++++- python/setup.cfg | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) -- 2.30.2 Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index a7081b1845..51b6e79a13 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -19,6 +19,7 @@ import errno from itertools import chain +import locale import logging import os import shutil @@ -290,8 +291,14 @@ def get_pid(self) -> Optional[int]: return self._subp.pid def _load_io_log(self) -> None: + # Assume that the output encoding of QEMU's terminal output + # is defined by our locale. If indeterminate, use a platform default. + _, encoding = locale.getlocale() + if encoding is None: + encoding = locale.getpreferredencoding(do_setlocale=False) if self._qemu_log_path is not None: - with open(self._qemu_log_path, "r") as iolog: + with open(self._qemu_log_path, "r", + encoding=encoding) as iolog: self._iolog = iolog.read() @property diff --git a/python/setup.cfg b/python/setup.cfg index 83909c1c97..0f0cab098f 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -104,6 +104,7 @@ good-names=i, [pylint.similarities] # Ignore imports when computing similarities. ignore-imports=yes +ignore-signatures=yes # Minimum lines number of a similarity. # TODO: Remove after we opt in to Pylint 2.8.3. See commit msg. From patchwork Fri Sep 17 16:23:28 2021 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: 514199 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2398022jao; Fri, 17 Sep 2021 09:35:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+zLAHSQueqaRHpJJpkHdewqkGImdp81fr47sECPmVkqQdLLEhschIQGMGd+o9INk2uCi2 X-Received: by 2002:a05:6214:13cd:: with SMTP id cg13mr11982629qvb.51.1631896538702; Fri, 17 Sep 2021 09:35:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631896538; cv=none; d=google.com; s=arc-20160816; b=H9KtGUQWoUn4iB//nUh5QsVAMaU2E4euK19IdjqWvf0ytLR5tdeP/8SBHg3loOHWve M6y1kyGeZRjTQUcwroaR/FzyH94y30vrEbULyBBeDgjHmAjLEWV9bDWaVB+/yEcH5ZYe kS1xuJWxuyKGiFzM0qaTH1dzRkBlnXjr62vO5GK98o9aZjbVuqMAaP5YEGwNDGn0M2L5 Cs0Ubub8N27i4/+MEO81zOuVa5WHrRM6N9915J0Rgtaw+TA5iVo/bXV1Hx6Mbg/Ede2M xQDzgqtMpzWbSRah9WmvJzjRMYIH3Jma+GGghzEYYkCGFtQy1IEmYgtCtVPxOkbc6d8Q oSnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=1NbYVxtWF/zYfxwuek6jd8ckhiFWufAXDeqjCWqUsbg=; b=k3ip+MnbfBlakxVZv1R1Q51qXkJutztbzStkvbh+YKbMA6fP1bDG3sCpIC05EVTcyj YSaC3BgaEdYcYX40x4rdmQAAAdrtkwR+CwMAr9LhIu3L1LL3CK8RWnWpEW3YJd59Rl/a J3OY9M1PuuniBYbbJ6VWD2jk80RIaUUv0l6R0WT8PSqdfrSBnJodM+8dfnTi3QzfEE+C sawSWNByr5bSzAS1jh8U3yvyCbgl+STFPhLjzwSlbZocILRQTvY7QLaB6Bqvc00JLUFg Qb7Nspfm1ZrOem0Pu3EASU51VJlftSZCwGZRihLM6mMOoIVcsLGthredXtL4hBW3UVe/ 2pkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SIbv10lV; 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=fail (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 m9si3546959qkh.410.2021.09.17.09.35.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 09:35: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=fail header.i=@linaro.org header.s=google header.b=SIbv10lV; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRGpu-0004tA-8F for patch@linaro.org; Fri, 17 Sep 2021 12:35:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRGeU-0003ZW-GZ for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:52 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:34402) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRGeR-0005Y1-3r for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:49 -0400 Received: by mail-wr1-x431.google.com with SMTP id t8so9079748wri.1 for ; Fri, 17 Sep 2021 09:23:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1NbYVxtWF/zYfxwuek6jd8ckhiFWufAXDeqjCWqUsbg=; b=SIbv10lVcAuqGYxPeMygWxQTm/+I8LQ6OeHmnqLtneZZTm/V6+RkMs/6GMtTTWeJ83 UWZi5K9VkEWp//miIBrwi1zIhdSErQ4iP05Lp4Ne7x3tihqeCJnuqr+I9AaBDxWG/sib KVCMNYN/WSbF/B+tFm2CfksggdCRzTj3bdOO3oXKb6s/abnJzN26nfugOOalt8BxI+y0 jMYjeCLeHqdifUn3vQsTZT1uN+X0mPeMMYicBEb5an/ieIxsU6m3KN4upKd0bwLa163b GYAOnsV9BN30PlgioipXyH/e4ZbXBF8TPrJN7+WKoUSUMXHUKVJc/ZqtpwcEKDtSR1yw gx9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1NbYVxtWF/zYfxwuek6jd8ckhiFWufAXDeqjCWqUsbg=; b=nux4rsjU07w1v+15GJ2RH9cFRfvj4h4pVvCcBkPghNLJDsLVmw2wB0svjymEZpIQcm VHnD6USVoGSkKyg5LHElJtFor7NVkXYcKOake9By8o3JE3AeSTO6a5TfvM6xaQHG0I0O AGx7BxtPbjdtuiWm8imFvTn4YNL+J+hJO2zdPXmwznoGFldAq39vl9iTaRDm8r7cCJFg 9Yy92/KXHT02B0jjbbV8y923NA7ExuROeaCzU5IvX/R9yxesA+c+NOz9OH/RFWkX1bri fbcSyQcafoa8vcV4JZ6DCMI78fm3cmlZ5pUBH7Yj2mM6wxVivdfvC9ZGC8FMHgdthiYC pVjg== X-Gm-Message-State: AOAM532GjrUMKkIshjerEA6v2c4hxa29VyhPm5ICZMeo6DKb2lDRuDqC 6NiIEKM0NxVAAPV2+GUEhX9/vBqpu2bsMQ== X-Received: by 2002:adf:f48b:: with SMTP id l11mr13136697wro.254.1631895825755; Fri, 17 Sep 2021 09:23:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l7sm10455746wmp.48.2021.09.17.09.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:23:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C81FC1FF9E; Fri, 17 Sep 2021 17:23:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 07/11] travis.yml: Remove the "Release tarball" job Date: Fri, 17 Sep 2021 17:23:28 +0100 Message-Id: <20210917162332.3511179-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210917162332.3511179-1-alex.bennee@linaro.org> References: <20210917162332.3511179-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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth This is a leftover from the days when we were using Travis excessively, but since x86 jobs are not really usable there anymore, this job has likely never been used since many months. Let's simply remove it now. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrangé Message-Id: <20210917094826.466047-1-thuth@redhat.com> Signed-off-by: Alex Bennée --- .travis.yml | 23 ----------------------- 1 file changed, 23 deletions(-) -- 2.30.2 diff --git a/.travis.yml b/.travis.yml index 0faddf7b4e..41010ebe6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -305,26 +305,3 @@ jobs: - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools --host-cc=clang --cxx=clang++" - UNRELIABLE=true - - # Release builds - # The make-release script expect a QEMU version, so our tag must start with a 'v'. - # This is the case when release candidate tags are created. - - name: "Release tarball" - if: tag IS present AND tag =~ /^v\d+\.\d+(\.\d+)?(-\S*)?$/ - env: - # We want to build from the release tarball - - BUILD_DIR="release/build/dir" SRC_DIR="../../.." - - BASE_CONFIG="--prefix=$PWD/dist" - - CONFIG="--target-list=x86_64-softmmu,aarch64-softmmu,armeb-linux-user,ppc-linux-user" - - TEST_CMD="make install -j${JOBS}" - - QEMU_VERSION="${TRAVIS_TAG:1}" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" - script: - - make -C ${SRC_DIR} qemu-${QEMU_VERSION}.tar.bz2 - - ls -l ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2 - - tar -xf ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2 && cd qemu-${QEMU_VERSION} - - mkdir -p release-build && cd release-build - - ../configure ${BASE_CONFIG} ${CONFIG} || { cat config.log meson-logs/meson-log.txt && exit 1; } - - make install - allow_failures: - - env: UNRELIABLE=true From patchwork Fri Sep 17 16:23:29 2021 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: 514200 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2399355jao; Fri, 17 Sep 2021 09:37:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGuxzJhzx5RTmyBzivEZZrK2BVX7V/tA8ULIjyOWqGcL9fBD6ZoWwwltbRF+xsUvpNZZ67 X-Received: by 2002:a0c:f10b:: with SMTP id i11mr11775875qvl.67.1631896640247; Fri, 17 Sep 2021 09:37:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631896640; cv=none; d=google.com; s=arc-20160816; b=zgDEqScg1IXXf8ll8Q713odW1vB3fHdY212YEyoJX+s9vB99mYhhyiqLop86ronpPy qzucVlhCKuQe/ecJ5zaUT4UYv4prJps4Li8+ATctokmKsTSg1p6bv/s2SzeeXNXUXtAK 0m++Pgi8wkkvtBLOipaSPttiZUzPKM9POywFJLqnshfroQ99jbaauz4CbNqXuWUJJbSt fJutraU3GJ5PV/S8lj5SwLIkirjXsnOL5tSa9soQB75bd7vjWEqQybhLLw4JFCK1buo1 /wnDnxTmOVMSFUF/U2xVU5KU3LM5ty1rt5dyQNT64jkghhb1/tH5Di2UnUce0C0yB0p/ nGqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=4j01yZVL1S/7C/x7Jm6reKhaa846Ap6IiDn68rRko7k=; b=gH8Jm7xoe7Zi4i2tE2mAH8Xn0BWqL5nM7oLxjKtqOsFRqPB3bmVJaIhUnucvytQhgM VNZRBtqhfIry8hB6JCUAlwLOWtPyFl1ly32wmcMGI+gCi6BEkhcdGy2X6iYbLL9EIVPx u6H5Z7E8k99rSs8AVJHCrXjgVHqf+ZGr711JjK58KqBkrV2DLeZAwrUSilnFlpS7M1hh JOIop+ov3jKaQQPGNaRqbDnJau/GNtFaIm3qTRbsQLEw01j6sPQiqfNiSZctALW5PQDo xKw8dIksZgtx2EfUwbcDh1jiUwjwjFXM/m3pA9q2ytkrB7Dvw9swg7g6YvTuMdgaAN8x YqGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="jlN0/t9E"; 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=fail (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 r4si3664580qtc.113.2021.09.17.09.37.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 09:37: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=fail header.i=@linaro.org header.s=google header.b="jlN0/t9E"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRGrX-0000kB-Pt for patch@linaro.org; Fri, 17 Sep 2021 12:37:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRGeP-0003Vr-PU for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:46 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:51757) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRGeO-0005VG-B5 for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:45 -0400 Received: by mail-wm1-x331.google.com with SMTP id y132so7791726wmc.1 for ; Fri, 17 Sep 2021 09:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4j01yZVL1S/7C/x7Jm6reKhaa846Ap6IiDn68rRko7k=; b=jlN0/t9Ee94zIFJdroTcD6O8htohy82BM/DA8MulihfLTVUNBeln5C2DT8kTPYWNfD nIFYOU3pmaJi64rMPdaUwLUBbHtUsrFCs6p2/0EjIkcpHX74LVzBJ9yCsYKUr9ygU2ce kVQ5ezy6AQtYKL9iQwUoddE7Qqxt3uyfnuZwMzdiiDlOMupD0E2H+xYBSRd5i8LjaI0K yNnwBeX+VlldNFfUGVH3iMUoSvQHrXbMl8O+WHWACzxkBcuhZ2fGc4jdVqrPxz33JIkP z1C2AjeGNJvxLCs9Nefw4fr8s+i4N4VYog3h3CZi11n0a67BIGADFBfvpirAZuw21tDK YKrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4j01yZVL1S/7C/x7Jm6reKhaa846Ap6IiDn68rRko7k=; b=T8raZtVrE2DAhvG6hfdcu69V/hSXI1ezreOAxJzupe4t1sk/wnTIVpIboHH7O+kvWW 9WLlq8yWjL/Yxegivi6gG6fuPJTfaPGUJfPZpAfpsng6aBKRNhnnlThavOukfgXf5koi 3mXScOfQZ0EdPvQz9A9hdDsvL5mfO4rVeZDl//6HB7IjwPc2vmUNtrrnwfCP30iu0B4I 17VQgCblWou+4Fa43U1zXCiRm8bqadJBVJsRUI6o5aA3k2tZCpt50dx/MrfVk5B9S8JM VrrWSaZThFoGi4fAhVXBQko+x4dt2KSLDYq9nIpalffOvP2XaMrm4zYTWaMYlaI0F7BY XZyQ== X-Gm-Message-State: AOAM531qDgppiKkOHAyFhOKbYxj7my1TdmnAP6KxhTUA1tu4xwpsr8PW OKO2G+MtApF0booVQJkNHNgKnQ== X-Received: by 2002:a1c:8b:: with SMTP id 133mr10430601wma.29.1631895822907; Fri, 17 Sep 2021 09:23:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c30sm7170571wrb.74.2021.09.17.09.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:23:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DF9141FF9F; Fri, 17 Sep 2021 17:23:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 08/11] gitlab: skip the check-patch job on the upstream repo Date: Fri, 17 Sep 2021 17:23:29 +0100 Message-Id: <20210917162332.3511179-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210917162332.3511179-1-alex.bennee@linaro.org> References: <20210917162332.3511179-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé The check-patch job is intended to be used by contributors or subsystem maintainers to see if there are style mistakes. The false positive rate is too high to be used in a gating scenario so should not run it on the upstream repo ever. Signed-off-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Acked-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20210915125452.1704899-2-berrange@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/static_checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml index 96dbd9e310..902843f8b3 100644 --- a/.gitlab-ci.d/static_checks.yml +++ b/.gitlab-ci.d/static_checks.yml @@ -8,7 +8,7 @@ check-patch: variables: GIT_DEPTH: 1000 rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' when: never - when: on_success allow_failure: true From patchwork Fri Sep 17 16:23:30 2021 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: 514203 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2401179jao; Fri, 17 Sep 2021 09:39:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMTWqxSDUfQtfksAXHlHTLdFI1AtDx+KZ1TQpC7gftLjULfIXhRAXIVFLCsljXq8wHngHa X-Received: by 2002:a05:622a:c3:: with SMTP id p3mr10908337qtw.7.1631896775419; Fri, 17 Sep 2021 09:39:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631896775; cv=none; d=google.com; s=arc-20160816; b=ut8G3Wa/X1OHSOJpKlYdh+7Iz8HvCq1KyEauowiV9E8OtHLGtOxGU9Wjo4O6yHM/Hr MWe9LikOUk6kkvXpcjcpw8ruGkHCDG39i7cI9q0q9gpj6scuqHW+apI/s7ri3piM3lr9 eIge9Ux0FwTcB5VhahKemxrdV1WkFf1k+BlhXnLWtDYfnIPumnKgQHYjy1R+C7sDwsHV 8Z4vpapM3fFCV4kNogXtoCUpyKWI3rZNZfHD77/GiY07BFVmonP+GxaoeknQXTFO1EAB cc/OpKgQexzoeLCTZz1jlj5EuZoTIFlaMgY28SZOgy7YloppINDn6NbugcmzwrbPK1fF XLDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=3Az4pZ3XvTnpuRBtAzS02EJrfreh1NdaE7t3x5B1fQ0=; b=HC15ELkJMSSrLXBNvMX54Wr0HGVghMXODSJheGKm8395nx/akn73tqtUrynhWO7AKE TaYImsGoshiTEzYIkzy3Ht3uIyWhIIe4jsN7EE2asP/vWN0GobTb4i6+VOwrh6uAD7bC LoNdt6agmrEZcD83L60HZBrkwd7rgUaEkWWJ0FBE1IShQI1WBuh81aMq6gnWx0Is2hcw gp8906x5N+WxC0j/hDMqkBF9LBWLbuUfAaHHGZcv/M0JhfnVQ98uzHAGjRyuVv/TnX19 gubegIgQOyiRWKKdefokzbA1nCTTSUspFk6ar99fi5ugF1ftYkEYcaw1KhF3mrTjOl4c u3GQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ASCJRR3V; 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=fail (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 k5si3724935qvr.194.2021.09.17.09.39.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 09:39:35 -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=fail header.i=@linaro.org header.s=google header.b=ASCJRR3V; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRGti-0004GH-Uy for patch@linaro.org; Fri, 17 Sep 2021 12:39:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRGeW-0003aG-Jw for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:54 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:40842) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRGeT-0005Zp-CG for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:52 -0400 Received: by mail-wr1-x431.google.com with SMTP id q26so16069458wrc.7 for ; Fri, 17 Sep 2021 09:23:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3Az4pZ3XvTnpuRBtAzS02EJrfreh1NdaE7t3x5B1fQ0=; b=ASCJRR3VwMKORKBhVkpyJO3+oRDRiGm3IF78c3cAVswPd+y/McoUXUMw3i81j0EPUU RBx1QqXXem06fczLibDJdFSYq/+YO9YVmX9PLQ7rckeMmPHsjdrLWm7afbhIoYvbkI0L ghWK7DySdRe+J8P0RIGVgizGyuomEGnPN2eCOsbCf5GW6Z/Qyu2HO9NjhY6sX1A2rNQt Jtrq6dKSZsVIPqjwQGndZymzs43HGsScVsuBMNtXmCK+YDbVMVl9D3aqSec5C6XTX4c0 a4aGY6hmnN5LdrClqn8oWzUdFkx5y6UFUXnf8y4qcjni4zFfNIuJgyKDSwVrMQCUwtp/ 1KXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3Az4pZ3XvTnpuRBtAzS02EJrfreh1NdaE7t3x5B1fQ0=; b=f+NwCq4GMeB3oAsVjV4GxpKy1yBNdZkf577Yfgi0rGt7NOaLkuceAK9nSMAbf/nZoL lG63Z7+44ecMmpu3WqevAvM2+bAc5nV3DS11FAUikpZlZkUe99TkUKCquizp2ElKjFks 6PY95GNvqcmLqHIvLnlXM73bc6Sb3mj5owvCy7Jtj3biYxS/UCwE/ensqccw6u1tPnbq dFq7e7p1a+LBaRFQcrRRMJGsjwhg0P8lg7/zWKUJnlGzPIOcOhJhMg0qcjIdL7m/jvxa ScoOtb06JTwkhKCI02h9wRxvLYXHVK7LM2w9YL/oFLazu2F0sCVW2EWHT2QjQLgsaIxo hWbA== X-Gm-Message-State: AOAM533+TETVoGTfAkWeXSeRbbrFMNtgJp6Sm/AjBZdFPvfR0jEdeN9Q XnAzgc2HXlDEyehiO6sAZqlEGA== X-Received: by 2002:adf:ed82:: with SMTP id c2mr13208571wro.203.1631895827893; Fri, 17 Sep 2021 09:23:47 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k4sm7033074wrv.24.2021.09.17.09.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:23:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EEB7D1FFA5; Fri, 17 Sep 2021 17:23:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 09/11] gitlab: fix passing of TEST_TARGETS env to cirrus Date: Fri, 17 Sep 2021 17:23:30 +0100 Message-Id: <20210917162332.3511179-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210917162332.3511179-1-alex.bennee@linaro.org> References: <20210917162332.3511179-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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Richard Henderson , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé A typo meant the substitution would not work, and the placeholder in the target file didn't even exist. The result was that tests were never run on the FreeBSD and macOS jobs, only a basic build. Signed-off-by: Daniel P. Berrangé Acked-by: Thomas Huth Reviewed-by: Willian Rampazzo Reviewed-by: Richard Henderson Message-Id: <20210915125452.1704899-3-berrange@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/cirrus.yml | 2 +- .gitlab-ci.d/cirrus/build.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- 2.30.2 diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 675db69622..e7b25e7427 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -35,7 +35,7 @@ -e "s|[@]PIP3@|$PIP3|g" -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g" -e "s|[@]CONFIGURE_ARGS@|$CONFIGURE_ARGS|g" - -e "s|[@]TEST_TARGETSS@|$TEST_TARGETSS|g" + -e "s|[@]TEST_TARGETS@|$TEST_TARGETS|g" <.gitlab-ci.d/cirrus/build.yml >.gitlab-ci.d/cirrus/$NAME.yml - cat .gitlab-ci.d/cirrus/$NAME.yml - cirrus-run -v --show-build-log always .gitlab-ci.d/cirrus/$NAME.yml diff --git a/.gitlab-ci.d/cirrus/build.yml b/.gitlab-ci.d/cirrus/build.yml index 857bdc5536..c555f5d36e 100644 --- a/.gitlab-ci.d/cirrus/build.yml +++ b/.gitlab-ci.d/cirrus/build.yml @@ -13,6 +13,7 @@ env: PYTHON: "@PYTHON@" MAKE: "@MAKE@" CONFIGURE_ARGS: "@CONFIGURE_ARGS@" + TEST_TARGETS: "@TEST_TARGETS@" build_task: install_script: From patchwork Fri Sep 17 16:23:31 2021 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: 514204 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2403090jao; Fri, 17 Sep 2021 09:41:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0eYu5fOeCjW+isARU9NrttuaN1S06KI8bw6FwL898qbPTgWxWXHo6l2c9TwTPgU4zkSyd X-Received: by 2002:a05:6102:3662:: with SMTP id bg2mr10031707vsb.0.1631896914571; Fri, 17 Sep 2021 09:41:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631896914; cv=none; d=google.com; s=arc-20160816; b=zaZjPcOdTHGw0ipLCujXsNTSwI/ID3MUKcHMkzvSokDzpYXMQWZsehHSS1+j9ykrza 7bIrMav8kTwHRW8jYVWqmHuIjd1QvkC1JI3ZYIltt4LGDbMsdoJQHBoVoI2hBYExd2xB On/OxcpdyNN5MTMk5okG3kbu7Z81CwYK+lCs5G/nT9NpK9gZOterOL2MTJvI6bSKFowv Xv0aDtjHG9iPgCJp64s91N7uPUKxyKJb5dIE2h6sjRUbh+LeyLK4cD7KA9BcqdFiZZ91 0bb4lkcSU+zkEQGwRxBYoeqVviFlwfQXLM1VCXOZZKiSeNgxJ7EGPXpQ8exYuHSqHUJi 337g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=h2a/fqMAvfvd62I27PQxa6vTnXLDXdirz0neaQPZpwY=; b=P/pQxi/TOvOGCPA2W8MMKFEhP+47V61fucpBzKnDOoqU+2ZYObh2yqCmk2GauUWLvw w3JyX/tiDtogSXb84gxz9Uvor5Us6bAtr/oxA4rGqnV2wEzquGvj/iHlS95lx+kfTGDs wHP/VOq5eT20hni6mOsKgOgpIq94Daaa1QododElebEBGEytxsVDxClO4f/KMvFpt9N9 vSlZRYhYT+rSvpGB6wDImopsw57+Wvk8kOhm6U6RAnEavxHWAe2AL3L7bdFXFGr/dmaS 75uhme3Fov6bFnOGXoT6GYKVJ24xbQVscr1XFlVAU5/c7irltd1BzSCZXYvrX9yXumyQ 2pvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=H13w2seV; 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=fail (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 l14si3227095uar.158.2021.09.17.09.41.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 09:41:54 -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=fail header.i=@linaro.org header.s=google header.b=H13w2seV; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRGvy-0007d3-1d for patch@linaro.org; Fri, 17 Sep 2021 12:41:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRGeY-0003aZ-G6 for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:54 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:37499) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRGeU-0005ab-8w for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:54 -0400 Received: by mail-wr1-x42a.google.com with SMTP id t8so16085849wrq.4 for ; Fri, 17 Sep 2021 09:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h2a/fqMAvfvd62I27PQxa6vTnXLDXdirz0neaQPZpwY=; b=H13w2seVe30qGiqpDyrDiy4MnZQ2JjvG3CJ5p5v77tygYXqSF7HQ9yfnsoMAmX1lK1 JBr389uuWq7ecLuQ03qVzUMKwm65HdyQqqvQR5rQ7Bq7z+U57t0z9wkvYCjltG2mggbj lChRIU4/fTJE94795l8i0EFP19uimjLyhPc2SLb/Gng6GkqyDMRBGUEHt2/uilFLErnc +DIQzOiQdy1wV9CXyCAACXUzLT5WEDYZbl7cVVNXSWttDh6Zsfcnq6g8Clj+1ZLYq9+2 Z41VVN515iLREDZGJ6vncBprR10IDHxVYQeyBRwPE5jWnNEFydhjkoonjqtrCb/eO2c5 1YpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h2a/fqMAvfvd62I27PQxa6vTnXLDXdirz0neaQPZpwY=; b=kIYDXF99gj7/4iF6ZJbJgozGZn+0eFSpTBTCaRLKV6Ku+oq2k1u7L3Jbl/ktAHxPB9 OwVKbP2kxxcDJ64cV2uhS9p4zuA+MSzL41Qc6xBXtTmuXFXOs3BV4EzgBt1qmRi6dwxl R0u+Eiiz34QbuKdxt3RQPPK+TubvUp2OBfFxsmue84dcv+zF4+SkGQjB9Ajpf2YFl5HR ZNP3NOFPz7yuNimDgaxAv0OJEdQyp6vSevEKHPjO5G+dKyTEa6Low/2+8UCgDbi/ig7p uzRu+JlguhJrh2vXxcLk/OLMjvtWHQIeS+eRO7taHJCxJYnLXSdbhFLI/lsa4r6L6ZCb DT6Q== X-Gm-Message-State: AOAM531/AF5ItCbnk/mPkWesoRv3mmU93wBACW46cc4S1hrPbfm1hxD1 E5R9kjt7dUyLGoWd+sI1sd7rBw== X-Received: by 2002:a5d:5408:: with SMTP id g8mr13391466wrv.34.1631895828577; Fri, 17 Sep 2021 09:23:48 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y1sm7318128wmq.43.2021.09.17.09.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:23:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 114811FFA6; Fri, 17 Sep 2021 17:23:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 10/11] plugins/: Add missing functions to symbol list Date: Fri, 17 Sep 2021 17:23:31 +0100 Message-Id: <20210917162332.3511179-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210917162332.3511179-1-alex.bennee@linaro.org> References: <20210917162332.3511179-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, =?utf-8?q?Lukas_?= =?utf-8?q?J=C3=BCnger?= , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Lukas Jünger Some functions of the plugin API were missing in the symbol list. However, they are all used by the contributed example plugins. QEMU fails to load the plugin if the function symbol is not exported. Signed-off-by: Lukas Jünger Message-Id: <20210905140939.638928-2-lukas.junger@greensocs.com> Signed-off-by: Alex Bennée --- plugins/qemu-plugins.symbols | 3 +++ 1 file changed, 3 insertions(+) -- 2.30.2 diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols index 67b309ea2a..4834756ba3 100644 --- a/plugins/qemu-plugins.symbols +++ b/plugins/qemu-plugins.symbols @@ -1,11 +1,14 @@ { qemu_plugin_bool_parse; qemu_plugin_get_hwaddr; + qemu_plugin_hwaddr_device_name; qemu_plugin_hwaddr_is_io; + qemu_plugin_hwaddr_phys_addr; qemu_plugin_insn_data; qemu_plugin_insn_disas; qemu_plugin_insn_haddr; qemu_plugin_insn_size; + qemu_plugin_insn_symbol; qemu_plugin_insn_vaddr; qemu_plugin_mem_is_big_endian; qemu_plugin_mem_is_sign_extended; From patchwork Fri Sep 17 16:23:32 2021 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: 514201 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2399402jao; Fri, 17 Sep 2021 09:37:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSqBqEH92kY1qE5xa9ZOBlugLLTFAbwAgJ/iLrcQVOOKWTGa4gvcRSiLe0l3rvkTOHdAHD X-Received: by 2002:a05:620a:204e:: with SMTP id d14mr11379599qka.147.1631896643448; Fri, 17 Sep 2021 09:37:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631896643; cv=none; d=google.com; s=arc-20160816; b=fYnCrahyvKjemcNV2Tu2Vzo+0+qkKGmyM+lr3Sw8qi43uXBaDoz0xBtB+giy33PsKr 3Q+5iryVC2Q/Ez+Fa/lf0J3SvjUg/nJfY1iHhFkhByz0sFxrGHyJ5y1Ebl5rR2KlEfMl urwQYBUM+3cFSl3mnbjkfF+7DLZTsmkqCcsD3AKKhfPk9bnYKO8P3WBHgZQxvthylGEu OWmx7wtVKEGjJq5Wf/aHKUm82WT6saosOCbrHApd+mIW1u9EGq8iipbbqdulQcLtzLq3 TQwspwnqfOt1ZbnyDVsitkrY4x9OTcQgkXqw+U9J+r0MDK+WyAT+d6spNkj4vO26TyLv APrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=GCZPVLj0653u4cTSSRRcYrTh9dJINc809P2AzsfKj0E=; b=mFR9zGO9JJxMq2YqQebYo+PuVPab9Nibuug/mUpGdI8FZoCGBZCRHUXHw6D4A5EBg1 mre60Y0EOtY0JpE1VGlKxctcHpXVHlpRRPuHykFzBHD4erDd6AdYMzoWlueSKOqmy6yN dNpAWyDmWQJsGm8sslZfC85az3izj1s9rAPtlfj4pNSktM5QGVPcEbla4J8lraFS2dhg wnSLe9x1dwD2RY+b7UuN84uKMYlpDH0qvd1V7vbH52A9u5PIJMeBnGIUf1HdV6FukwFJ H4mPrcNlixJS6GIFQwMY5qUNYGOmea/Cj2hMV5q4Q/lvZjWAqzGrAEdqsDcvKyM9Vpib D7Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="lLMV/QlC"; 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=fail (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 m1si3901039qvb.8.2021.09.17.09.37.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 09:37:23 -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=fail header.i=@linaro.org header.s=google header.b="lLMV/QlC"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRGra-0000to-VM for patch@linaro.org; Fri, 17 Sep 2021 12:37:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRGeY-0003aO-61 for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:54 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:36357) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRGeW-0005dE-C1 for qemu-devel@nongnu.org; Fri, 17 Sep 2021 12:23:53 -0400 Received: by mail-wr1-x431.google.com with SMTP id g16so16074068wrb.3 for ; Fri, 17 Sep 2021 09:23:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GCZPVLj0653u4cTSSRRcYrTh9dJINc809P2AzsfKj0E=; b=lLMV/QlCkIR610MvZSHRJ50xu6QlYWL9widoi/3/+oO9WPFNnnwtG6PHldVffkJ5FR GGbnkOXBLlC9VUnbFXdosWeWbAdmeVd5jo97Op5YBec3x5AJ4toa/W3APUcq/kbUGS// zTinekuR5as0gmpIazRdKs/V7I+mYCA+3RNMtb6UyJAZOxRenmCkcjo68PJXlIscYixc n86AC1DaguBAZrPz/yrT3Uux7Cxa6Lo83ZKNN5CkRqVGmEi/uiAgqHRVFSoRclf+IvkJ SAX5XFtEXrhL7NtvxlJb4Mw/zVZgmiqOiketCZCVhd1NDI+6O3p1PpqCXdQ/TTbjdTLh /0pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GCZPVLj0653u4cTSSRRcYrTh9dJINc809P2AzsfKj0E=; b=ulA0AS5BxIa9n6nUbHlo7weqvQRsH6aEyQegA77Ll3fsqpWraAEE33IAtugsV8kYDG UF1KrFXfMPidy6u4r7g0PNaG3mBc+GDiRvlHT/z+O3FxVAU9Sj9V+Ga72rUnmMd0cLpY 2kxcvkxfrz5ehh7w2QG9SKaATzvVdYRI13CmXP3ZotXENFgjcrEIm5SOGQyiltUpiBhO nRJqDvbjxnsp0jYq6JW1oE0kC12SOlJLzTntUkJ2BLqXLd1k2XylcPD2He9NpxX5alFY meG3EKA6HWTpfAiNs7Zi5D/AfwQ8ONojc/1j8nX2kXy9m+JAzM5sr0q4EoApP7q0WjeP qhVQ== X-Gm-Message-State: AOAM531ArHFOBXeIL/c+QwJthrrJxTFSHbefP5oxsQrxYr8TkwYMfJjG HXqP938lqSPoGtOKYL9Pq78Pdw== X-Received: by 2002:a5d:59a4:: with SMTP id p4mr12917545wrr.332.1631895830714; Fri, 17 Sep 2021 09:23:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r129sm7138432wmr.7.2021.09.17.09.23.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:23:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2115F1FFA9; Fri, 17 Sep 2021 17:23:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 11/11] accel/tcg: re-factor plugin_inject_cb so we can assert insn_idx is valid Date: Fri, 17 Sep 2021 17:23:32 +0100 Message-Id: <20210917162332.3511179-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210917162332.3511179-1-alex.bennee@linaro.org> References: <20210917162332.3511179-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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Peter Maydell , berrange@redhat.com, Richard Henderson , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Coverity doesn't know enough about how we have arranged our plugin TCG ops to know we will always have incremented insn_idx before injecting the callback. Let us assert it for the benefit of Coverity and protect ourselves from accidentally breaking the assumption and triggering harder to grok errors deeper in the code if we attempt a negative indexed array lookup. However to get to this point we re-factor the code and remove the second hand instruction boundary detection in favour of scanning the full set of ops and using the existing INDEX_op_insn_start to cleanly detect when the instruction has started. As we no longer need the plugin specific list of ops we delete that. My initial benchmarks shows no discernible impact of dropping the plugin specific ops list. Fixes: Coverity 1459509 Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Cc: Peter Maydell --- v2/v3 - re-factor and drop the plugin_op/link approach --- include/tcg/tcg.h | 6 -- accel/tcg/plugin-gen.c | 157 ++++++++++++++++++++++------------------- 2 files changed, 85 insertions(+), 78 deletions(-) -- 2.30.2 diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 44ccd86f3e..a7f6475348 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -492,9 +492,6 @@ typedef struct TCGOp { /* Next and previous opcodes. */ QTAILQ_ENTRY(TCGOp) link; -#ifdef CONFIG_PLUGIN - QSIMPLEQ_ENTRY(TCGOp) plugin_link; -#endif /* Arguments for the opcode. */ TCGArg args[MAX_OPC_PARAM]; @@ -604,9 +601,6 @@ struct TCGContext { /* descriptor of the instruction being translated */ struct qemu_plugin_insn *plugin_insn; - - /* list to quickly access the injected ops */ - QSIMPLEQ_HEAD(, TCGOp) plugin_ops; #endif GHashTable *const_table[TCG_TYPE_COUNT]; diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 88e25c6df9..f145b815c0 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -163,11 +163,7 @@ static void gen_empty_mem_helper(void) static void gen_plugin_cb_start(enum plugin_gen_from from, enum plugin_gen_cb type, unsigned wr) { - TCGOp *op; - tcg_gen_plugin_cb_start(from, type, wr); - op = tcg_last_op(); - QSIMPLEQ_INSERT_TAIL(&tcg_ctx->plugin_ops, op, plugin_link); } static void gen_wrapped(enum plugin_gen_from from, @@ -707,62 +703,6 @@ static void plugin_gen_disable_mem_helper(const struct qemu_plugin_tb *ptb, inject_mem_disable_helper(insn, begin_op); } -static void plugin_inject_cb(const struct qemu_plugin_tb *ptb, TCGOp *begin_op, - int insn_idx) -{ - enum plugin_gen_from from = begin_op->args[0]; - enum plugin_gen_cb type = begin_op->args[1]; - - switch (from) { - case PLUGIN_GEN_FROM_TB: - switch (type) { - case PLUGIN_GEN_CB_UDATA: - plugin_gen_tb_udata(ptb, begin_op); - return; - case PLUGIN_GEN_CB_INLINE: - plugin_gen_tb_inline(ptb, begin_op); - return; - default: - g_assert_not_reached(); - } - case PLUGIN_GEN_FROM_INSN: - switch (type) { - case PLUGIN_GEN_CB_UDATA: - plugin_gen_insn_udata(ptb, begin_op, insn_idx); - return; - case PLUGIN_GEN_CB_INLINE: - plugin_gen_insn_inline(ptb, begin_op, insn_idx); - return; - case PLUGIN_GEN_ENABLE_MEM_HELPER: - plugin_gen_enable_mem_helper(ptb, begin_op, insn_idx); - return; - default: - g_assert_not_reached(); - } - case PLUGIN_GEN_FROM_MEM: - switch (type) { - case PLUGIN_GEN_CB_MEM: - plugin_gen_mem_regular(ptb, begin_op, insn_idx); - return; - case PLUGIN_GEN_CB_INLINE: - plugin_gen_mem_inline(ptb, begin_op, insn_idx); - return; - default: - g_assert_not_reached(); - } - case PLUGIN_GEN_AFTER_INSN: - switch (type) { - case PLUGIN_GEN_DISABLE_MEM_HELPER: - plugin_gen_disable_mem_helper(ptb, begin_op, insn_idx); - return; - default: - g_assert_not_reached(); - } - default: - g_assert_not_reached(); - } -} - /* #define DEBUG_PLUGIN_GEN_OPS */ static void pr_ops(void) { @@ -820,21 +760,95 @@ static void pr_ops(void) static void plugin_gen_inject(const struct qemu_plugin_tb *plugin_tb) { TCGOp *op; - int insn_idx; + int insn_idx = -1; pr_ops(); - insn_idx = -1; - QSIMPLEQ_FOREACH(op, &tcg_ctx->plugin_ops, plugin_link) { - enum plugin_gen_from from = op->args[0]; - enum plugin_gen_cb type = op->args[1]; - - tcg_debug_assert(op->opc == INDEX_op_plugin_cb_start); - /* ENABLE_MEM_HELPER is the first callback of an instruction */ - if (from == PLUGIN_GEN_FROM_INSN && - type == PLUGIN_GEN_ENABLE_MEM_HELPER) { + + QTAILQ_FOREACH(op, &tcg_ctx->ops, link) { + switch (op->opc) { + case INDEX_op_insn_start: insn_idx++; + break; + case INDEX_op_plugin_cb_start: + { + enum plugin_gen_from from = op->args[0]; + enum plugin_gen_cb type = op->args[1]; + + switch (from) { + case PLUGIN_GEN_FROM_TB: + { + g_assert(insn_idx == -1); + + switch (type) { + case PLUGIN_GEN_CB_UDATA: + plugin_gen_tb_udata(plugin_tb, op); + break; + case PLUGIN_GEN_CB_INLINE: + plugin_gen_tb_inline(plugin_tb, op); + break; + default: + g_assert_not_reached(); + } + break; + } + case PLUGIN_GEN_FROM_INSN: + { + g_assert(insn_idx >= 0); + + switch (type) { + case PLUGIN_GEN_CB_UDATA: + plugin_gen_insn_udata(plugin_tb, op, insn_idx); + break; + case PLUGIN_GEN_CB_INLINE: + plugin_gen_insn_inline(plugin_tb, op, insn_idx); + break; + case PLUGIN_GEN_ENABLE_MEM_HELPER: + plugin_gen_enable_mem_helper(plugin_tb, op, insn_idx); + break; + default: + g_assert_not_reached(); + } + break; + } + case PLUGIN_GEN_FROM_MEM: + { + g_assert(insn_idx >= 0); + + switch (type) { + case PLUGIN_GEN_CB_MEM: + plugin_gen_mem_regular(plugin_tb, op, insn_idx); + break; + case PLUGIN_GEN_CB_INLINE: + plugin_gen_mem_inline(plugin_tb, op, insn_idx); + break; + default: + g_assert_not_reached(); + } + + break; + } + case PLUGIN_GEN_AFTER_INSN: + { + g_assert(insn_idx >= 0); + + switch (type) { + case PLUGIN_GEN_DISABLE_MEM_HELPER: + plugin_gen_disable_mem_helper(plugin_tb, op, insn_idx); + break; + default: + g_assert_not_reached(); + } + break; + } + default: + g_assert_not_reached(); + } + break; + } + default: + /* plugins don't care about any other ops */ + break; } - plugin_inject_cb(plugin_tb, op, insn_idx); } pr_ops(); } @@ -847,7 +861,6 @@ bool plugin_gen_tb_start(CPUState *cpu, const TranslationBlock *tb, bool mem_onl if (test_bit(QEMU_PLUGIN_EV_VCPU_TB_TRANS, cpu->plugin_mask)) { ret = true; - QSIMPLEQ_INIT(&tcg_ctx->plugin_ops); ptb->vaddr = tb->pc; ptb->vaddr2 = -1; get_page_addr_code_hostp(cpu->env_ptr, tb->pc, &ptb->haddr1);