From nobody Sun May 19 04:05:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646678788303802.4178926815725; Mon, 7 Mar 2022 10:46:28 -0800 (PST) Received: from localhost ([::1]:58358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRING-0002Cv-Bb for importer@patchew.org; Mon, 07 Mar 2022 13:46:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI3u-0005vT-8U for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:47968) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI3r-0006tB-GM for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:24 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-517-cwgx1AYpM1iWRXBZNCrHyA-1; Mon, 07 Mar 2022 13:26:21 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2BD61824FA6; Mon, 7 Mar 2022 18:26:20 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B06780FC5; Mon, 7 Mar 2022 18:26:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646677582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aOA6hzbYeg9F/+fgrAqjiqtkdD1VW3VcKn/1qNtJN2A=; b=JT1pLacHITwhFy8NlmdJvz9+cFNw7j4ELwRkkWWUplfnsT+4xW+rNQfoq6pPOxg1XdmBaZ d8eNEOX5Xwlqum1TXsfFRBsUkIi0RNSUH82LFsnDeRrL1y5yuZ2Wfgraz49mhbC9TlGNoB 6O9bVGZQew2q47vbfmBx2RNrKapaAsc= X-MC-Unique: cwgx1AYpM1iWRXBZNCrHyA-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 1/7] tests/tcg/s390x: Fix mvc, mvo and pack tests with Clang Date: Mon, 7 Mar 2022 19:26:03 +0100 Message-Id: <20220307182609.94466-2-thuth@redhat.com> In-Reply-To: <20220307182609.94466-1-thuth@redhat.com> References: <20220307182609.94466-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Richard Henderson , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1646678790715100001 Content-Type: text/plain; charset="utf-8" These instructions use addressing with a "base address", meaning that if register r0 is used, it is always treated as zero, no matter what value is stored in the register. So we have to make sure not to use register r0 for these instructions in our tests. There was no problem with GCC so far since it seems to always pick other registers by default, but Clang likes to chose register r0, too, so we have to use the "a" constraint to make sure that it does not pick r0 here. Message-Id: <20220301093911.1450719-1-thuth@redhat.com> Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- tests/tcg/s390x/mvc.c | 4 ++-- tests/tcg/s390x/mvo.c | 4 ++-- tests/tcg/s390x/pack.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/tcg/s390x/mvc.c b/tests/tcg/s390x/mvc.c index aa552d52e5..7ae4c44550 100644 --- a/tests/tcg/s390x/mvc.c +++ b/tests/tcg/s390x/mvc.c @@ -20,8 +20,8 @@ static inline void mvc_256(const char *dst, const char *s= rc) asm volatile ( " mvc 0(256,%[dst]),0(%[src])\n" : - : [dst] "d" (dst), - [src] "d" (src) + : [dst] "a" (dst), + [src] "a" (src) : "memory"); } =20 diff --git a/tests/tcg/s390x/mvo.c b/tests/tcg/s390x/mvo.c index 5546fe2a97..0c3ecdde2e 100644 --- a/tests/tcg/s390x/mvo.c +++ b/tests/tcg/s390x/mvo.c @@ -11,8 +11,8 @@ int main(void) asm volatile ( " mvo 0(4,%[dest]),0(3,%[src])\n" : - : [dest] "d" (dest + 1), - [src] "d" (src + 1) + : [dest] "a" (dest + 1), + [src] "a" (src + 1) : "memory"); =20 for (i =3D 0; i < sizeof(expected); i++) { diff --git a/tests/tcg/s390x/pack.c b/tests/tcg/s390x/pack.c index 4be36f29a7..55e7e214e8 100644 --- a/tests/tcg/s390x/pack.c +++ b/tests/tcg/s390x/pack.c @@ -9,7 +9,7 @@ int main(void) asm volatile( " pack 2(4,%[data]),2(4,%[data])\n" : - : [data] "r" (&data[0]) + : [data] "a" (&data[0]) : "memory"); for (i =3D 0; i < 8; i++) { if (data[i] !=3D exp[i]) { --=20 2.27.0 From nobody Sun May 19 04:05:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646679027320983.6869727009823; Mon, 7 Mar 2022 10:50:27 -0800 (PST) Received: from localhost ([::1]:35576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRIR8-00068e-CI for importer@patchew.org; Mon, 07 Mar 2022 13:50:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI43-0006De-JC for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:26821) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI42-0006tg-09 for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:35 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-649-b7y865XQNVek0P6_N4DBKg-1; Mon, 07 Mar 2022 13:26:28 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B13751006AA7; Mon, 7 Mar 2022 18:26:21 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84D79804DB; Mon, 7 Mar 2022 18:26:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646677590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gJrLNPZDESmyAqScpi0fQ+rhDnlSbbR5bnlAZLWGzJE=; b=JVandOlR74YVHz2auHP5hpHNAMT50EBcd2SNQqBnkLy2fz2pxh4rana0GyKsfuUmJ3WtJ5 TmjPm1t5EdfrsS1dD6KqsktP2w3B90NnbnQ2bJrqXFFJ3dh5PZOwFyA1NVij04IAtwDr91 JcjzavMb7mQskUJqK02ybTBvohqM10c= X-MC-Unique: b7y865XQNVek0P6_N4DBKg-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 2/7] tests/tcg/s390x: Fix the exrl-trt* tests with Clang Date: Mon, 7 Mar 2022 19:26:04 +0100 Message-Id: <20220307182609.94466-3-thuth@redhat.com> In-Reply-To: <20220307182609.94466-1-thuth@redhat.com> References: <20220307182609.94466-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Richard Henderson , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1646679029024100001 Content-Type: text/plain; charset="utf-8" The exrl-trt* tests use two pre-initialized variables for the results of the assembly code: uint64_t r1 =3D 0xffffffffffffffffull; uint64_t r2 =3D 0xffffffffffffffffull; But then the assembly code copies over the full contents of the register into the output variable, without taking care of this pre-initialized values: " lgr %[r1],%%r1\n" " lgr %[r2],%%r2\n" The code then finally compares the register contents to a value that apparently depends on the pre-initialized values: if (r2 !=3D 0xffffffffffffffaaull) { write(1, "bad r2\n", 7); return 1; } This all works with GCC, since the 0xffffffffffffffff got into the r2 register there by accident, but it fails completely with Clang. Let's fix this by declaring the r1 and r2 variables as proper register variables instead, so the pre-initialized values get correctly passed into the inline assembly code. Message-Id: <20220301092431.1448419-1-thuth@redhat.com> Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- tests/tcg/s390x/exrl-trt.c | 8 +++----- tests/tcg/s390x/exrl-trtr.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/tcg/s390x/exrl-trt.c b/tests/tcg/s390x/exrl-trt.c index 16711a3181..451f777b9d 100644 --- a/tests/tcg/s390x/exrl-trt.c +++ b/tests/tcg/s390x/exrl-trt.c @@ -5,8 +5,8 @@ int main(void) { char op1[] =3D "hello"; char op2[256]; - uint64_t r1 =3D 0xffffffffffffffffull; - uint64_t r2 =3D 0xffffffffffffffffull; + register uint64_t r1 asm("r1") =3D 0xffffffffffffffffull; + register uint64_t r2 asm("r2") =3D 0xffffffffffffffffull; uint64_t cc; int i; =20 @@ -21,8 +21,6 @@ int main(void) " j 2f\n" "1: trt 0(1,%[op1]),%[op2]\n" "2: exrl %[op1_len],1b\n" - " lgr %[r1],%%r1\n" - " lgr %[r2],%%r2\n" " ipm %[cc]\n" : [r1] "+r" (r1), [r2] "+r" (r2), @@ -30,7 +28,7 @@ int main(void) : [op1] "a" (&op1), [op1_len] "a" (5), [op2] "Q" (op2) - : "r1", "r2", "cc"); + : "cc"); cc =3D (cc >> 28) & 3; if (cc !=3D 2) { write(1, "bad cc\n", 7); diff --git a/tests/tcg/s390x/exrl-trtr.c b/tests/tcg/s390x/exrl-trtr.c index 5f30cda6bd..422f7f385a 100644 --- a/tests/tcg/s390x/exrl-trtr.c +++ b/tests/tcg/s390x/exrl-trtr.c @@ -5,8 +5,8 @@ int main(void) { char op1[] =3D {0, 1, 2, 3}; char op2[256]; - uint64_t r1 =3D 0xffffffffffffffffull; - uint64_t r2 =3D 0xffffffffffffffffull; + register uint64_t r1 asm("r1") =3D 0xffffffffffffffffull; + register uint64_t r2 asm("r2") =3D 0xffffffffffffffffull; uint64_t cc; int i; =20 @@ -21,8 +21,6 @@ int main(void) " j 2f\n" "1: trtr 3(1,%[op1]),%[op2]\n" "2: exrl %[op1_len],1b\n" - " lgr %[r1],%%r1\n" - " lgr %[r2],%%r2\n" " ipm %[cc]\n" : [r1] "+r" (r1), [r2] "+r" (r2), @@ -30,7 +28,7 @@ int main(void) : [op1] "a" (&op1), [op1_len] "a" (3), [op2] "Q" (op2) - : "r1", "r2", "cc"); + : "cc"); cc =3D (cc >> 28) & 3; if (cc !=3D 1) { write(1, "bad cc\n", 7); --=20 2.27.0 From nobody Sun May 19 04:05:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646678589110495.24084302386245; Mon, 7 Mar 2022 10:43:09 -0800 (PST) Received: from localhost ([::1]:54740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRIK3-0007wX-6z for importer@patchew.org; Mon, 07 Mar 2022 13:43:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI43-0006Dd-HA for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI42-0006tm-0m for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:35 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-269-ehZZjNiSOU2a9rcCSix4cw-1; Mon, 07 Mar 2022 13:26:28 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 43FE0FC81; Mon, 7 Mar 2022 18:26:23 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 128AE804DB; Mon, 7 Mar 2022 18:26:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646677591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DOiSA/xKTOL3iTWpMDdcLBMuVcHGzrE3Nc6MuP2DmK4=; b=TGih+4P//eOJEQ5Bv+wM2l3UuOQtKvPfYbvq9IxI7d96UggtS7I4GWmcr1znB0RJx/0+a6 l1Cfh26GCbTvDqYzyuE8hWhgHt31xEz4y/0zEs3ZUjOKWIRVHIhQfB7+nDgHMMKrjbwdbQ LBkuDIblgnxr6VCteNdG8UoDEmkngao= X-MC-Unique: ehZZjNiSOU2a9rcCSix4cw-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 3/7] tests/tcg/s390x: Cleanup of mie3 tests. Date: Mon, 7 Mar 2022 19:26:05 +0100 Message-Id: <20220307182609.94466-4-thuth@redhat.com> In-Reply-To: <20220307182609.94466-1-thuth@redhat.com> References: <20220307182609.94466-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Richard Henderson , David Miller Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1646678590460100001 Content-Type: text/plain; charset="utf-8" From: David Miller Adds clobbers and merges remaining separate asm statements. Signed-off-by: David Miller Message-Id: <20220301214305.2778-1-dmiller423@gmail.com> Reviewed-by: Richard Henderson [thuth: dropped changes to mie3-compl.c, whitespace fixes] Signed-off-by: Thomas Huth --- tests/tcg/s390x/mie3-mvcrl.c | 10 ++++++---- tests/tcg/s390x/mie3-sel.c | 35 +++++++++++++++-------------------- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/tests/tcg/s390x/mie3-mvcrl.c b/tests/tcg/s390x/mie3-mvcrl.c index 57b08e48d0..93c7b0a290 100644 --- a/tests/tcg/s390x/mie3-mvcrl.c +++ b/tests/tcg/s390x/mie3-mvcrl.c @@ -1,15 +1,17 @@ #include #include =20 + static inline void mvcrl_8(const char *dst, const char *src) { asm volatile ( - "llill %%r0, 8\n" - ".insn sse, 0xE50A00000000, 0(%[dst]), 0(%[src])" - : : [dst] "d" (dst), [src] "d" (src) - : "memory"); + "llill %%r0, 8\n" + ".insn sse, 0xE50A00000000, 0(%[dst]), 0(%[src])" + : : [dst] "d" (dst), [src] "d" (src) + : "r0", "memory"); } =20 + int main(int argc, char *argv[]) { const char *alpha =3D "abcdefghijklmnop"; diff --git a/tests/tcg/s390x/mie3-sel.c b/tests/tcg/s390x/mie3-sel.c index b0c5c9857d..0dfd532ed4 100644 --- a/tests/tcg/s390x/mie3-sel.c +++ b/tests/tcg/s390x/mie3-sel.c @@ -1,32 +1,27 @@ #include =20 + #define Fi3(S, ASM) uint64_t S(uint64_t a, uint64_t b, uint64_t c) \ -{ \ - uint64_t res =3D 0; \ - asm ( \ - "lg %%r2, %[a]\n" \ - "lg %%r3, %[b]\n" \ - "lg %%r0, %[c]\n" \ - "ltgr %%r0, %%r0\n" \ - ASM \ - "stg %%r0, %[res] " \ - : [res] "=3Dm" (res) \ - : [a] "m" (a), \ - [b] "m" (b), \ - [c] "m" (c) \ - : "r0", "r2", \ - "r3", "r4" \ - ); \ - return res; \ +{ \ +asm volatile ( \ + "ltgr %[c], %[c]\n" \ + ASM \ + : [c] "+r" (c) \ + : [a] "r" (a) \ + , [b] "r" (b) \ +); \ + return c; \ } =20 -Fi3 (_selre, ".insn rrf, 0xB9F00000, %%r0, %%r3, %%r2, 8\n") -Fi3 (_selgrz, ".insn rrf, 0xB9E30000, %%r0, %%r3, %%r2, 8\n") -Fi3 (_selfhrnz, ".insn rrf, 0xB9C00000, %%r0, %%r3, %%r2, 7\n") +Fi3 (_selre, ".insn rrf, 0xB9F00000, %[c], %[b], %[a], 8\n") +Fi3 (_selgrz, ".insn rrf, 0xB9E30000, %[c], %[b], %[a], 8\n") +Fi3 (_selfhrnz, ".insn rrf, 0xB9C00000, %[c], %[b], %[a], 7\n") + =20 int main(int argc, char *argv[]) { uint64_t a =3D ~0, b =3D ~0, c =3D ~0; + a =3D _selre(0x066600000066ull, 0x066600000006ull, a); b =3D _selgrz(0xF00D00000005ull, 0xF00D00000055ull, b); c =3D _selfhrnz(0x043200000044ull, 0x065400000004ull, c); --=20 2.27.0 From nobody Sun May 19 04:05:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646678248; cv=none; d=zohomail.com; s=zohoarc; b=F7Cmuo1+uiGzr3rjGPQngd3nL0xwBnstaHaIQyVXhE5//UbF2+9Xxo3kYUJtyxXmNf95T5wHBj6F9GyAsikmVp8GKUBdr97cxBLehFyzIlqVooyWOTiJ4uof65JNw0Y87kg5hBM/ehCOQivMENmPPrMHqxY77LCE8agnJ3Ukpx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646678248; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0PtSvvELsCEN4a0Sm5Pk+aUEWaZSCWM7JHO//7dWdZA=; b=cIYEmNFj75rJQ1tAWQpptanGaS02nvyTVEKHmhgmwfRUquDDuvcx4+g22caCFfm7rbXSaUCBc2RYdUrZTpzK76oAX68wo5iRTp6f4Nh6mcRxmxxgHJGjWZ8mUbmH4B1b2UTSPT578oXY6RvFLEn967Jdq0HzMawz1rlYJq6hCxU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646678248700621.8692489653007; Mon, 7 Mar 2022 10:37:28 -0800 (PST) Received: from localhost ([::1]:48368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRIEZ-00036O-Nz for importer@patchew.org; Mon, 07 Mar 2022 13:37:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI42-00069K-8q for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53623) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI3x-0006tX-2L for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:30 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-270-t58sWT9hPQy2sHOa949_FQ-1; Mon, 07 Mar 2022 13:26:25 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 635751006AA6; Mon, 7 Mar 2022 18:26:24 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99840804DB; Mon, 7 Mar 2022 18:26:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646677588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0PtSvvELsCEN4a0Sm5Pk+aUEWaZSCWM7JHO//7dWdZA=; b=JcpMGlPGMoDYKllKl1D/dcbtIEi8LrABDhrPzNam62yVhrNZ3RsZ6Axir4QbUSwb2P/RJj yUKdQmD6aQj0CHsJLIikdtmnYVIt99wfDsmgmy/g2eD8B1wdZXrm11jyY76pNOL+5YG+FV rCEGsLVV0w3nIvQ0E7NtngvN59MszDs= X-MC-Unique: t58sWT9hPQy2sHOa949_FQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 4/7] MAINTAINERS: Update the files in the FreeBSD section Date: Mon, 7 Mar 2022 19:26:06 +0100 Message-Id: <20220307182609.94466-5-thuth@redhat.com> In-Reply-To: <20220307182609.94466-1-thuth@redhat.com> References: <20220307182609.94466-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646678249791100001 Content-Type: text/plain; charset="utf-8" The FreeBSD CI definitions now reside in other files than .cirrs.yml. Update the entry in MAINTAINERS accordingly. Message-Id: <20220217141138.917292-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 68adaac373..dd8ad5531b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3608,7 +3608,8 @@ FreeBSD Hosted Continuous Integration M: Ed Maste M: Li-Wen Hsu S: Maintained -F: .cirrus.yml +F: .gitlab-ci.d/cirrus/freebsd* +F: tests/vm/freebsd W: https://cirrus-ci.com/github/qemu/qemu =20 Windows Hosted Continuous Integration --=20 2.27.0 From nobody Sun May 19 04:05:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646678136; cv=none; d=zohomail.com; s=zohoarc; b=f1z3uuiabpOJqB8qudWzCmUFyEFgPRyfbhtibokjaOAfJmK/Aw3VCcJbZH/mH/UGIWDTVc5g4DU+lUU1SSBMunvtAFOlNeRoF3PwPtYnr02ay+CW30h3Aya0pO0o7gTkluOfp4AaLlyMUYJOum0E+aLunWw/ELpx7EYaZfm3cLw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646678136; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3XMaTsJ7o4sZ4rzQijJHTrmx1yhi5q7NI+Gf0YRP2Sk=; b=XwQAsm7F1RaZVeVhb3GXqqNN640jTJCH8xzqjOm4Pid7wBbj3D7LJ3nIiEYwOl988mKDgE0IvcS8bc/Q6RhhNO5C9AHFy3V+cHwmTo4GgzDRkiUm1xAgEuj3Th1mL5oXsN4Pxr2t44zzL7ft9o88i/Lq/2qCnO0XJ6VrxK3CmNM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646678136065279.3064209677417; Mon, 7 Mar 2022 10:35:36 -0800 (PST) Received: from localhost ([::1]:44300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRICl-0000Ma-0P for importer@patchew.org; Mon, 07 Mar 2022 13:35:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI46-0006HW-EB for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI44-0006uH-Oi for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:37 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-7-FJJJvceBOui2XjZravT4Vg-1; Mon, 07 Mar 2022 13:26:27 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 30A071091DA2; Mon, 7 Mar 2022 18:26:26 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA51C804DB; Mon, 7 Mar 2022 18:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646677596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3XMaTsJ7o4sZ4rzQijJHTrmx1yhi5q7NI+Gf0YRP2Sk=; b=bArZi6iR/+XJ2m/SyOZn6ZthtcglSfO3rnu9rna/5ZyntMQ3Xdlg+sfXjkakDQIQgG9zVi GNsIoymhqQXYMOv+mn+jXCJXmpzobcldVY5SNV2J7uA8MOseEHOgER3WMzNmrlzE/GQXUp Mpcy+Hz3reHeE1c0VGSW080N4AdPaFA= X-MC-Unique: FJJJvceBOui2XjZravT4Vg-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 5/7] tests/avocado: Cancel BootLinux tests in case there is no free port Date: Mon, 7 Mar 2022 19:26:07 +0100 Message-Id: <20220307182609.94466-6-thuth@redhat.com> In-Reply-To: <20220307182609.94466-1-thuth@redhat.com> References: <20220307182609.94466-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Beraldo Leal Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646678138223100001 Content-Type: text/plain; charset="utf-8" The BootLinux tests are currently failing with an ugly python stack trace on my RHEL8 system since they cannot get a free port (likely due to the firewall settings on my system). Let's properly check the return value of find_free_port() instead and cancel the test gracefully if it cannot get a free port. Message-Id: <20220228114325.818294-1-thuth@redhat.com> Reviewed-by: Beraldo Leal Signed-off-by: Thomas Huth --- tests/avocado/avocado_qemu/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index 75063c0c30..9b056b5ce5 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -603,6 +603,8 @@ def prepare_cloudinit(self, ssh_pubkey=3DNone): try: cloudinit_iso =3D os.path.join(self.workdir, 'cloudinit.iso') self.phone_home_port =3D network.find_free_port() + if not self.phone_home_port: + self.cancel('Failed to get a free port') pubkey_content =3D None if ssh_pubkey: with open(ssh_pubkey) as pubkey: --=20 2.27.0 From nobody Sun May 19 04:05:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646677768; cv=none; d=zohomail.com; s=zohoarc; b=jEi06Y3mrlL21Y7qEQg0fzNjhwanF1R0bIbPELPOl0ONI5LevqnyF7ZFr9mYe6dK6t2inYfaReMLJbfyeT9Iray65kCdLOfnu+GVBQLO13hQOC5CZWzkvbH4VmRk2w3YZ/6XjN+dQiwC7WtF74VzgO00itWKQxKAYDU0Ii+nlgA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646677768; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CZcRev6dak5jHn4OPlzNvAkuaUy+LlgU7RE/6Nbqav4=; b=LM9djrtgT2t/2EsQMkavRFjwoFyXVYeRBj+MPsyYj9KF5gWSndskVvIcU4ZEG5FD/98QWq7DhdkrbRWBWYzJyrJr3MmCtvl7kxUGLyIShDSBu9uHDN9LS8D8QIqov4QCX0iBRhF7kztzA6csjqhUaSOEl5nXBKujZISfmTJnYQM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646677768006787.8203194315363; Mon, 7 Mar 2022 10:29:28 -0800 (PST) Received: from localhost ([::1]:51528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRI6o-0002tr-TO for importer@patchew.org; Mon, 07 Mar 2022 13:29:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI4F-0006Nx-C6 for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:34549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI4C-0006vx-JU for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:47 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-27-9TKcNlz5OLqXVzXNYzPjiA-1; Mon, 07 Mar 2022 13:26:35 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96F5F801AEB; Mon, 7 Mar 2022 18:26:27 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D66880FCB; Mon, 7 Mar 2022 18:26:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646677604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CZcRev6dak5jHn4OPlzNvAkuaUy+LlgU7RE/6Nbqav4=; b=WXlDviQy8qhJLSpV3tj/uam+JEhVs7p6KDsiYr/Vc+vPdL6bXiltmJdij6okk7Rf2U8wQA 16ePB/WWkr5VIoIxLJSc8ntUmb+x60AL/urNL7P7K9DpJGye5jCwnFoPsPLBw0GusscuTp wvyViwq1nuWJ+lDn5CNgoqBO6Ym3/6A= X-MC-Unique: 9TKcNlz5OLqXVzXNYzPjiA-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 6/7] tests/vm: Update haiku test vm to R1/Beta3 Date: Mon, 7 Mar 2022 19:26:08 +0100 Message-Id: <20220307182609.94466-7-thuth@redhat.com> In-Reply-To: <20220307182609.94466-1-thuth@redhat.com> References: <20220307182609.94466-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Alexander von Gluck IV Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646677769244100001 Content-Type: text/plain; charset="utf-8" The old image did not have python3 yet, and thus was not usable for compiling QEMU anymore. Suggested-by: Alexander von Gluck IV Message-Id: <20220216154208.2985103-1-kallisti5@unixzen.com> Signed-off-by: Thomas Huth --- tests/vm/haiku.x86_64 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64 index 2eb736dae1..936f7d2ae2 100755 --- a/tests/vm/haiku.x86_64 +++ b/tests/vm/haiku.x86_64 @@ -2,7 +2,7 @@ # # Haiku VM image # -# Copyright 2020 Haiku, Inc. +# Copyright 2020-2022 Haiku, Inc. # # Authors: # Alexander von Gluck IV @@ -48,8 +48,8 @@ class HaikuVM(basevm.BaseVM): name =3D "haiku" arch =3D "x86_64" =20 - link =3D "https://app.vagrantup.com/haiku-os/boxes/r1beta2-x86_64/vers= ions/20200702/providers/libvirt.box" - csum =3D "41c38b316e0cbdbc66b5dbaf3612b866700a4f35807cb1eb266a5bf83e9e= 68d5" + link =3D "https://app.vagrantup.com/haiku-os/boxes/r1beta3-x86_64/vers= ions/20220216/providers/libvirt.box" + csum =3D "e67d4aacbcc687013d5cc91990ddd86cc5d70a5d28432ae2691944f8ce5d= 5041" =20 poweroff =3D "shutdown" =20 @@ -99,7 +99,7 @@ class HaikuVM(basevm.BaseVM): =20 self.print_step("Extracting disk image") =20 - subprocess.check_call(["tar", "xzf", tarball, "./box.img", "-O"], + subprocess.check_call(["tar", "xzf", tarball, "box.img", "-O"], stdout=3Dopen(img, 'wb')) =20 self.print_step("Preparing disk image") --=20 2.27.0 From nobody Sun May 19 04:05:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646678277121249.6055044154392; Mon, 7 Mar 2022 10:37:57 -0800 (PST) Received: from localhost ([::1]:50600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRIF2-0004kN-3e for importer@patchew.org; Mon, 07 Mar 2022 13:37:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI48-0006Hh-3E for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:49435) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRI46-0006vV-I1 for qemu-devel@nongnu.org; Mon, 07 Mar 2022 13:26:39 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-671-cGTF9ybcM52-_xi7OSq-xA-1; Mon, 07 Mar 2022 13:26:33 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3356D1006AA6; Mon, 7 Mar 2022 18:26:32 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE79B804DB; Mon, 7 Mar 2022 18:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646677598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vAnOCuWhHZY6WFFn20PyWOZAWbGK2n8S6dRJWDcL7oQ=; b=UB/C7Kk6g13unWEirH3VrrD86RBwMZPxpTxeEGmUBKBoBCiq4TJuX5n0cnf2INZ1XnYpDM OKqEAJA/Xz8Pyg71zr+4BOn7oXyZbkH4JwRHca2psbbNW81oCeNJOYTm7tWWT+HLjrNgKd HCMFX9Qm/ox/DL3kNLQ0GNRlLVu3ALA= X-MC-Unique: cGTF9ybcM52-_xi7OSq-xA-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PULL 7/7] Check and report for incomplete 'global' option format Date: Mon, 7 Mar 2022 19:26:09 +0100 Message-Id: <20220307182609.94466-8-thuth@redhat.com> In-Reply-To: <20220307182609.94466-1-thuth@redhat.com> References: <20220307182609.94466-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Markus Armbruster , Rohit Kumar Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1646678277927100001 Content-Type: text/plain; charset="utf-8" From: Rohit Kumar Qemu might crash when provided incomplete '-global' option. For example: qemu-system-x86_64 -global driver=3Disa-fdc qemu-system-x86_64: ../../devel/qemu/qapi/string-input-visitor.c:394: string_input_visitor_new: Assertion `str' failed. Aborted (core dumped) Fixes: 3751d7c43f795b ("vl: allow full-blown QemuOpts syntax for -global") Signed-off-by: Rohit Kumar Reviewed-by: Markus Armbruster Resolves: https://gitlab.com/qemu-project/qemu/-/issues/604 Message-Id: <20220216071508.412974-1-rohit.kumar3@nutanix.com> Signed-off-by: Thomas Huth --- softmmu/qdev-monitor.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index fe6cf268ff..12fe60c467 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -1038,6 +1038,13 @@ int qemu_global_option(const char *str) if (!opts) { return -1; } + if (!qemu_opt_get(opts, "driver") + || !qemu_opt_get(opts, "property") + || !qemu_opt_get(opts, "value")) { + error_report("options 'driver', 'property', and 'value'" + " are required"); + return -1; + } =20 return 0; } --=20 2.27.0