From nobody Tue Feb 10 00:27:43 2026 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=1672993796; cv=none; d=zohomail.com; s=zohoarc; b=MTt8PjrWNYpYaR1TKleVd7NhRKCL2iqEEsYtMPVmQ9q66RUApESgqwgoPPifIRhLOF9pJnPQm8ADB6jsOJ6PPUseR4ZYXlaYthEnMVcoQDcTNrsNh+kdKL7/VAAL5/bWbTGStZIa0xXIsPj0hMhYJ4snXCel1K4+hVUT4QRb4Ms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672993796; h=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=2MfUHQlCz0bSPAlpWoHfABJfI5Tzu0jF+H+zQMgn0k0=; b=LwJFj/IWblEZYXIOP+neGgiwIvg3g9LwWwQVfSbS4bq6Mc7FDE10irE6VcM2TGnMuOtBKNTc0cEwADV+/tfYcIyRhfzHs9R2SN43sRDjkL2BqPA2w0johC51n9kgTvJesQF0zR8uZvQFCJGTnKhfBXzPzSJRW029Aoo8FYL24Ek= 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 1672993796911386.36707426203213; Fri, 6 Jan 2023 00:29:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi69-0002XK-OM; Fri, 06 Jan 2023 03:29:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi64-0002WZ-3W for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi62-0005Uc-Lv for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:03 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-655-_L6FODc9OSaT5Nn2cQvpdQ-1; Fri, 06 Jan 2023 03:28:58 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 427B085CCE0; Fri, 6 Jan 2023 08:28:58 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F30F492B06; Fri, 6 Jan 2023 08:28:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2MfUHQlCz0bSPAlpWoHfABJfI5Tzu0jF+H+zQMgn0k0=; b=cgop4jzWUTQJP1TB26tzPWQDSGZl3alxxxkezubcuz/IUxxs3LCl5/90HPXUOO4k052Qqv oaBfh5GHMxUmgE6fQ+YRW6May8JEsxePElp1KEN0M6LPZkVmZIwccghH2wTqmkPSHwcOVq 0ZYr1eRK3WhABUwPCLpZZBrEM8wAfYI= X-MC-Unique: _L6FODc9OSaT5Nn2cQvpdQ-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 01/15] qemu-iotests/stream-under-throttle: do not shutdown QEMU Date: Fri, 6 Jan 2023 09:28:39 +0100 Message-Id: <20230106082853.31787-2-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672993797518100001 Content-Type: text/plain; charset="utf-8" From: Christian Borntraeger Without a kernel or boot disk a QEMU on s390 will exit (usually with a disabled wait state). This breaks the stream-under-throttle test case. Do not exit qemu if on s390. Signed-off-by: Christian Borntraeger Message-Id: <20221207131452.8455-1-borntraeger@linux.ibm.com> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/qemu-iotests/tests/stream-under-throttle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qemu-iotests/tests/stream-under-throttle b/tests/qemu-io= tests/tests/stream-under-throttle index 8d2d9e1684..c24dfbcaa2 100755 --- a/tests/qemu-iotests/tests/stream-under-throttle +++ b/tests/qemu-iotests/tests/stream-under-throttle @@ -88,6 +88,8 @@ class TestStreamWithThrottle(iotests.QMPTestCase): 'x-iops-total=3D10000,x-bps-total=3D104857600') self.vm.add_blockdev(self.vm.qmp_to_opts(blockdev)) self.vm.add_device('virtio-blk,iothread=3Diothr0,drive=3Dthrottled= -node') + if iotests.qemu_default_machine =3D=3D 's390-ccw-virtio': + self.vm.add_args('-no-shutdown') self.vm.launch() =20 def tearDown(self) -> None: --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672994968; cv=none; d=zohomail.com; s=zohoarc; b=ngwKFQrj4aqgOA+9AcLGHaYAo3A2XvGlgdFoOMj3flb7gdMati7QdAlLeTHwfKFPAaNlL0gtiBu71l4te5Auh6hAj6+dBkyWq8tEUgYY7mM1kmTeyuxFS/nYkH/qc4JkqLR8iSatzKkf8Vvgyrj819AVKgow9A+wgi/+qcNc4KI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672994968; 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=uOu604Z5UFAJTAsQ53c878BA+fal4cCtG/JMpcQgNcs=; b=Z64EDyuwM6gDWK9kb7Qs8R6zZATvMMUc/Q2RWMgokujeBZF4FoZo65GqFyoXkZdq74ZD4U+30YbDJF52D7fb7e/LjhqU6HaWgzDiqmC9p+4BeAf5kJx2Cs5lOg+sUNBne8igOZsov8UU3A8zZfrgSG3x6HbezeAXI29EQc56vng= 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 1672994968124488.92889111951365; Fri, 6 Jan 2023 00:49:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi6C-0002ZE-SX; Fri, 06 Jan 2023 03:29:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi63-0002WD-HD for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi62-0005US-1E for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:03 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-557-tQfkrrY2O6iXtcoRpeWvuw-1; Fri, 06 Jan 2023 03:29:00 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AFE63101A52E; Fri, 6 Jan 2023 08:28:59 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91492492B06; Fri, 6 Jan 2023 08:28:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993741; 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=uOu604Z5UFAJTAsQ53c878BA+fal4cCtG/JMpcQgNcs=; b=GY++GEBOS4ABmlSX9ZeOj9I3RHLgi3yDIMlWrby7rROJ4Nc4i4vEkGchNTvFqdItz+KpRE esV2YtydT93u2kO/C8OZ5BEw1+qL2q5tFNiQ43oLW6f7+nGPGpSdMH1WW4Y+3nk06DcEyG VBd9QmmePtum3ZO7qadIt9bfYkZX2To= X-MC-Unique: tQfkrrY2O6iXtcoRpeWvuw-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 02/15] tests/vm: Update get_default_jobs() to work on non-x86_64 non-KVM hosts Date: Fri, 6 Jan 2023 09:28:40 +0100 Message-Id: <20230106082853.31787-3-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672994968605100001 From: Philippe Mathieu-Daud=C3=A9 On non-x86_64 host, if KVM is not available we get: Traceback (most recent call last): File "tests/vm/basevm.py", line 634, in main vm =3D vmcls(args, config=3Dconfig) File "tests/vm/basevm.py", line 104, in __init__ mem =3D max(4, args.jobs) TypeError: '>' not supported between instances of 'NoneType' and 'int' Fix by always returning a -- not ideal but safe -- '1' value. Fixes: b09539444a ("tests/vm: allow us to take advantage of MTTCG") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20221209164743.70836-1-philmd@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/vm/basevm.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 2276364c42..23229e23d1 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -569,8 +569,7 @@ def get_default_jobs(): # more cores. but only up to a reasonable limit. User # can always override these limits with --jobs. return min(multiprocessing.cpu_count() // 2, 8) - else: - return 1 + return 1 =20 parser =3D argparse.ArgumentParser( formatter_class=3Dargparse.ArgumentDefaultsHelpFormatter, --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672994572; cv=none; d=zohomail.com; s=zohoarc; b=IHSv6J0yFQlxVM8bQzy8lREaO6EwevRrm+9/TD4doS1OT2RhiWTWw+QNWeKki9YnCAx2UQVwVAMdfZONnPA6uYOL/I4OIDjqu40bggOp0ZJRUvGEoH5x5xsGRcYYsDPrEpMIdIrep+4VgrAGlkfRGjQN8nXaOBBthtjgIItfelI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672994572; 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=SPBEgQmIar9accHOpRQgY7Fs36jr7yUGc9yh00l1nbs=; b=iFokYpDkcoHNHXoXhLgB/zURnrCG7PkmkOPeBiGd77pSNeGcWD/xrDmmtepu5kVekhSGVC2RM01Mx15yyCSIby/kbxFZkVgGc+WL80Bj+ghGTwJeNp6VhUuUggKX0fK58pbj8pkm5H/4hPTdxDbMXk3Gjq3CnXJurcEplD/YfJg= 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 1672994572193195.93895942507743; Fri, 6 Jan 2023 00:42:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi6H-0002b8-3c; Fri, 06 Jan 2023 03:29:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6D-0002Zc-BP for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6B-0005WA-S7 for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:13 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-397-CcLUDTLdM42wdPkmRQCcsA-1; Fri, 06 Jan 2023 03:29:01 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 10D1F3C0219D; Fri, 6 Jan 2023 08:29:01 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06B9A492B06; Fri, 6 Jan 2023 08:28:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993751; 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=SPBEgQmIar9accHOpRQgY7Fs36jr7yUGc9yh00l1nbs=; b=dRLWlmEBw95+yRdMMPj2cxS3rdvRlqEVnQLuK4hKW8VlQ4MdOJfvJ5hs5dnzt4C9Hb2tck JwSxWJ8yPh621Bpn7qxHxQ/GWv2E+kx+7WkQBn+b/x0/v3FDmZ/1oHuqUTWgoC8FIU/FSk oe+MqAUWVvpuMcL6vWCsv/IXXCTGO5E= X-MC-Unique: CcLUDTLdM42wdPkmRQCcsA-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 03/15] MAINTAINERS: Add MIPS-related docs and configs to the MIPS architecture section Date: Fri, 6 Jan 2023 09:28:41 +0100 Message-Id: <20230106082853.31787-4-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672994572745100001 docs/system/target-mips.rst and configs/targets/mips* are not covered in our MAINTAINERS file yet, so let's add them now. Message-Id: <20221212171252.194864-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 7a40d4d865..5606e5dbd2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -113,6 +113,8 @@ M: Philippe Mathieu-Daud=C3=A9 R: Jiaxun Yang S: Odd Fixes K: ^Subject:.*(?i)mips +F: docs/system/target-mips.rst +F: configs/targets/mips* =20 Guest CPU cores (TCG) --------------------- --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672994041; cv=none; d=zohomail.com; s=zohoarc; b=hmMUuT1Ck8zhlyudUwLsUkvDKc00+kcm8H7Oi9mzYCrb3uwNbUkPbxA77nv1WrXfjiU9rxSRG8BeNzpxmuFaAirsMGhZChSzdDq2JM0eIZnM2qOCcKNx0Vc3c0wzNCAM0lOkoYCuVRjbuvHkbHgtj3cmOZIHgnJ9uYLhqmrK9TU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672994041; 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=Xl/kPsma4+CokXD027GgAKWxG1Cp4Q3btDYha9T9ayI=; b=h8VgBhDxKiQYrrRu6xrg4yu0yKqctcirhXnEDj73uZIkSFF5aiSg2Peomf7kZXn1j7YF98PUEjZvDtPLSIWju+6xug/nrXjafIKwBjPnVUPxNp54w1Za+IQTZRZ70wqET91EYEpvPVgj8S3kVmWLbDE7vwxddRVPAUQPffQFZwo= 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 1672994041640438.2126037930934; Fri, 6 Jan 2023 00:34:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi68-0002XC-O2; Fri, 06 Jan 2023 03:29:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi67-0002X0-60 for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi65-0005VB-Fl for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:06 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-475-abkVrsUKMc-LIQeczTJrTQ-1; Fri, 06 Jan 2023 03:29:02 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B0C9183B3C8; Fri, 6 Jan 2023 08:29:02 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71357492B06; Fri, 6 Jan 2023 08:29:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993744; 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=Xl/kPsma4+CokXD027GgAKWxG1Cp4Q3btDYha9T9ayI=; b=YdjABc7uQ8x9lJR7aShyNC6mLBp4dGds9YoC/AYI9Hdh5406l5MHOeLo68YKkOUaghnGnS V3p3FkPyspyWHA3/O4ILdedUM0MDfdZAdFGXdgoDwtoqhP5ODxouAdmYZqHyk+zXmkNwfn HqzLikdx40yB87E/mwazaaRXDXsriJk= X-MC-Unique: abkVrsUKMc-LIQeczTJrTQ-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 04/15] exec/memory: Expose memory_region_access_valid() Date: Fri, 6 Jan 2023 09:28:42 +0100 Message-Id: <20230106082853.31787-5-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672994042899100005 From: Philippe Mathieu-Daud=C3=A9 Instead of having hardware device poking into memory internal API, expose memory_region_access_valid(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20221217152454.96388-2-philmd@linaro.org> Reviewed-by: Eric Farman Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- include/exec/memory-internal.h | 4 ---- include/exec/memory.h | 4 ++++ hw/s390x/s390-pci-inst.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 9fcc2af25c..100c1237ac 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -38,10 +38,6 @@ void flatview_unref(FlatView *view); =20 extern const MemoryRegionOps unassigned_mem_ops; =20 -bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr, - unsigned size, bool is_write, - MemTxAttrs attrs); - void flatview_add_to_dispatch(FlatView *fv, MemoryRegionSection *section); AddressSpaceDispatch *address_space_dispatch_new(FlatView *fv); void address_space_dispatch_compact(AddressSpaceDispatch *d); diff --git a/include/exec/memory.h b/include/exec/memory.h index 91f8a2395a..c37ffdbcd1 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2442,6 +2442,10 @@ void memory_global_dirty_log_stop(unsigned int flags= ); =20 void mtree_info(bool flatview, bool dispatch_tree, bool owner, bool disabl= ed); =20 +bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr, + unsigned size, bool is_write, + MemTxAttrs attrs); + /** * memory_region_dispatch_read: perform a read directly to the specified * MemoryRegion. diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 9abe95130c..2eee5db7e1 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -13,7 +13,7 @@ =20 #include "qemu/osdep.h" #include "exec/memop.h" -#include "exec/memory-internal.h" +#include "exec/memory.h" #include "qemu/error-report.h" #include "sysemu/hw_accel.h" #include "hw/s390x/s390-pci-inst.h" --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672993774; cv=none; d=zohomail.com; s=zohoarc; b=E8zMVWgglFcaewbKgbxGL/8xciwn4JCZlg4zlPlKN/J+0mCSoPkmCNKzOb/jCPwB4sc4fX74uGYQJh9tDTCyyO76dFru0729aKAX2J16I0vskHjelr25ovoYZxPEOWA8W2PGDFntihD+KkUNloS5MtrY8Yi5OTk3UFUUQuaCDh4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672993774; 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=YECT37xFnoENI7l6yJNtVYwVr86adRzuuOKbFfDnvY8=; b=jPj+Qy/BCVvPwswCqCJOrnse3NDjIV4MG04FNVd4zmKptl1H3htLZ/MKvafZlVyjB5sEvGZ6nVmJdJgjEbWXL8S2ipim8z3X/Uj28PwKC2gh+KPM1TXnEdGCQ2i09so7tJKzI0ue6m9vigGe0bXSExNihO92zOA6CirDm+o4jgA= 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 1672993774844775.242661102984; Fri, 6 Jan 2023 00:29:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi6B-0002Z1-I6; Fri, 06 Jan 2023 03:29:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi69-0002Xj-Na for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi68-0005VX-7P for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:09 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-615-KHWM2W1JO2OpKPFe7uJvuw-1; Fri, 06 Jan 2023 03:29:04 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 22FA8101A52E; Fri, 6 Jan 2023 08:29:04 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2434492B06; Fri, 6 Jan 2023 08:29:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993747; 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=YECT37xFnoENI7l6yJNtVYwVr86adRzuuOKbFfDnvY8=; b=G42y6+JM2RZtc5Iwr9tD1Cpd+U8liZLZjPXGFpA/sgu9QHjK1+ysIgjK1TnR0bQpaOo6bj ZUjpfIzIwVnyKiit0kGw+ok1/bFH2W34+rGV7Ajq51hkKJhz1fq1TFb23hiq8MGC6KtmBC B9CEN+CokwOt0bu+cyfdkvhjHC0TGys= X-MC-Unique: KHWM2W1JO2OpKPFe7uJvuw-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 05/15] hw/s390x/pv: Restrict Protected Virtualization to sysemu Date: Fri, 6 Jan 2023 09:28:43 +0100 Message-Id: <20230106082853.31787-6-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672993775765100001 From: Philippe Mathieu-Daud=C3=A9 Protected Virtualization is irrelevant in user emulation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20221217152454.96388-4-philmd@linaro.org> Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- target/s390x/cpu_features.c | 4 ++++ target/s390x/cpu_models.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c index 5528acd082..2e4e11d264 100644 --- a/target/s390x/cpu_features.c +++ b/target/s390x/cpu_features.c @@ -14,7 +14,9 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "cpu_features.h" +#ifndef CONFIG_USER_ONLY #include "hw/s390x/pv.h" +#endif =20 #define DEF_FEAT(_FEAT, _NAME, _TYPE, _BIT, _DESC) \ [S390_FEAT_##_FEAT] =3D { \ @@ -107,6 +109,7 @@ void s390_fill_feat_block(const S390FeatBitmap features= , S390FeatType type, feat =3D find_next_bit(features, S390_FEAT_MAX, feat + 1); } =20 +#ifndef CONFIG_USER_ONLY if (!s390_is_pv()) { return; } @@ -147,6 +150,7 @@ void s390_fill_feat_block(const S390FeatBitmap features= , S390FeatType type, default: return; } +#endif } =20 void s390_add_from_feat_block(S390FeatBitmap features, S390FeatType type, diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index c3a4f80633..065ec6d66c 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -23,8 +23,8 @@ #include "qemu/qemu-print.h" #ifndef CONFIG_USER_ONLY #include "sysemu/sysemu.h" -#endif #include "hw/s390x/pv.h" +#endif =20 #define CPUDEF_INIT(_type, _gen, _ec_ga, _mha_pow, _hmfai, _name, _desc) \ { \ @@ -236,6 +236,7 @@ bool s390_has_feat(S390Feat feat) return 0; } =20 +#ifndef CONFIG_USER_ONLY if (s390_is_pv()) { switch (feat) { case S390_FEAT_DIAG_318: @@ -259,6 +260,7 @@ bool s390_has_feat(S390Feat feat) break; } } +#endif return test_bit(feat, cpu->model->features); } =20 --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672994503; cv=none; d=zohomail.com; s=zohoarc; b=eqD1Y9pQ8pIeDI9KfO5xjZ4pmBGHAv3o83xsBAaWAgirqRu2FePMDXPvOMHbWdPgEEtJZpEtlmuja+qFH17SOvYPgLYa+TTnp9DohqlXeGQbMlYPZSa8Pbcf81lgJYFHX7LKQR/43Pm0q8E7ArqLSLkfDZ92Yyotz5yCvnNb+tg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672994503; 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=XvopRvA2Ire6tw68tl0QZAL+5rm/yyv2GuLTv6UHOLU=; b=Xht9vIO4a5ckcEHUZEa9rV0ypzCRH+hFHd0ztUUHEtuX1T583Eb/ysqREu7HkssaGqtoGJvbFC2TZ9EYbBqZuxdxd0Wnlf7EZg1p50K+xbEGzJeLp9IdXNBasBSXzD0ttu1StHFIaGQYMWUK5luMU1ns3Khbj5jiTOMB7OR1gO0= 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 1672994503375822.4342572448024; Fri, 6 Jan 2023 00:41:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi6C-0002ZI-TH; Fri, 06 Jan 2023 03:29:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6A-0002YU-NK for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi69-0005Vc-AK for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:10 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-622-s4tOCdAAN62t-CPW4VO1rA-1; Fri, 06 Jan 2023 03:29:05 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 383981C05141; Fri, 6 Jan 2023 08:29:05 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76724492B06; Fri, 6 Jan 2023 08:29:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993748; 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=XvopRvA2Ire6tw68tl0QZAL+5rm/yyv2GuLTv6UHOLU=; b=LGQk8NUsjMH8FhWziSYSaYtvJ0Jh3QAM86wL654voVB3rakq7URUOK6tMdE/9lYGXuzAlm aKDI9QFhUCe5b9EJ5R1pPl17u2sTiJudIf+S1U6jV+rb6imjBEaY8xbxFlwcPuIaJtYN4L oFgFZnCOv/4h7SQ5TyrhprciDVPDyzE= X-MC-Unique: s4tOCdAAN62t-CPW4VO1rA-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 06/15] target/s390x/tcg/misc_helper: Remove unused "memory.h" include Date: Fri, 6 Jan 2023 09:28:44 +0100 Message-Id: <20230106082853.31787-7-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_SPACE_RATIO=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672994504545100001 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20221217152454.96388-5-philmd@linaro.org> Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- target/s390x/tcg/misc_helper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c index 71388a7119..576157b1f3 100644 --- a/target/s390x/tcg/misc_helper.c +++ b/target/s390x/tcg/misc_helper.c @@ -23,7 +23,6 @@ #include "qemu/main-loop.h" #include "cpu.h" #include "s390x-internal.h" -#include "exec/memory.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "qemu/timer.h" --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672994549; cv=none; d=zohomail.com; s=zohoarc; b=jpCBt9zretHMFjodDMzEi3ZK3BbDsyqatuOHHx5W/r5YPcksJt6+on/ir3JDkv74mkpvDvCUvGbz/TQKmAw8BGN1HFWKXQmVBVl6OCQ9i9Yq5Qgli7q9XXUti/W5LVDSXGvtsQCSxg0njkum/5TtkHFmf+5y1R4paPjIlt4avc4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672994549; 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=AwB4aiB09gx95VbzFzeO2ug7F4610xROqTdQI7f4w6U=; b=BQC/rxqaFkWfNiazr+YosHfPxrQEbcQh0xuRNmH5MLFAUpXR2QHm4hy5V4ldZTOKcRFKkIvb9nVXW22Fly4pdGp9W2WO7Fo9UO2iETVHhfUguLPK/ZKA7HHtOAqvpTg2YqGZl8IgGS19YYbd+zwSusAJI+EJdX0ZLU+uhRFibKE= 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 1672994549975775.8835746405102; Fri, 6 Jan 2023 00:42:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi6D-0002aJ-WB; Fri, 06 Jan 2023 03:29:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6A-0002YW-RT for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi69-0005Vb-EP for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:10 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-90-gWVs1xClOvG2LEUxTL4dFw-1; Fri, 06 Jan 2023 03:29:07 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C53951C05141; Fri, 6 Jan 2023 08:29:06 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id A75E7492B06; Fri, 6 Jan 2023 08:29:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993748; 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=AwB4aiB09gx95VbzFzeO2ug7F4610xROqTdQI7f4w6U=; b=hq6pc1iBb2iNWyOdm05/Xo7xBu+lof2rJPnghktV5n/j+ZlhkTS9Wp3XCB1ys0J9DQ3ERe Cx5o+jhcx/6SJw3p4Cu1vliTo2pFmRqYaRRYIuw0EJihKpyuukoopyzXsxYEdWQtqcuRNw MkUH61lTKCfyq78r6/foE40IsckLEvE= X-MC-Unique: gWVs1xClOvG2LEUxTL4dFw-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 07/15] target/s390x/tcg/excp_helper: Restrict system headers to sysemu Date: Fri, 6 Jan 2023 09:28:45 +0100 Message-Id: <20230106082853.31787-8-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672994550560100001 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20221217152454.96388-6-philmd@linaro.org> Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- target/s390x/tcg/excp_helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c index fe02d82201..bc767f0443 100644 --- a/target/s390x/tcg/excp_helper.c +++ b/target/s390x/tcg/excp_helper.c @@ -21,15 +21,15 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" -#include "s390x-internal.h" #include "exec/helper-proto.h" -#include "qemu/timer.h" #include "exec/exec-all.h" #include "exec/cpu_ldst.h" -#include "hw/s390x/ioinst.h" -#include "exec/address-spaces.h" +#include "s390x-internal.h" #include "tcg_s390x.h" #ifndef CONFIG_USER_ONLY +#include "qemu/timer.h" +#include "exec/address-spaces.h" +#include "hw/s390x/ioinst.h" #include "hw/s390x/s390_flic.h" #include "hw/boards.h" #endif --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672994939; cv=none; d=zohomail.com; s=zohoarc; b=Vn4gJvBla6UDntXCIbfYlghdATE+KfAA4p6DiCXp5xzWFEqm8TWcj7q3zk/AJ2GEsezuqKi5TufPQp2WlPcDEZVno7LK/6NEMbUJQjEkU+VZbg5NVudPCmDBXYPfkrEhvb/7hILyJtQlpQOzqk9cDBaktaveOOEJY6djD2VD1ZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672994939; 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=5rN5prbiwNVkagky0f0m4bmXXLWIfA30meh3PusUxRo=; b=LA4mHi26Sq/RsvME/TfeBiUt6K/1QIimVaqOiR/+ZQrkD58XwVLlryEjZmNY7Mh5QMqPSxAttGG1yCoSLDRIIaZFDjmSsGOXCPOoYx0f+mnyGMpVAp9AU+RPGCsBQfhuxlTMn534ztt1lZyEHV3SuZQ98Dgmt0hC670ZiuSiHvM= 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 1672994939785875.3101392656808; Fri, 6 Jan 2023 00:48:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi6E-0002aQ-No; Fri, 06 Jan 2023 03:29:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6C-0002ZA-Bp for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6A-0005Vw-RE for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:12 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-636-xOi0dPlUNeiwaX3S54cT1w-1; Fri, 06 Jan 2023 03:29:08 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 22263101A521; Fri, 6 Jan 2023 08:29:08 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F9D9492B06; Fri, 6 Jan 2023 08:29:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993750; 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=5rN5prbiwNVkagky0f0m4bmXXLWIfA30meh3PusUxRo=; b=Ubaoqm6133cPrk2ENGln906dChB4NY8E9ZGgjd+L+DTls8KVFFS49OgoLsQLP223soHeVy ar3oqwxqpb7TUfQj6SWPWe/d8M8JUTXPB/91krDOdt4NyMPDiO6FB1SHyigun7gsb0sEWj 2wlsSbhovGjVdaRR6BWx3mdhcWJbbcg= X-MC-Unique: xOi0dPlUNeiwaX3S54cT1w-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 08/15] target/s390x: Restrict sysemu/reset.h to system emulation Date: Fri, 6 Jan 2023 09:28:46 +0100 Message-Id: <20230106082853.31787-9-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672994942119100001 From: Philippe Mathieu-Daud=C3=A9 In user emulation, threads -- implemented as CPU -- are created/destroyed, but never reset. There is no point in allowing the user emulation access the sysemu/reset API. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20221220145625.26392-5-philmd@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- target/s390x/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 96562c516d..b10a8541ff 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -26,7 +26,6 @@ #include "s390x-internal.h" #include "kvm/kvm_s390x.h" #include "sysemu/kvm.h" -#include "sysemu/reset.h" #include "qemu/module.h" #include "trace.h" #include "qapi/qapi-types-machine.h" @@ -35,6 +34,9 @@ #include "fpu/softfloat-helpers.h" #include "disas/capstone.h" #include "sysemu/tcg.h" +#ifndef CONFIG_USER_ONLY +#include "sysemu/reset.h" +#endif =20 #define CR0_RESET 0xE0UL #define CR14_RESET 0xC2000000UL; --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672994040; cv=none; d=zohomail.com; s=zohoarc; b=WFfwe/ljn4DvE4z3j7nYWvcuVd9tSoFZaxGT5O+W0xhXIcLgGrUg5YGe9TWt2fnTsEiurkckH57bVQpDh20EX/7/ijbDL6X1b3MOEElxa3RUhRd9W4sybtOn1UQ83n+BoGGxdPO+pt43wbZ52BSxnpq+/bnVU6x8W1na7wGMt20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672994040; 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=3QeCZ3ENrtQYVvtDC7lxgJ9ejVp1dAjaS4G+x5M2b2U=; b=e/wxfBDgQUU8+z7iw/oxccG6tVTeA4cWGeKs7Zy5uuiNhG1b19rjfQTeUPaALZc3BD5fDbNqZTNSOg+PusrOpwMh0Ctc2o6Az8SisEIkAnnLRgKhzh4OzvfOmGgaarQw9AGG0sZGr8LOFkKOBul21o9X4rvtfwHdCj7z1lUcr1w= 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 16729940400921020.1187562972827; Fri, 6 Jan 2023 00:34:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi6F-0002ae-Bu; Fri, 06 Jan 2023 03:29:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6D-0002Zu-Hp for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6C-0005WC-6H for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:13 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-156-xIvcY-GpMeKYkz50iwJQJw-1; Fri, 06 Jan 2023 03:29:09 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8AFCB183B3C0; Fri, 6 Jan 2023 08:29:09 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82357492B06; Fri, 6 Jan 2023 08:29:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993751; 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=3QeCZ3ENrtQYVvtDC7lxgJ9ejVp1dAjaS4G+x5M2b2U=; b=B6F+pmbJGD7mk8hm27V6Tnp7j1IdGrbPcGzeQu5lSoUi35PJHeHHcQSxrIZu8tslonME20 EcqDAtlP+eAm7F+4TTa4nhK2LTo5JLVG6k8yA7/nTK3r4ac6qzW1j6mDDdbOfor/Jd/Cp/ H8bgd16M9RG8aEP+Qv3M6q2Wr8AGKRw= X-MC-Unique: xIvcY-GpMeKYkz50iwJQJw-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 09/15] tests/readconfig: spice doesn't support unix socket on windows yet Date: Fri, 6 Jan 2023 09:28:47 +0100 Message-Id: <20230106082853.31787-10-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672994041020100001 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20230103110814.3726795-6-marcandre.lureau@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/qtest/readconfig-test.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/qtest/readconfig-test.c b/tests/qtest/readconfig-test.c index c7a9b0c7dd..9ef870643d 100644 --- a/tests/qtest/readconfig-test.c +++ b/tests/qtest/readconfig-test.c @@ -109,8 +109,10 @@ static void test_spice(void) QTestState *qts; const char *cfgdata =3D "[spice]\n" - "disable-ticketing =3D \"on\"\n" - "unix =3D \"on\"\n"; +#ifndef WIN32 + "unix =3D \"on\"\n" +#endif + "disable-ticketing =3D \"on\"\n"; =20 qts =3D qtest_init_with_config(cfgdata); /* Test valid command */ --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672993896; cv=none; d=zohomail.com; s=zohoarc; b=du7eVThPWUXl6LuspQ4xEj0PLZOPDZ+toi4HxjGUG5LxYWNzeSZqVhbkrxiEOS5JGxgpqYOAzr/Ht4B2brS/I7e5N/I7waoFV5HiHcQX66VdH5huMixEDql1aKDUysaoThkolvJvseFS4ZxnU6reVVCadSc1Ns6rzkfk0S+bDc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672993896; 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=aqLP5gaf6pnthmni5Wz7RqNUWX0Yh9zj4McsYzHy9r0=; b=Md5OFSaYdS0FV9GzXi7i//IVeyIMArObl55K+JoNfcGWZNLSPjk0nwCELD5xINpVj5OovzzuxSHO+0ssCGE8ywONc75DG0rO/TBv1H9W0vZ3Iou10Q9Zp4eDcjSUoEXKRENQ9LrtxDUtg3ewVRkpH7bihwd+mbXU5BR2ZUU4NnU= 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 1672993896678934.7995695999224; Fri, 6 Jan 2023 00:31:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi6J-0002bs-B6; Fri, 06 Jan 2023 03:29:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6G-0002bE-VM for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6F-0005Wf-ET for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:16 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-231-Cp9H_u3nOW6MnJ3xP64W0w-1; Fri, 06 Jan 2023 03:29:11 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 00DAC802C1D; Fri, 6 Jan 2023 08:29:11 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA418492B06; Fri, 6 Jan 2023 08:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993754; 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=aqLP5gaf6pnthmni5Wz7RqNUWX0Yh9zj4McsYzHy9r0=; b=MJIatO/RiTBUnwvDokSWFWnYT5HOFyqBgm2c7G4ezeIYDaXvw4VlGLc39Oj7oVJqMIw4DV UJLAIl90cE9wKYFcnw24SIq+viPeEST2fye8QWOGed35aYcmDK5XjQTi62CwbJe5/oPlNe 60TKwT/KxtuDuaZ9ryImJs59dVA8tGA= X-MC-Unique: Cp9H_u3nOW6MnJ3xP64W0w-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 10/15] i386: Deprecate the -no-hpet QEMU command line option Date: Fri, 6 Jan 2023 09:28:48 +0100 Message-Id: <20230106082853.31787-11-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672993898164100003 The HPET setting has been turned into a machine property a while ago already, so we should finally do the next step and deprecate the legacy CLI option, too. Message-Id: <20221229114913.260400-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: J=C3=A1n Tomko Signed-off-by: Thomas Huth --- docs/about/deprecated.rst | 6 ++++++ softmmu/vl.c | 1 + qemu-options.hx | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 93affe3669..2ae6a79b21 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -114,6 +114,12 @@ form is preferred. Using ``-drive if=3Dnone`` to configure the OTP device of the sifive_u RISC-V machine is deprecated. Use ``-drive if=3Dpflash`` instead. =20 +``-no-hpet`` (since 8.0) +'''''''''''''''''''''''' + +The HPET setting has been turned into a machine property. +Use ``-machine hpet=3Doff`` instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/softmmu/vl.c b/softmmu/vl.c index 798e1dc933..9bd0e52d01 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3259,6 +3259,7 @@ void qemu_init(int argc, char **argv) qdict_put_str(machine_opts_dict, "acpi", "off"); break; case QEMU_OPTION_no_hpet: + warn_report("-no-hpet is deprecated, use '-machine hpet=3D= off' instead"); qdict_put_str(machine_opts_dict, "hpet", "off"); break; case QEMU_OPTION_no_reboot: diff --git a/qemu-options.hx b/qemu-options.hx index 7f99d15b23..a3adb4163e 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2542,7 +2542,7 @@ DEF("no-hpet", 0, QEMU_OPTION_no_hpet, "-no-hpet disable HPET\n", QEMU_ARCH_I386) SRST ``-no-hpet`` - Disable HPET support. + Disable HPET support. Deprecated, use '-machine hpet=3Doff' instead. ERST =20 DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable, --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672995493; cv=none; d=zohomail.com; s=zohoarc; b=VH4zYlidm+02lm75dyzAJ7NkbyRwy+60WOzVlpQkyh/BM7OjmEsU7WeY6U37hqlHFtV6kek4MFXHv+Rspshm5qjlde0rqVIE+H26vlObCpbULpvDBUaeE+ERaWs6sE5Aut/kwW5/1a5JqfsmOv3rTY5tvp41RvLCIOMrPSnkqVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672995493; h=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=dHouzLz+WV4JbJYjIa3QDtC7Ar86yf/WZ2r+DJniaTE=; b=LRK57IIJudF8mLhHwG7NSSGPRhFY6OVct+g2GOR8x1myiRCW6a0N2zRMvSYH8zxKRmnznwshHjh/PKxG90Z1NMJsALvHsbmGZfBgB/0tU0IkFH6mqW9kTAojhr238zHpFatrtNKTFyQ9vdSLybhTyzwKlCAGINWBBASfbpm/q1s= 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 1672995493875286.70438975425157; Fri, 6 Jan 2023 00:58:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi6X-0002e6-54; Fri, 06 Jan 2023 03:29:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6O-0002cK-7k for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6M-0005XW-BS for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:23 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-527-BKY40OpjNiS-1Z9zvXiyBg-1; Fri, 06 Jan 2023 03:29:12 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6CEFB85A588; Fri, 6 Jan 2023 08:29:12 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61916492B06; Fri, 6 Jan 2023 08:29:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dHouzLz+WV4JbJYjIa3QDtC7Ar86yf/WZ2r+DJniaTE=; b=iGy6vPQrncH5x2xUW399Kjw2i3QZLObhWz6nt2OibE1VuSJuRP8cB4Gib6JCeLb6//ItGZ nSb0Zs/GW2KFVc3YoaP5gvH47vSOwkqG9Hygk5dS3iCGWGVoXCSrzlJtiJJkkIzGD3Kt7X NH+fecnl7RnOh4osb+qwz/JGWLgQR1Q= X-MC-Unique: BKY40OpjNiS-1Z9zvXiyBg-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 11/15] docs/interop: Change the vnc-ledstate-Pseudo-encoding doc into .rst Date: Fri, 6 Jan 2023 09:28:49 +0100 Message-Id: <20230106082853.31787-12-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672995495333100003 Content-Type: text/plain; charset="utf-8" The file seems to contain perfectly valid rst syntax already, so rename it to .rst and wire it up in the index. Message-Id: <20221213101806.46640-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- docs/interop/index.rst | 1 + ...tate-Pseudo-encoding.txt =3D> vnc-ledstate-pseudo-encoding.rst} | 0 2 files changed, 1 insertion(+) rename docs/interop/{vnc-ledstate-Pseudo-encoding.txt =3D> vnc-ledstate-ps= eudo-encoding.rst} (100%) diff --git a/docs/interop/index.rst b/docs/interop/index.rst index b7632acb7b..6351ff9ba6 100644 --- a/docs/interop/index.rst +++ b/docs/interop/index.rst @@ -23,3 +23,4 @@ are useful for making QEMU interoperate with other softwa= re. vhost-user-gpu vhost-vdpa virtio-balloon-stats + vnc-ledstate-pseudo-encoding diff --git a/docs/interop/vnc-ledstate-Pseudo-encoding.txt b/docs/interop/v= nc-ledstate-pseudo-encoding.rst similarity index 100% rename from docs/interop/vnc-ledstate-Pseudo-encoding.txt rename to docs/interop/vnc-ledstate-pseudo-encoding.rst --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672995475; cv=none; d=zohomail.com; s=zohoarc; b=ILxp9Sg9+4gtc1dFwK/G+Vd+66iX95T9dOSbFAilNhzub7qwpcwhBE6+wk8HsqqszDAp/f1qQHD7OkLbK180y2+X6zZH0/LHG2eja8U3/Lbycbcpos/rtGQJIzVOXTM57qMrJvrVF5vFVzzSzWlez57pZ8N+w1ML6nqNq5KShxE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672995475; h=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=Ah0xNb6XBNsTuNA7BAcqy4DPeJMVq26yuw5U7Zys/Q8=; b=knpaaw3sNoh3uvd/5Ycj7kuUoFU8ixX1Gcp5QY3cRurwhIbsJv/FjeEEMWHkDQY9NxR57dUoMaIqos+d6uzLmM+2+gVNKPSurFrizyByJwFUSwDh5pbj0hpWU13YHN0ENKguJ3ZD/iYQ070KqY1wOup3tMmyTahQOagvhdl5gu0= 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 1672995475836110.92179716112003; Fri, 6 Jan 2023 00:57:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi6X-0002eC-An; Fri, 06 Jan 2023 03:29:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6Q-0002ce-Pr for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6M-0005Xe-TX for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:25 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-628-s3cFLAyTMKinpXhD3a-SzA-1; Fri, 06 Jan 2023 03:29:14 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D75FB3C0219E; Fri, 6 Jan 2023 08:29:13 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA83D492B06; Fri, 6 Jan 2023 08:29:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ah0xNb6XBNsTuNA7BAcqy4DPeJMVq26yuw5U7Zys/Q8=; b=iCP5goMr9MtMT1GET6m9qSM9+SFn6h0SoP/xeN20P6z4cSAi+CZcd6VocCUjuJIC6z7WtF DXLnJhsjjLDOj+lsVtJ0JbqNpJuVqEv77scKKDggwWAMeG3swgGh7dNfei7q+1jUGdFrRD jbrh1sWcNFfxjWUcPet00qGbvekuaBA= X-MC-Unique: s3cFLAyTMKinpXhD3a-SzA-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 12/15] Update scripts/meson-buildoptions.sh Date: Fri, 6 Jan 2023 09:28:50 +0100 Message-Id: <20230106082853.31787-13-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672995477302100003 Content-Type: text/plain; charset="utf-8" From: Alessandro Di Federico Note: `Makefile` relies on modification dates in the source tree to detect changes to `meson_options.txt`. However, git does not track those. Therefore, the following was necessary to regenerate `meson-buildoptions.sh`: touch meson_options.txt cd "$BUILD_DIR" make update-buildoptions Signed-off-by: Alessandro Di Federico Message-Id: <20230102104113.3438895-1-ale@rev.ng> Reviewed-by: Thomas Huth Reviewed-by: Stefan Hajnoczi Signed-off-by: Thomas Huth --- scripts/meson-buildoptions.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index aa6e30ea91..0f71e92dcb 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -10,6 +10,9 @@ meson_options_help() { printf "%s\n" ' affects only QEMU, not tools l= ike qemu-img)' printf "%s\n" ' --datadir=3DVALUE Data file directory [share]' printf "%s\n" ' --disable-coroutine-pool coroutine freelist (better per= formance)' + printf "%s\n" ' --disable-hexagon-idef-parser' + printf "%s\n" ' use idef-parser to automatical= ly generate TCG' + printf "%s\n" ' code for the Hexagon frontend' printf "%s\n" ' --disable-install-blobs install provided firmware blob= s' printf "%s\n" ' --docdir=3DVALUE Base directory for documenta= tion installation' printf "%s\n" ' (can be empty) [share/doc]' @@ -40,7 +43,8 @@ meson_options_help() { printf "%s\n" ' --enable-trace-backends=3DCHOICES' printf "%s\n" ' Set available tracing backends= [log] (choices:' printf "%s\n" ' dtrace/ftrace/log/nop/simple/s= yslog/ust)' - printf "%s\n" ' --firmwarepath=3DVALUES search PATH for firmware fil= es [share/qemu-firmware]' + printf "%s\n" ' --firmwarepath=3DVALUES search PATH for firmware fil= es [share/qemu-' + printf "%s\n" ' firmware]' printf "%s\n" ' --iasl=3DVALUE Path to ACPI disassembler' printf "%s\n" ' --includedir=3DVALUE Header file directory [inclu= de]' printf "%s\n" ' --interp-prefix=3DVALUE where to find shared librari= es etc., use %M for' @@ -93,7 +97,7 @@ meson_options_help() { printf "%s\n" ' glusterfs Glusterfs block device driver' printf "%s\n" ' gnutls GNUTLS cryptography support' printf "%s\n" ' gtk GTK+ user interface' - printf "%s\n" ' gtk-clipboard clipboard support for GTK (EXPERIMENTAL= , MAY HANG)' + printf "%s\n" ' gtk-clipboard clipboard support for the gtk UI (EXPER= IMENTAL, MAY HANG)' printf "%s\n" ' guest-agent Build QEMU Guest Agent' printf "%s\n" ' guest-agent-msi Build MSI package for the QEMU Guest Ag= ent' printf "%s\n" ' hax HAX acceleration support' @@ -156,6 +160,8 @@ meson_options_help() { printf "%s\n" ' usb-redir libusbredir support' printf "%s\n" ' vde vde network backend support' printf "%s\n" ' vdi vdi image format support' + printf "%s\n" ' vduse-blk-export' + printf "%s\n" ' VDUSE block export support' printf "%s\n" ' vfio-user-server' printf "%s\n" ' vfio-user server support' printf "%s\n" ' vhost-crypto vhost-user crypto backend support' @@ -164,8 +170,6 @@ meson_options_help() { printf "%s\n" ' vhost-user vhost-user backend support' printf "%s\n" ' vhost-user-blk-server' printf "%s\n" ' build vhost-user-blk server' - printf "%s\n" ' vduse-blk-export' - printf "%s\n" ' VDUSE block export support' printf "%s\n" ' vhost-vdpa vhost-vdpa kernel backend support' printf "%s\n" ' virglrenderer virgl rendering support' printf "%s\n" ' virtfs virtio-9p support' @@ -283,6 +287,8 @@ _meson_option_parse() { --disable-guest-agent-msi) printf "%s" -Dguest_agent_msi=3Ddisabled ;; --enable-hax) printf "%s" -Dhax=3Denabled ;; --disable-hax) printf "%s" -Dhax=3Ddisabled ;; + --enable-hexagon-idef-parser) printf "%s" -Dhexagon_idef_parser=3Dtrue= ;; + --disable-hexagon-idef-parser) printf "%s" -Dhexagon_idef_parser=3Dfal= se ;; --enable-hvf) printf "%s" -Dhvf=3Denabled ;; --disable-hvf) printf "%s" -Dhvf=3Ddisabled ;; --iasl=3D*) quote_sh "-Diasl=3D$2" ;; @@ -429,6 +435,8 @@ _meson_option_parse() { --disable-vde) printf "%s" -Dvde=3Ddisabled ;; --enable-vdi) printf "%s" -Dvdi=3Denabled ;; --disable-vdi) printf "%s" -Dvdi=3Ddisabled ;; + --enable-vduse-blk-export) printf "%s" -Dvduse_blk_export=3Denabled ;; + --disable-vduse-blk-export) printf "%s" -Dvduse_blk_export=3Ddisabled = ;; --enable-vfio-user-server) printf "%s" -Dvfio_user_server=3Denabled ;; --disable-vfio-user-server) printf "%s" -Dvfio_user_server=3Ddisabled = ;; --enable-vhost-crypto) printf "%s" -Dvhost_crypto=3Denabled ;; @@ -441,8 +449,6 @@ _meson_option_parse() { --disable-vhost-user) printf "%s" -Dvhost_user=3Ddisabled ;; --enable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=3D= enabled ;; --disable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server= =3Ddisabled ;; - --enable-vduse-blk-export) printf "%s" -Dvduse_blk_export=3Denabled ;; - --disable-vduse-blk-export) printf "%s" -Dvduse_blk_export=3Ddisabled = ;; --enable-vhost-vdpa) printf "%s" -Dvhost_vdpa=3Denabled ;; --disable-vhost-vdpa) printf "%s" -Dvhost_vdpa=3Ddisabled ;; --enable-virglrenderer) printf "%s" -Dvirglrenderer=3Denabled ;; --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672995445; cv=none; d=zohomail.com; s=zohoarc; b=E2vzJ5KscUrAPKyXQXcfUk88at9skRqf54ASsh2QLC3fMSBXi25C9OjpsUR1meX0QGm8RAYgvuO8iCNert485KXwLKKFbajiMm6BuuTz8P6ih+Pi0iaG8yGL1P7nlIU4r/ssuL9wqCOEAAY2LG6ZGggWyvvdUmSTHh9x4JeJYIc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672995445; 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=gMZAYo5ZEUGaMYWhY38+M+KRqajP53zc1xw/KyMz948=; b=TixRIa3F5Z8mfPLPvdkRJcCSFYVNTUC5N5ZdNQ+GI26n9y7rthPtPoMaVFfn6zMuZIlj7YOn2HHniQ3842VBSvV5BXYQI52s6RpNlgrw0dtg7UmqJJqtQ8O85KrQCqd2Q6Pl4Olv+Pyw+KvA+Uxt8Bzw9SpVmG2ny+y8rl3sLCM= 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 1672995445031121.01486547993818; Fri, 6 Jan 2023 00:57:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi6X-0002ff-TV; Fri, 06 Jan 2023 03:29:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6Q-0002cd-Px for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6O-0005Xs-1V for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:25 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-299-RyvyykXmMKu_DZel4KHJpA-1; Fri, 06 Jan 2023 03:29:15 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 15D89802C1C; Fri, 6 Jan 2023 08:29:15 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40795492B06; Fri, 6 Jan 2023 08:29:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993763; 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=gMZAYo5ZEUGaMYWhY38+M+KRqajP53zc1xw/KyMz948=; b=dV+gtQ9DxmCDewwE+IP8DqBsUD3h1VHCuxWmrDh6sR1JFjcQjLWNSAoWS36M8G9MI2mJht 66l4M6FGuwrgJMNob/yXt/ZPw6P9PJSLjxjQ7sXWvUl0Su2sbfe701K3eL2EinSYHJsTLM rWdke0A5jbQ8Jp1IVggA4FE3iQ51X30= X-MC-Unique: RyvyykXmMKu_DZel4KHJpA-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 13/15] Refactoring: refactor TFR() macro to RETRY_ON_EINTR() Date: Fri, 6 Jan 2023 09:28:51 +0100 Message-Id: <20230106082853.31787-14-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672995447232100003 From: Nikita Ivanov Rename macro name to more transparent one and refactor it to expression. Signed-off-by: Nikita Ivanov Message-Id: <20221023090422.242617-2-nivanov@cloudlinux.com> Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Bin Meng Reviewed-by: Christian Schoenebeck Signed-off-by: Thomas Huth --- include/qemu/osdep.h | 8 +++++++- chardev/char-fd.c | 2 +- chardev/char-pipe.c | 8 +++++--- net/tap-bsd.c | 6 +++--- net/tap-linux.c | 2 +- net/tap-solaris.c | 8 ++++---- net/tap.c | 2 +- os-posix.c | 2 +- tests/qtest/libqtest.c | 2 +- 9 files changed, 24 insertions(+), 16 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index b9c4307779..7d059ad526 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -251,7 +251,13 @@ void QEMU_ERROR("code path is reachable") #define ESHUTDOWN 4099 #endif =20 -#define TFR(expr) do { if ((expr) !=3D -1) break; } while (errno =3D=3D EI= NTR) +#define RETRY_ON_EINTR(expr) \ + (__extension__ \ + ({ typeof(expr) __result; \ + do { \ + __result =3D (expr); \ + } while (__result =3D=3D -1 && errno =3D=3D EINTR); \ + __result; })) =20 /* time_t may be either 32 or 64 bits depending on the host OS, and * can be either signed or unsigned, so we can't just hardcode a diff --git a/chardev/char-fd.c b/chardev/char-fd.c index cf78454841..d2c4923359 100644 --- a/chardev/char-fd.c +++ b/chardev/char-fd.c @@ -198,7 +198,7 @@ int qmp_chardev_open_file_source(char *src, int flags, = Error **errp) { int fd =3D -1; =20 - TFR(fd =3D qemu_open_old(src, flags, 0666)); + fd =3D RETRY_ON_EINTR(qemu_open_old(src, flags, 0666)); if (fd =3D=3D -1) { error_setg_file_open(errp, errno, src); } diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c index 66d3b85091..5ad30bcc59 100644 --- a/chardev/char-pipe.c +++ b/chardev/char-pipe.c @@ -131,8 +131,8 @@ static void qemu_chr_open_pipe(Chardev *chr, =20 filename_in =3D g_strdup_printf("%s.in", filename); filename_out =3D g_strdup_printf("%s.out", filename); - TFR(fd_in =3D qemu_open_old(filename_in, O_RDWR | O_BINARY)); - TFR(fd_out =3D qemu_open_old(filename_out, O_RDWR | O_BINARY)); + fd_in =3D RETRY_ON_EINTR(qemu_open_old(filename_in, O_RDWR | O_BINARY)= ); + fd_out =3D RETRY_ON_EINTR(qemu_open_old(filename_out, O_RDWR | O_BINAR= Y)); g_free(filename_in); g_free(filename_out); if (fd_in < 0 || fd_out < 0) { @@ -142,7 +142,9 @@ static void qemu_chr_open_pipe(Chardev *chr, if (fd_out >=3D 0) { close(fd_out); } - TFR(fd_in =3D fd_out =3D qemu_open_old(filename, O_RDWR | O_BINARY= )); + fd_in =3D fd_out =3D RETRY_ON_EINTR( + qemu_open_old(filename, O_RDWR | O_BINARY) + ); if (fd_in < 0) { error_setg_file_open(errp, errno, filename); return; diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 005ce05c6e..4c98fdd337 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -56,7 +56,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, } else { snprintf(dname, sizeof dname, "/dev/tap%d", i); } - TFR(fd =3D open(dname, O_RDWR)); + fd =3D RETRY_ON_EINTR(open(dname, O_RDWR)); if (fd >=3D 0) { break; } @@ -111,7 +111,7 @@ static int tap_open_clone(char *ifname, int ifname_size= , Error **errp) int fd, s, ret; struct ifreq ifr; =20 - TFR(fd =3D open(PATH_NET_TAP, O_RDWR)); + fd =3D RETRY_ON_EINTR(open(PATH_NET_TAP, O_RDWR)); if (fd < 0) { error_setg_errno(errp, errno, "could not open %s", PATH_NET_TAP); return -1; @@ -159,7 +159,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_h= dr, if (ifname[0] !=3D '\0') { char dname[100]; snprintf(dname, sizeof dname, "/dev/%s", ifname); - TFR(fd =3D open(dname, O_RDWR)); + fd =3D RETRY_ON_EINTR(open(dname, O_RDWR)); if (fd < 0 && errno !=3D ENOENT) { error_setg_errno(errp, errno, "could not open %s", dname); return -1; diff --git a/net/tap-linux.c b/net/tap-linux.c index 304ff45071..f54f308d35 100644 --- a/net/tap-linux.c +++ b/net/tap-linux.c @@ -45,7 +45,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int len =3D sizeof(struct virtio_net_hdr); unsigned int features; =20 - TFR(fd =3D open(PATH_NET_TUN, O_RDWR)); + fd =3D RETRY_ON_EINTR(open(PATH_NET_TUN, O_RDWR)); if (fd < 0) { error_setg_errno(errp, errno, "could not open %s", PATH_NET_TUN); return -1; diff --git a/net/tap-solaris.c b/net/tap-solaris.c index a44f8805c2..38e15028bf 100644 --- a/net/tap-solaris.c +++ b/net/tap-solaris.c @@ -84,13 +84,13 @@ static int tap_alloc(char *dev, size_t dev_size, Error = **errp) if( ip_fd ) close(ip_fd); =20 - TFR(ip_fd =3D open("/dev/udp", O_RDWR, 0)); + ip_fd =3D RETRY_ON_EINTR(open("/dev/udp", O_RDWR, 0)); if (ip_fd < 0) { error_setg(errp, "Can't open /dev/ip (actually /dev/udp)"); return -1; } =20 - TFR(tap_fd =3D open("/dev/tap", O_RDWR, 0)); + tap_fd =3D RETRY_ON_EINTR(open("/dev/tap", O_RDWR, 0)); if (tap_fd < 0) { error_setg(errp, "Can't open /dev/tap"); return -1; @@ -104,7 +104,7 @@ static int tap_alloc(char *dev, size_t dev_size, Error = **errp) if ((ppa =3D ioctl (tap_fd, I_STR, &strioc_ppa)) < 0) error_report("Can't assign new interface"); =20 - TFR(if_fd =3D open("/dev/tap", O_RDWR, 0)); + if_fd =3D RETRY_ON_EINTR(open("/dev/tap", O_RDWR, 0)); if (if_fd < 0) { error_setg(errp, "Can't open /dev/tap (2)"); return -1; @@ -137,7 +137,7 @@ static int tap_alloc(char *dev, size_t dev_size, Error = **errp) if (ioctl (ip_fd, I_PUSH, "arp") < 0) error_report("Can't push ARP module (3)"); /* Open arp_fd */ - TFR(arp_fd =3D open ("/dev/tap", O_RDWR, 0)); + arp_fd =3D RETRY_ON_EINTR(open("/dev/tap", O_RDWR, 0)); if (arp_fd < 0) error_report("Can't open %s", "/dev/tap"); =20 diff --git a/net/tap.c b/net/tap.c index e28ceb078f..bd85c56a04 100644 --- a/net/tap.c +++ b/net/tap.c @@ -650,7 +650,7 @@ static int net_tap_init(const NetdevTapOptions *tap, in= t *vnet_hdr, vnet_hdr_required =3D 0; } =20 - TFR(fd =3D tap_open(ifname, ifname_sz, vnet_hdr, vnet_hdr_required, + fd =3D RETRY_ON_EINTR(tap_open(ifname, ifname_sz, vnet_hdr, vnet_hdr_r= equired, mq_required, errp)); if (fd < 0) { return -1; diff --git a/os-posix.c b/os-posix.c index 4858650c3e..5adc69f560 100644 --- a/os-posix.c +++ b/os-posix.c @@ -272,7 +272,7 @@ void os_setup_post(void) error_report("not able to chdir to /: %s", strerror(errno)); exit(1); } - TFR(fd =3D qemu_open_old("/dev/null", O_RDWR)); + fd =3D RETRY_ON_EINTR(qemu_open_old("/dev/null", O_RDWR)); if (fd =3D=3D -1) { exit(1); } diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 2fbc3b88f3..f9c8987678 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -203,7 +203,7 @@ void qtest_wait_qemu(QTestState *s) #ifndef _WIN32 pid_t pid; =20 - TFR(pid =3D waitpid(s->qemu_pid, &s->wstatus, 0)); + pid =3D RETRY_ON_EINTR(waitpid(s->qemu_pid, &s->wstatus, 0)); assert(pid =3D=3D s->qemu_pid); #else DWORD ret; --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672993886; cv=none; d=zohomail.com; s=zohoarc; b=SQBmEJ9dqX/bNFYW8R/gexrVhlzjD8OxSmNd9e0MlnqAwdqif0DIADHAsbQx4fiwBw5yE1WpAZ809b024oiwLuqCEVmSuMtaRRS3yImwTYtUIMgzdt99ZvVgJtJfV7vhw4xyBg3olCuJpHhzVDz4cf+H5osCk1WeKVxHm9tEVFM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672993886; 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=eVfM6pN5RnryTGdHDwH3xBTMR37/OEIok5xWb1/x5wc=; b=IP83r7TgPglpPHIf95eZbEk6w0Qo4CalbYWTSAAnrOSmnzfwXRQM5tuA/6CR7y5uiMoN/pCxVGoJt6SGnl3tdf509izBWsmCfL0LZ8/WUsBP28Qz9BX3Ha41AzM//N1QCPSJO7oykmgCLErQNm59/WQAm/UK0ntfoa13X2SWFRE= 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 1672993886805115.17747848257545; Fri, 6 Jan 2023 00:31:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi6P-0002cP-6l; Fri, 06 Jan 2023 03:29:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6N-0002cA-4j for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6K-0005XH-Fr for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:22 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-440-anAaOVvKPQuR7mcyEP_cdQ-1; Fri, 06 Jan 2023 03:29:16 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5107E2999B2E; Fri, 6 Jan 2023 08:29:16 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E2C7492B06; Fri, 6 Jan 2023 08:29:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993759; 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=eVfM6pN5RnryTGdHDwH3xBTMR37/OEIok5xWb1/x5wc=; b=UJvncc/+8XKRf4uNIPaWDac9xkyqw8ey6VsPRtXyeCXsErYZazoQaAu/GUUnQVftQ782X2 JFJVMsshweYlYhOWPNxWWgu7DF9UObcWlq0XOcY14x4nRqhsMFSNm51AxOhhkUy0+WMTDQ RvqIN92DVdA0pHzpPeJGE1ZxcMrkpGM= X-MC-Unique: anAaOVvKPQuR7mcyEP_cdQ-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 14/15] error handling: Use RETRY_ON_EINTR() macro where applicable Date: Fri, 6 Jan 2023 09:28:52 +0100 Message-Id: <20230106082853.31787-15-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672993888102100001 From: Nikita Ivanov There is a defined RETRY_ON_EINTR() macro in qemu/osdep.h which handles the same while loop. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/415 Signed-off-by: Nikita Ivanov Message-Id: <20221023090422.242617-3-nivanov@cloudlinux.com> Reviewed-by: Marc-Andr=C3=A9 Lureau [thuth: Dropped the hunk that changed socket_accept() in libqtest.c] Signed-off-by: Thomas Huth --- block/file-posix.c | 37 ++++++++++++++++--------------------- chardev/char-pty.c | 4 +--- hw/9pfs/9p-local.c | 8 ++------ net/l2tpv3.c | 17 +++++------------ net/socket.c | 16 +++++++--------- net/tap.c | 8 ++------ qga/commands-posix.c | 4 +--- semihosting/syscalls.c | 4 +--- tests/qtest/libqtest.c | 4 +--- tests/vhost-user-bridge.c | 4 +--- util/main-loop.c | 4 +--- util/osdep.c | 4 +--- util/vfio-helpers.c | 12 ++++++------ 13 files changed, 45 insertions(+), 81 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index b9647c5ffc..b9955db205 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1229,9 +1229,7 @@ static int hdev_get_max_segments(int fd, struct stat = *st) ret =3D -errno; goto out; } - do { - ret =3D read(sysfd, buf, sizeof(buf) - 1); - } while (ret =3D=3D -1 && errno =3D=3D EINTR); + ret =3D RETRY_ON_EINTR(read(sysfd, buf, sizeof(buf) - 1)); if (ret < 0) { ret =3D -errno; goto out; @@ -1379,9 +1377,9 @@ static int handle_aiocb_ioctl(void *opaque) RawPosixAIOData *aiocb =3D opaque; int ret; =20 - do { - ret =3D ioctl(aiocb->aio_fildes, aiocb->ioctl.cmd, aiocb->ioctl.bu= f); - } while (ret =3D=3D -1 && errno =3D=3D EINTR); + ret =3D RETRY_ON_EINTR( + ioctl(aiocb->aio_fildes, aiocb->ioctl.cmd, aiocb->ioctl.buf) + ); if (ret =3D=3D -1) { return -errno; } @@ -1463,18 +1461,17 @@ static ssize_t handle_aiocb_rw_vector(RawPosixAIODa= ta *aiocb) { ssize_t len; =20 - do { - if (aiocb->aio_type & QEMU_AIO_WRITE) - len =3D qemu_pwritev(aiocb->aio_fildes, - aiocb->io.iov, - aiocb->io.niov, - aiocb->aio_offset); - else - len =3D qemu_preadv(aiocb->aio_fildes, - aiocb->io.iov, - aiocb->io.niov, - aiocb->aio_offset); - } while (len =3D=3D -1 && errno =3D=3D EINTR); + len =3D RETRY_ON_EINTR( + (aiocb->aio_type & QEMU_AIO_WRITE) ? + qemu_pwritev(aiocb->aio_fildes, + aiocb->io.iov, + aiocb->io.niov, + aiocb->aio_offset) : + qemu_preadv(aiocb->aio_fildes, + aiocb->io.iov, + aiocb->io.niov, + aiocb->aio_offset) + ); =20 if (len =3D=3D -1) { return -errno; @@ -1899,9 +1896,7 @@ static int allocate_first_block(int fd, size_t max_si= ze) buf =3D qemu_memalign(max_align, write_size); memset(buf, 0, write_size); =20 - do { - n =3D pwrite(fd, buf, write_size, 0); - } while (n =3D=3D -1 && errno =3D=3D EINTR); + n =3D RETRY_ON_EINTR(pwrite(fd, buf, write_size, 0)); =20 ret =3D (n =3D=3D -1) ? -errno : 0; =20 diff --git a/chardev/char-pty.c b/chardev/char-pty.c index 53f25c6bbd..92fd33c854 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -93,9 +93,7 @@ static void pty_chr_update_read_handler(Chardev *chr) pfd.fd =3D fioc->fd; pfd.events =3D G_IO_OUT; pfd.revents =3D 0; - do { - rc =3D g_poll(&pfd, 1, 0); - } while (rc =3D=3D -1 && errno =3D=3D EINTR); + rc =3D RETRY_ON_EINTR(g_poll(&pfd, 1, 0)); assert(rc >=3D 0); =20 if (pfd.revents & G_IO_HUP) { diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index d2246a3d7e..9d07620235 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -470,9 +470,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPa= th *fs_path, if (fd =3D=3D -1) { return -1; } - do { - tsize =3D read(fd, (void *)buf, bufsz); - } while (tsize =3D=3D -1 && errno =3D=3D EINTR); + tsize =3D RETRY_ON_EINTR(read(fd, (void *)buf, bufsz)); close_preserve_errno(fd); } else if ((fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) || (fs_ctx->export_flags & V9FS_SM_NONE)) { @@ -908,9 +906,7 @@ static int local_symlink(FsContext *fs_ctx, const char = *oldpath, } /* Write the oldpath (target) to the file. */ oldpath_size =3D strlen(oldpath); - do { - write_size =3D write(fd, (void *)oldpath, oldpath_size); - } while (write_size =3D=3D -1 && errno =3D=3D EINTR); + write_size =3D RETRY_ON_EINTR(write(fd, (void *)oldpath, oldpath_s= ize)); close_preserve_errno(fd); =20 if (write_size !=3D oldpath_size) { diff --git a/net/l2tpv3.c b/net/l2tpv3.c index 5852e42738..53b2d32573 100644 --- a/net/l2tpv3.c +++ b/net/l2tpv3.c @@ -240,9 +240,7 @@ static ssize_t net_l2tpv3_receive_dgram_iov(NetClientSt= ate *nc, message.msg_control =3D NULL; message.msg_controllen =3D 0; message.msg_flags =3D 0; - do { - ret =3D sendmsg(s->fd, &message, 0); - } while ((ret =3D=3D -1) && (errno =3D=3D EINTR)); + ret =3D RETRY_ON_EINTR(sendmsg(s->fd, &message, 0)); if (ret > 0) { ret -=3D s->offset; } else if (ret =3D=3D 0) { @@ -285,9 +283,7 @@ static ssize_t net_l2tpv3_receive_dgram(NetClientState = *nc, message.msg_control =3D NULL; message.msg_controllen =3D 0; message.msg_flags =3D 0; - do { - ret =3D sendmsg(s->fd, &message, 0); - } while ((ret =3D=3D -1) && (errno =3D=3D EINTR)); + ret =3D RETRY_ON_EINTR(sendmsg(s->fd, &message, 0)); if (ret > 0) { ret -=3D s->offset; } else if (ret =3D=3D 0) { @@ -434,12 +430,9 @@ static void net_l2tpv3_send(void *opaque) =20 msgvec =3D s->msgvec + s->queue_head; if (target_count > 0) { - do { - count =3D recvmmsg( - s->fd, - msgvec, - target_count, MSG_DONTWAIT, NULL); - } while ((count =3D=3D -1) && (errno =3D=3D EINTR)); + count =3D RETRY_ON_EINTR( + recvmmsg(s->fd, msgvec, target_count, MSG_DONTWAIT, NULL) + ); if (count < 0) { /* Recv error - we still need to flush packets here, * (re)set queue head to current position diff --git a/net/socket.c b/net/socket.c index b67437a1f0..2fc5696755 100644 --- a/net/socket.c +++ b/net/socket.c @@ -117,15 +117,13 @@ static ssize_t net_socket_receive_dgram(NetClientStat= e *nc, const uint8_t *buf, NetSocketState *s =3D DO_UPCAST(NetSocketState, nc, nc); ssize_t ret; =20 - do { - if (s->dgram_dst.sin_family !=3D AF_UNIX) { - ret =3D sendto(s->fd, buf, size, 0, - (struct sockaddr *)&s->dgram_dst, - sizeof(s->dgram_dst)); - } else { - ret =3D send(s->fd, buf, size, 0); - } - } while (ret =3D=3D -1 && errno =3D=3D EINTR); + ret =3D RETRY_ON_EINTR( + s->dgram_dst.sin_family !=3D AF_UNIX ? + sendto(s->fd, buf, size, 0, + (struct sockaddr *)&s->dgram_dst, + sizeof(s->dgram_dst)) : + send(s->fd, buf, size, 0) + ); =20 if (ret =3D=3D -1 && errno =3D=3D EAGAIN) { net_socket_write_poll(s, true); diff --git a/net/tap.c b/net/tap.c index bd85c56a04..7d7bc1dc5f 100644 --- a/net/tap.c +++ b/net/tap.c @@ -102,9 +102,7 @@ static ssize_t tap_write_packet(TAPState *s, const stru= ct iovec *iov, int iovcnt { ssize_t len; =20 - do { - len =3D writev(s->fd, iov, iovcnt); - } while (len =3D=3D -1 && errno =3D=3D EINTR); + len =3D RETRY_ON_EINTR(writev(s->fd, iov, iovcnt)); =20 if (len =3D=3D -1 && errno =3D=3D EAGAIN) { tap_write_poll(s, true); @@ -577,9 +575,7 @@ static int net_bridge_run_helper(const char *helper, co= nst char *bridge, =20 close(sv[1]); =20 - do { - fd =3D recv_fd(sv[0]); - } while (fd =3D=3D -1 && errno =3D=3D EINTR); + fd =3D RETRY_ON_EINTR(recv_fd(sv[0])); saved_errno =3D errno; =20 close(sv[0]); diff --git a/qga/commands-posix.c b/qga/commands-posix.c index b19b9c5d18..ebd33a643c 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -63,9 +63,7 @@ static void ga_wait_child(pid_t pid, int *status, Error *= *errp) =20 *status =3D 0; =20 - do { - rpid =3D waitpid(pid, status, 0); - } while (rpid =3D=3D -1 && errno =3D=3D EINTR); + rpid =3D RETRY_ON_EINTR(waitpid(pid, status, 0)); =20 if (rpid =3D=3D -1) { error_setg_errno(errp, errno, "failed to wait for child (pid: %d)", diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c index 508a0ad88c..5893c760c5 100644 --- a/semihosting/syscalls.c +++ b/semihosting/syscalls.c @@ -317,9 +317,7 @@ static void host_read(CPUState *cs, gdb_syscall_complet= e_cb complete, complete(cs, -1, EFAULT); return; } - do { - ret =3D read(gf->hostfd, ptr, len); - } while (ret =3D=3D -1 && errno =3D=3D EINTR); + ret =3D RETRY_ON_EINTR(read(gf->hostfd, ptr, len)); if (ret =3D=3D -1) { complete(cs, -1, errno); unlock_user(ptr, buf, 0); diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index f9c8987678..5cb38f90da 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -689,9 +689,7 @@ int qtest_socket_server(const char *socket_path) addr.sun_family =3D AF_UNIX; snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", socket_path); =20 - do { - ret =3D bind(sock, (struct sockaddr *)&addr, sizeof(addr)); - } while (ret =3D=3D -1 && errno =3D=3D EINTR); + ret =3D RETRY_ON_EINTR(bind(sock, (struct sockaddr *)&addr, sizeof(add= r))); g_assert_cmpint(ret, !=3D, -1); ret =3D listen(sock, 1); g_assert_cmpint(ret, !=3D, -1); diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c index fecdf915e7..a5c711b1de 100644 --- a/tests/vhost-user-bridge.c +++ b/tests/vhost-user-bridge.c @@ -331,9 +331,7 @@ vubr_backend_recv_cb(int sock, void *ctx) .msg_iovlen =3D num, .msg_flags =3D MSG_DONTWAIT, }; - do { - ret =3D recvmsg(vubr->backend_udp_sock, &msg, 0); - } while (ret =3D=3D -1 && (errno =3D=3D EINTR)); + ret =3D RETRY_ON_EINTR(recvmsg(vubr->backend_udp_sock, &msg, 0)); =20 if (i =3D=3D 0) { iov_restore_front(elem->in_sg, sg, hdrlen); diff --git a/util/main-loop.c b/util/main-loop.c index 10fa74c6e3..58f776a8c9 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -64,9 +64,7 @@ static void sigfd_handler(void *opaque) ssize_t len; =20 while (1) { - do { - len =3D read(fd, &info, sizeof(info)); - } while (len =3D=3D -1 && errno =3D=3D EINTR); + len =3D RETRY_ON_EINTR(read(fd, &info, sizeof(info))); =20 if (len =3D=3D -1 && errno =3D=3D EAGAIN) { break; diff --git a/util/osdep.c b/util/osdep.c index 77c1a6c562..e996c4744a 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -244,9 +244,7 @@ static int qemu_lock_fcntl(int fd, int64_t start, int64= _t len, int fl_type) .l_type =3D fl_type, }; qemu_probe_lock_ops(); - do { - ret =3D fcntl(fd, fcntl_op_setlk, &fl); - } while (ret =3D=3D -1 && errno =3D=3D EINTR); + ret =3D RETRY_ON_EINTR(fcntl(fd, fcntl_op_setlk, &fl)); return ret =3D=3D -1 ? -errno : 0; } =20 diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 7a84b1d806..2d8af38f88 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -240,9 +240,9 @@ static int qemu_vfio_pci_read_config(QEMUVFIOState *s, = void *buf, s->config_region_info.offset, s->config_region_info.size); assert(QEMU_IS_ALIGNED(s->config_region_info.offset + ofs, size)); - do { - ret =3D pread(s->device, buf, size, s->config_region_info.offset += ofs); - } while (ret =3D=3D -1 && errno =3D=3D EINTR); + ret =3D RETRY_ON_EINTR( + pread(s->device, buf, size, s->config_region_info.offset + ofs) + ); return ret =3D=3D size ? 0 : -errno; } =20 @@ -254,9 +254,9 @@ static int qemu_vfio_pci_write_config(QEMUVFIOState *s,= void *buf, int size, int s->config_region_info.offset, s->config_region_info.size); assert(QEMU_IS_ALIGNED(s->config_region_info.offset + ofs, size)); - do { - ret =3D pwrite(s->device, buf, size, s->config_region_info.offset = + ofs); - } while (ret =3D=3D -1 && errno =3D=3D EINTR); + ret =3D RETRY_ON_EINTR( + pwrite(s->device, buf, size, s->config_region_info.offset + ofs) + ); return ret =3D=3D size ? 0 : -errno; } =20 --=20 2.31.1 From nobody Tue Feb 10 00:27:43 2026 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=1672994636; cv=none; d=zohomail.com; s=zohoarc; b=bNE4VA6AfQ4xgq68qHT/lnn5rsctjwkrl4H/8U3flP5uZkmSDmNcfBSTj6pR9D6q4HN5ksJySzpIwdVd6iTAFyfM4yeR5OiQuP4a9Rl3TbCEAy0OCzlX1qAD6h2TuFp57pwl1LfdLlQ9q6meOI3oWjzurqEiIXii66GW8JXgqt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672994636; h=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=9kQROEhuIdmJZiycXI3l+ANPcUqnSTTz1zv8E2eQDYU=; b=nroITkeYKgCy7psdeclSXZ2KXAkW/879lBKaGiAZCdKU2J+qZBB2EqLWmWwnQ9e/1/ez3hJ9T4rix+4ok2Y1SRGuowiUr8XLMK39sJvd/1SyoUpLVCLWqUevwVS+xPmUpzeZ09HiNKtzxua3q9LDhoPPe6RerwqdIqVqX03fix0= 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 1672994636864234.63722486181018; Fri, 6 Jan 2023 00:43:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDi6Z-0002gr-DH; Fri, 06 Jan 2023 03:29:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6S-0002cq-Hr for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDi6Q-0005YF-Hx for qemu-devel@nongnu.org; Fri, 06 Jan 2023 03:29:27 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-659-gMyMZjEANNKd73ykwGJgeA-1; Fri, 06 Jan 2023 03:29:18 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A11E73815F62; Fri, 6 Jan 2023 08:29:17 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0026492B06; Fri, 6 Jan 2023 08:29:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672993764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9kQROEhuIdmJZiycXI3l+ANPcUqnSTTz1zv8E2eQDYU=; b=ON57qwg7YslaUtx8PQR71US+ZZStqt6/w2075kRVcsz2OZ9/YYrYszzOrGLlSpdcoleh51 F72MjmkXVXSTk6fx87KcdjdBCY+vJFRfPzINhlLORwn7esgz8ttvxqlOHADNHjV8185Ait xCkTeRvuw0rU0w2n/SUsjNvyz44nxRA= X-MC-Unique: gMyMZjEANNKd73ykwGJgeA-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nikita Ivanov Subject: [PULL 15/15] .gitlab-ci.d/windows: Do not run the qtests in the msys2-32bit job Date: Fri, 6 Jan 2023 09:28:53 +0100 Message-Id: <20230106082853.31787-16-thuth@redhat.com> In-Reply-To: <20230106082853.31787-1-thuth@redhat.com> References: <20230106082853.31787-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672994639024100003 Content-Type: text/plain; charset="utf-8" The qtests are not stable in the msys2-32bit job yet - especially the test-hmp and the qom-test are failing randomly. Until this is fixed, let's better disable the qtests here again to avoid failing CI tests. Message-Id: <20230105204819.26992-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- .gitlab-ci.d/windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 22f794e537..a1d5790580 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -116,4 +116,5 @@ msys2-32bit: - ..\msys64\usr\bin\bash -lc '../configure --target-list=3Dppc64-softmmu --disable-opengl' - ..\msys64\usr\bin\bash -lc 'make' - - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt= ; exit 1; } ;' + - ..\msys64\usr\bin\bash -lc 'make check MTESTARGS=3D\"--no-suite qtest\= " || + { cat meson-logs/testlog.txt; exit 1; }' --=20 2.31.1