From nobody Sat Nov 15 22:22:46 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746039170; cv=none; d=zohomail.com; s=zohoarc; b=IOtDhaYZiyREZNbqEh0eee0g+n4wvNsjyyqlY6Sitm0u4HjiMDBPNqkzSrCir6N5NZtYzWcRiAMFGpLltdG2rSZRLbDcDvH5xgV5jy7hXCRdo5iSICPPAGUUAQJaHg4LkHz3H6mzBL8WFxNMHt/ItuKKXCOywaklwWnMCwQ2QlM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746039170; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ERIgXDinfeSmrMlkgVyEvdDJ79lG2QLoTJsXS0Wtl2o=; b=fVbtVG8dwAJcO5ehsT2edH6A+Qle6AclemudTRGlBq49KoEJi7yFwtqsn5jQuTNcNksPEa+76vkPxup3YD7rV2fU5Uj70TPmkr4VPkLHtRRSLTvDGH2hEji3RYT36zBLQx3WT8HNuKlrtS7vVwimF9nhcRwyvu/9x40+HArrcIs= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746039170750794.3524486495378; Wed, 30 Apr 2025 11:52:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uACWo-00058i-Gh; Wed, 30 Apr 2025 14:51:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uACWm-000557-Fv for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:51:28 -0400 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 1uACWk-0008MW-SY for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:51:28 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-614-w5-KKsFOOYmPsn0uIVzKhA-1; Wed, 30 Apr 2025 14:50:45 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 406E21956052; Wed, 30 Apr 2025 18:50:41 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.67]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3D71F19560A3; Wed, 30 Apr 2025 18:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746039086; 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=ERIgXDinfeSmrMlkgVyEvdDJ79lG2QLoTJsXS0Wtl2o=; b=cVuis6RNKpVzjvSLyeMC3uQOVzBEbzvARIx16CEtxXKo3gq9/KvMHbfdlMZvTHYQHJqZ+X GJ3Na8c65eCVcStNbClnBG5gWdPaibyk6osTRyMN+PPVUC2kauZ5+OQpOdqNIKg8P3hflq TCcbAJzGbRcyumIsmggt8oq2drE6Tgc= X-MC-Unique: w5-KKsFOOYmPsn0uIVzKhA-1 X-Mimecast-MFC-AGG-ID: w5-KKsFOOYmPsn0uIVzKhA_1746039041 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Steffen Eiden , Janosch Frank , Gautam Gala Subject: [PULL 1/9] target/s390x: Introduce constant when checking if PV header couldn't be decrypted Date: Wed, 30 Apr 2025 20:50:27 +0200 Message-ID: <20250430185035.724919-2-thuth@redhat.com> In-Reply-To: <20250430185035.724919-1-thuth@redhat.com> References: <20250430185035.724919-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.483, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1746039173535019100 Content-Type: text/plain; charset="utf-8" From: Gautam Gala Introduce a named constant when checking the Set Secure Configuration param= eters UV call return code for the case where no valid host key was found and ther= efore the PV header couldn't be decrypted (0x108). Reviewed-by: Steffen Eiden Reviewed-by: Janosch Frank Signed-off-by: Gautam Gala Message-ID: <20250423080915.1048123-2-ggala@linux.ibm.com> Signed-off-by: Thomas Huth --- target/s390x/kvm/pv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/s390x/kvm/pv.c b/target/s390x/kvm/pv.c index fe0a72c416e..1947a3d6692 100644 --- a/target/s390x/kvm/pv.c +++ b/target/s390x/kvm/pv.c @@ -147,6 +147,7 @@ bool s390_pv_vm_try_disable_async(S390CcwMachineState *= ms) return true; } =20 +#define UV_RC_SSC_INVAL_HOSTKEY 0x0108 int s390_pv_set_sec_parms(uint64_t origin, uint64_t length, Error **errp) { int ret, pvrc; @@ -158,7 +159,7 @@ int s390_pv_set_sec_parms(uint64_t origin, uint64_t len= gth, Error **errp) ret =3D s390_pv_cmd_pvrc(KVM_PV_SET_SEC_PARMS, &args, &pvrc); if (ret) { error_setg(errp, "Failed to set secure execution parameters"); - if (pvrc =3D=3D 0x108) { + if (pvrc =3D=3D UV_RC_SSC_INVAL_HOSTKEY) { error_append_hint(errp, "Please check whether the image is " "correctly encrypted for this host\n"); } --=20 2.49.0 From nobody Sat Nov 15 22:22:46 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746039112; cv=none; d=zohomail.com; s=zohoarc; b=YXjUreZ2AxXFUkix0hOSxC4pIv9ajlYeUnkA8PVqibwuxQuw98HSUmQRK5jmpnXkVDSI+Yj5ZId3imWxoZYJd2Ok9pwVQD+bGKf5goLDBN3O3xMp7zlPnsG6HygfkHPsXdEfg378/QjKutSX/iXm6LnrEB2EPp1XEHDL+xIaarc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746039112; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1jF3E5daF6g9w4QZMA0OD2SSi2U8rcfGr0Z+gYTEOaI=; b=nM9YKcLr8+5jo5EPs01jL5PE1px2gQXmNagqZImCXbWcJ8pQJsFzJyRg1E4QIq3UIXm9CK8PwY0Q9YGDxdZo0XYkA+TkKwqBkPeAxmTlAdYYuxDye8jhmvEWy8brDWYDepVV4FmWczcjO/EqR02ez9FbxIixLp28TCPYMA1B328= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746039112322326.0162208127904; Wed, 30 Apr 2025 11:51:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uACWC-0003TP-3Z; Wed, 30 Apr 2025 14:50:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uACW9-0003Mu-U3 for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:50:50 -0400 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 1uACW8-0008Jh-7E for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:50:49 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-491-I-AZhIBnOKqVYgiCxoiXJA-1; Wed, 30 Apr 2025 14:50:45 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4A1891800EC8; Wed, 30 Apr 2025 18:50:44 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.67]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1528019560A3; Wed, 30 Apr 2025 18:50:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746039047; 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=1jF3E5daF6g9w4QZMA0OD2SSi2U8rcfGr0Z+gYTEOaI=; b=ML/VP/AbzAfR8kfRCuHe3GDz+SWz79HTwBjldPd0yc3R86c6XWqXZVdmSWsKY+jJWR5rrJ 3fsAL4F8aKFRDTmg+CpH/rBU9/ec8gkXfrP1cpmOEp2aIw7YbYyD4Koq93oqddM+bRCNw9 YuYTPA92QrfKe6ZbbTt9CzTqD0onxFw= X-MC-Unique: I-AZhIBnOKqVYgiCxoiXJA-1 X-Mimecast-MFC-AGG-ID: I-AZhIBnOKqVYgiCxoiXJA_1746039044 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Steffen Eiden , Janosch Frank , Gautam Gala Subject: [PULL 2/9] target/s390x: Introduce function when exiting PV Date: Wed, 30 Apr 2025 20:50:28 +0200 Message-ID: <20250430185035.724919-3-thuth@redhat.com> In-Reply-To: <20250430185035.724919-1-thuth@redhat.com> References: <20250430185035.724919-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.483, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1746039115222019100 Content-Type: text/plain; charset="utf-8" From: Gautam Gala Replace an existing macro (s390_pv_cmd_exit) that looks like a function with an actual function. The function will be used when exiting PV instead of the macro. Reviewed-by: Steffen Eiden Reviewed-by: Janosch Frank Signed-off-by: Gautam Gala Reviewed-by: Thomas Huth Message-ID: <20250423080915.1048123-3-ggala@linux.ibm.com> Signed-off-by: Thomas Huth --- target/s390x/kvm/pv.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/target/s390x/kvm/pv.c b/target/s390x/kvm/pv.c index 1947a3d6692..30b64f7f22e 100644 --- a/target/s390x/kvm/pv.c +++ b/target/s390x/kvm/pv.c @@ -59,14 +59,12 @@ static int __s390_pv_cmd(uint32_t cmd, const char *cmdn= ame, void *data, */ #define s390_pv_cmd(cmd, data) __s390_pv_cmd(cmd, #cmd, data, NULL) #define s390_pv_cmd_pvrc(cmd, data, pvrc) __s390_pv_cmd(cmd, #cmd, data, p= vrc) -#define s390_pv_cmd_exit(cmd, data) \ -{ \ - int rc; \ - \ - rc =3D __s390_pv_cmd(cmd, #cmd, data, NULL); \ - if (rc) { \ - exit(1); \ - } \ + +static void s390_pv_cmd_exit(uint32_t cmd, void *data) +{ + if (s390_pv_cmd(cmd, data)) { + exit(1); + } } =20 int s390_pv_query_info(void) --=20 2.49.0 From nobody Sat Nov 15 22:22:46 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746039082; cv=none; d=zohomail.com; s=zohoarc; b=FO9TLNZcQppOHFezwC3eh2CqVzbG0D/Ad5B3JrZVWEzYgzpexr41eWPxd3zyl+iah2zYT7AjoATVqAR5YudWtsFfNMd2I+HT+Na3bYm0NuqXgsWEXd2BmetUzZV1zgYXWVN1t+VI6rNkvmiGOVBu+4ShogDw6bQfsRUUoG3hie4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746039082; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TJueaBAHsEGkETUqjZxxQ2XnzJ0ttLydobbuJHmlo9g=; b=WznKgLvqAViLfoiIm0BNjo4Gpv3CctE1da0sb+HQgRfetJG7ZukmCFbZjky4aD4fxjhxACS6dLTrfFBK5YRhSAbH1UxDcAiIVBb4osB486eqm6qmaxOrE/U7q4Z734adlezVdzBCwbOKIphdbknmsmHdIibT6np+yMBHkpB8kxc= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746039082392518.3706421038165; Wed, 30 Apr 2025 11:51:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uACWF-0003d7-IR; Wed, 30 Apr 2025 14:50:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uACWD-0003a5-AI for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:50:53 -0400 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 1uACWA-0008KL-V8 for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:50:52 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-434-6GgasH_TP2mUTmp81gDVFw-1; Wed, 30 Apr 2025 14:50:48 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2F06E180048E; Wed, 30 Apr 2025 18:50:47 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.67]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1F6E819560A3; Wed, 30 Apr 2025 18:50:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746039050; 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=TJueaBAHsEGkETUqjZxxQ2XnzJ0ttLydobbuJHmlo9g=; b=XCnmCv8BycZdsLt8ul8AZKSgtFzJS/q7UIfkZdWdkdfNxuaY1sU1Twa0y3b7EnL+uP2n94 4GxGoPoHTbtZzdFs56VzHkLyb3/FXFETk5qAD3B1eYtkmGDiITE+ACfmyqMu+JqaGJ0q1x ufssSGI3watoc8soo96E9p1UIHXM7vM= X-MC-Unique: 6GgasH_TP2mUTmp81gDVFw-1 X-Mimecast-MFC-AGG-ID: 6GgasH_TP2mUTmp81gDVFw_1746039047 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Janosch Frank , Gautam Gala , Steffen Eiden Subject: [PULL 3/9] target/s390x: Return UVC cmd code, RC and RRC value when DIAG 308 Subcode 10 fails to enter secure mode Date: Wed, 30 Apr 2025 20:50:29 +0200 Message-ID: <20250430185035.724919-4-thuth@redhat.com> In-Reply-To: <20250430185035.724919-1-thuth@redhat.com> References: <20250430185035.724919-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.483, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1746039085171019100 Content-Type: text/plain; charset="utf-8" From: Gautam Gala Extend DIAG308 subcode 10 to return the UVC RC, RRC and command code in bit positions 32-47, 16-31, and 0-15 of register R1 + 1 if the function does not complete successfully (in addition to the previously returned diag response code in bit position 47-63). Reviewed-by: Janosch Frank Signed-off-by: Gautam Gala Reviewed-by: Steffen Eiden Message-ID: <20250423080915.1048123-4-ggala@linux.ibm.com> Signed-off-by: Thomas Huth --- hw/s390x/ipl.h | 6 +++-- target/s390x/kvm/pv.h | 26 +++++++++++++------ hw/s390x/ipl.c | 11 ++++---- hw/s390x/s390-virtio-ccw.c | 14 ++++++----- target/s390x/kvm/pv.c | 51 +++++++++++++++++++++++++++----------- 5 files changed, 73 insertions(+), 35 deletions(-) diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index cb55101f062..505cded490c 100644 --- a/hw/s390x/ipl.h +++ b/hw/s390x/ipl.h @@ -20,6 +20,7 @@ #include "hw/qdev-core.h" #include "hw/s390x/ipl/qipl.h" #include "qom/object.h" +#include "target/s390x/kvm/pv.h" =20 #define DIAG308_FLAGS_LP_VALID 0x80 #define MAX_BOOT_DEVS 8 /* Max number of devices that may have a bootindex= */ @@ -28,8 +29,9 @@ void s390_ipl_convert_loadparm(char *ascii_lp, uint8_t *e= bcdic_lp); void s390_ipl_fmt_loadparm(uint8_t *loadparm, char *str, Error **errp); void s390_rebuild_iplb(uint16_t index, IplParameterBlock *iplb); void s390_ipl_update_diag308(IplParameterBlock *iplb); -int s390_ipl_prepare_pv_header(Error **errp); -int s390_ipl_pv_unpack(void); +int s390_ipl_prepare_pv_header(struct S390PVResponse *pv_resp, + Error **errp); +int s390_ipl_pv_unpack(struct S390PVResponse *pv_resp); void s390_ipl_prepare_cpu(S390CPU *cpu); IplParameterBlock *s390_ipl_get_iplb(void); IplParameterBlock *s390_ipl_get_iplb_pv(void); diff --git a/target/s390x/kvm/pv.h b/target/s390x/kvm/pv.h index 5e9c8bd3510..94e885e9335 100644 --- a/target/s390x/kvm/pv.h +++ b/target/s390x/kvm/pv.h @@ -16,6 +16,12 @@ #include "system/kvm.h" #include "hw/s390x/s390-virtio-ccw.h" =20 +struct S390PVResponse { + uint16_t cmd; + uint16_t rrc; + uint16_t rc; +}; + #ifdef CONFIG_KVM #include "cpu.h" =20 @@ -42,12 +48,15 @@ int s390_pv_query_info(void); int s390_pv_vm_enable(void); void s390_pv_vm_disable(void); bool s390_pv_vm_try_disable_async(S390CcwMachineState *ms); -int s390_pv_set_sec_parms(uint64_t origin, uint64_t length, Error **errp); -int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak); +int s390_pv_set_sec_parms(uint64_t origin, uint64_t length, + struct S390PVResponse *pv_resp, Error **errp); +int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak, + struct S390PVResponse *pv_resp); void s390_pv_prep_reset(void); -int s390_pv_verify(void); +int s390_pv_verify(struct S390PVResponse *pv_resp); void s390_pv_unshare(void); -void s390_pv_inject_reset_error(CPUState *cs); +void s390_pv_inject_reset_error(CPUState *cs, + struct S390PVResponse pv_resp); uint64_t kvm_s390_pv_dmp_get_size_cpu(void); uint64_t kvm_s390_pv_dmp_get_size_mem_state(void); uint64_t kvm_s390_pv_dmp_get_size_completion_data(void); @@ -63,12 +72,15 @@ static inline int s390_pv_vm_enable(void) { return 0; } static inline void s390_pv_vm_disable(void) {} static inline bool s390_pv_vm_try_disable_async(S390CcwMachineState *ms) {= return false; } static inline int s390_pv_set_sec_parms(uint64_t origin, uint64_t length, + struct S390PVResponse *pv_resp, Error **errp) { return 0; } -static inline int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tw= eak) { return 0; } +static inline int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tw= eak, + struct S390PVResponse *pv_resp) { return = 0; } static inline void s390_pv_prep_reset(void) {} -static inline int s390_pv_verify(void) { return 0; } +static inline int s390_pv_verify(struct S390PVResponse *pv_resp) { return = 0; } static inline void s390_pv_unshare(void) {} -static inline void s390_pv_inject_reset_error(CPUState *cs) {}; +static inline void s390_pv_inject_reset_error(CPUState *cs, + struct S390PVResponse pv_res= p) {}; static inline uint64_t kvm_s390_pv_dmp_get_size_cpu(void) { return 0; } static inline uint64_t kvm_s390_pv_dmp_get_size_mem_state(void) { return 0= ; } static inline uint64_t kvm_s390_pv_dmp_get_size_completion_data(void) { re= turn 0; } diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 716a6b78694..2f082396c73 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -26,7 +26,6 @@ #include "hw/s390x/vfio-ccw.h" #include "hw/s390x/css.h" #include "hw/s390x/ebcdic.h" -#include "target/s390x/kvm/pv.h" #include "hw/scsi/scsi.h" #include "hw/virtio/virtio-net.h" #include "ipl.h" @@ -676,7 +675,7 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu) cpu_physical_memory_unmap(addr, len, 1, len); } =20 -int s390_ipl_prepare_pv_header(Error **errp) +int s390_ipl_prepare_pv_header(struct S390PVResponse *pv_resp, Error **err= p) { IplParameterBlock *ipib =3D s390_ipl_get_iplb_pv(); IPLBlockPV *ipib_pv =3D &ipib->pv; @@ -685,12 +684,13 @@ int s390_ipl_prepare_pv_header(Error **errp) =20 cpu_physical_memory_read(ipib_pv->pv_header_addr, hdr, ipib_pv->pv_header_len); - rc =3D s390_pv_set_sec_parms((uintptr_t)hdr, ipib_pv->pv_header_len, e= rrp); + rc =3D s390_pv_set_sec_parms((uintptr_t)hdr, ipib_pv->pv_header_len, + pv_resp, errp); g_free(hdr); return rc; } =20 -int s390_ipl_pv_unpack(void) +int s390_ipl_pv_unpack(struct S390PVResponse *pv_resp) { IplParameterBlock *ipib =3D s390_ipl_get_iplb_pv(); IPLBlockPV *ipib_pv =3D &ipib->pv; @@ -699,7 +699,8 @@ int s390_ipl_pv_unpack(void) for (i =3D 0; i < ipib_pv->num_comp; i++) { rc =3D s390_pv_unpack(ipib_pv->components[i].addr, TARGET_PAGE_ALIGN(ipib_pv->components[i].size), - ipib_pv->components[i].tweak_pref); + ipib_pv->components[i].tweak_pref, + pv_resp); if (rc) { break; } diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 94edd42dd25..d5658afed96 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -365,7 +365,8 @@ static void s390_machine_unprotect(S390CcwMachineState = *ms) ram_block_discard_disable(false); } =20 -static int s390_machine_protect(S390CcwMachineState *ms) +static int s390_machine_protect(S390CcwMachineState *ms, + struct S390PVResponse *pv_resp) { Error *local_err =3D NULL; int rc; @@ -408,19 +409,19 @@ static int s390_machine_protect(S390CcwMachineState *= ms) } =20 /* Set SE header and unpack */ - rc =3D s390_ipl_prepare_pv_header(&local_err); + rc =3D s390_ipl_prepare_pv_header(pv_resp, &local_err); if (rc) { goto out_err; } =20 /* Decrypt image */ - rc =3D s390_ipl_pv_unpack(); + rc =3D s390_ipl_pv_unpack(pv_resp); if (rc) { goto out_err; } =20 /* Verify integrity */ - rc =3D s390_pv_verify(); + rc =3D s390_pv_verify(pv_resp); if (rc) { goto out_err; } @@ -452,6 +453,7 @@ static void s390_pv_prepare_reset(S390CcwMachineState *= ms) static void s390_machine_reset(MachineState *machine, ResetType type) { S390CcwMachineState *ms =3D S390_CCW_MACHINE(machine); + struct S390PVResponse pv_resp; enum s390_reset reset_type; CPUState *cs, *t; S390CPU *cpu; @@ -540,8 +542,8 @@ static void s390_machine_reset(MachineState *machine, R= esetType type) } run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL); =20 - if (s390_machine_protect(ms)) { - s390_pv_inject_reset_error(cs); + if (s390_machine_protect(ms, &pv_resp)) { + s390_pv_inject_reset_error(cs, pv_resp); /* * Continue after the diag308 so the guest knows something * went wrong. diff --git a/target/s390x/kvm/pv.c b/target/s390x/kvm/pv.c index 30b64f7f22e..2bc916a5455 100644 --- a/target/s390x/kvm/pv.c +++ b/target/s390x/kvm/pv.c @@ -30,7 +30,7 @@ static struct kvm_s390_pv_info_vm info_vm; static struct kvm_s390_pv_info_dump info_dump; =20 static int __s390_pv_cmd(uint32_t cmd, const char *cmdname, void *data, - int *pvrc) + struct S390PVResponse *pv_resp) { struct kvm_pv_cmd pv_cmd =3D { .cmd =3D cmd, @@ -47,8 +47,10 @@ static int __s390_pv_cmd(uint32_t cmd, const char *cmdna= me, void *data, "IOCTL rc: %d", cmd, cmdname, pv_cmd.rc, pv_cmd.rrc, rc); } - if (pvrc) { - *pvrc =3D pv_cmd.rc; + if (pv_resp) { + pv_resp->cmd =3D cmd; + pv_resp->rc =3D pv_cmd.rc; + pv_resp->rrc =3D pv_cmd.rrc; } return rc; } @@ -57,8 +59,9 @@ static int __s390_pv_cmd(uint32_t cmd, const char *cmdnam= e, void *data, * This macro lets us pass the command as a string to the function so * we can print it on an error. */ -#define s390_pv_cmd(cmd, data) __s390_pv_cmd(cmd, #cmd, data, NULL) -#define s390_pv_cmd_pvrc(cmd, data, pvrc) __s390_pv_cmd(cmd, #cmd, data, p= vrc) +#define s390_pv_cmd(cmd, data) __s390_pv_cmd(cmd, #cmd, data, NULL) +#define s390_pv_cmd_pv_resp(cmd, data, pv_resp) \ + __s390_pv_cmd(cmd, #cmd, data, pv_resp) =20 static void s390_pv_cmd_exit(uint32_t cmd, void *data) { @@ -146,18 +149,19 @@ bool s390_pv_vm_try_disable_async(S390CcwMachineState= *ms) } =20 #define UV_RC_SSC_INVAL_HOSTKEY 0x0108 -int s390_pv_set_sec_parms(uint64_t origin, uint64_t length, Error **errp) +int s390_pv_set_sec_parms(uint64_t origin, uint64_t length, + struct S390PVResponse *pv_resp, Error **errp) { - int ret, pvrc; + int ret; struct kvm_s390_pv_sec_parm args =3D { .origin =3D origin, .length =3D length, }; =20 - ret =3D s390_pv_cmd_pvrc(KVM_PV_SET_SEC_PARMS, &args, &pvrc); + ret =3D s390_pv_cmd_pv_resp(KVM_PV_SET_SEC_PARMS, &args, pv_resp); if (ret) { error_setg(errp, "Failed to set secure execution parameters"); - if (pvrc =3D=3D UV_RC_SSC_INVAL_HOSTKEY) { + if (pv_resp->rc =3D=3D UV_RC_SSC_INVAL_HOSTKEY) { error_append_hint(errp, "Please check whether the image is " "correctly encrypted for this host\n"); } @@ -169,7 +173,8 @@ int s390_pv_set_sec_parms(uint64_t origin, uint64_t len= gth, Error **errp) /* * Called for each component in the SE type IPL parameter block 0. */ -int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak) +int s390_pv_unpack(uint64_t addr, uint64_t size, + uint64_t tweak, struct S390PVResponse *pv_resp) { struct kvm_s390_pv_unp args =3D { .addr =3D addr, @@ -177,7 +182,7 @@ int s390_pv_unpack(uint64_t addr, uint64_t size, uint64= _t tweak) .tweak =3D tweak, }; =20 - return s390_pv_cmd(KVM_PV_UNPACK, &args); + return s390_pv_cmd_pv_resp(KVM_PV_UNPACK, &args, pv_resp); } =20 void s390_pv_prep_reset(void) @@ -185,9 +190,9 @@ void s390_pv_prep_reset(void) s390_pv_cmd_exit(KVM_PV_PREP_RESET, NULL); } =20 -int s390_pv_verify(void) +int s390_pv_verify(struct S390PVResponse *pv_resp) { - return s390_pv_cmd(KVM_PV_VERIFY, NULL); + return s390_pv_cmd_pv_resp(KVM_PV_VERIFY, NULL, pv_resp); } =20 void s390_pv_unshare(void) @@ -195,13 +200,29 @@ void s390_pv_unshare(void) s390_pv_cmd_exit(KVM_PV_UNSHARE_ALL, NULL); } =20 -void s390_pv_inject_reset_error(CPUState *cs) +void s390_pv_inject_reset_error(CPUState *cs, + struct S390PVResponse pv_resp) { int r1 =3D (cs->kvm_run->s390_sieic.ipa & 0x00f0) >> 4; CPUS390XState *env =3D &S390_CPU(cs)->env; =20 + union { + struct { + uint16_t pv_cmd; + uint16_t pv_rrc; + uint16_t pv_rc; + uint16_t diag_rc; + }; + uint64_t regs; + } resp =3D { + .pv_cmd =3D pv_resp.cmd, + .pv_rrc =3D pv_resp.rrc, + .pv_rc =3D pv_resp.rc, + .diag_rc =3D DIAG_308_RC_INVAL_FOR_PV + }; + /* Report that we are unable to enter protected mode */ - env->regs[r1 + 1] =3D DIAG_308_RC_INVAL_FOR_PV; + env->regs[r1 + 1] =3D resp.regs; } =20 uint64_t kvm_s390_pv_dmp_get_size_cpu(void) --=20 2.49.0 From nobody Sat Nov 15 22:22:46 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746039070; cv=none; d=zohomail.com; s=zohoarc; b=WASTsKqbCy/4xInlzoRD+6Gr+aPyRx9K1siOvJKMQOj3at5ECxxwYzgNefNpVAew4rKMrtN+fMbPAmQwKt5nNosy0FtDuOnVzkjGTQdEYOya/gNSzAsJ8jEGfDIKF9YHazStF+kketNwlO14TsRAwcVY98nH2ClruB+Rj7vyD6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746039070; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wzRwNk5ModfAEUGVCA6UcUK+5NSudVJb7DLA3CuInMo=; b=gFL340TcMty5LQw++xQXQ0KsRV838d6I49lhnzrhK+741b6dhtHBgcziOlEZsqJu6D3UgOnXgNZPV2M/u7vW3yy93Qc6vrjgYDLahKQkDNKMPBpcX75kzgmDXa0FzdMxetnc1gDfcDJ51dmLqp/WbBQyyI647EZw2OSpbGrpB8E= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746039069995953.6157203644253; Wed, 30 Apr 2025 11:51:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uACWH-0003eN-Jn; Wed, 30 Apr 2025 14:50:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uACWE-0003cp-Uy for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:50:55 -0400 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 1uACWD-0008KS-AL for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:50:54 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-190-yTHhqlyoNqeizH0mV2yVsw-1; Wed, 30 Apr 2025 14:50:49 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2990B19560AA for ; Wed, 30 Apr 2025 18:50:49 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.67]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A83D419560A3; Wed, 30 Apr 2025 18:50:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746039052; 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=wzRwNk5ModfAEUGVCA6UcUK+5NSudVJb7DLA3CuInMo=; b=Q6dZQI5eqh1NU7E4eJtVci2OG4hpXJ79SFYZ3K84qeHEoBuq6KxptcU6y7keT+jLzwk1vz Z+1FFfe0Jv6v9V3b/DUb9KnR1xw6pX43sWDtdry5KpgKb6dNi80tHHX6IatskeeWbmh5uo 0mRIPVqTEH0FO1j6RQkOmF4bVbd8hio= X-MC-Unique: yTHhqlyoNqeizH0mV2yVsw-1 X-Mimecast-MFC-AGG-ID: yTHhqlyoNqeizH0mV2yVsw_1746039049 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 4/9] meson/configure: add 'valgrind' option & --{en, dis}able-valgrind flag Date: Wed, 30 Apr 2025 20:50:30 +0200 Message-ID: <20250430185035.724919-5-thuth@redhat.com> In-Reply-To: <20250430185035.724919-1-thuth@redhat.com> References: <20250430185035.724919-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.0 on 10.30.177.12 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.483, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1746039072946019100 From: Daniel P. Berrang=C3=A9 Currently valgrind debugging support for coroutine stacks is enabled unconditionally when valgrind/valgrind.h is found. There is no way to disable valgrind support if valgrind.h is present in the build env. This is bad for distros, as an dependency far down the chain may cause valgrind.h to become installed, inadvertently enabling QEMU's valgrind debugging support. It also means if a distro wants valgrind support there is no way to mandate this. The solution is to add a 'valgrind' build feature to meson and thus configure script. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Message-ID: <20250425121713.1913424-1-berrange@redhat.com> Signed-off-by: Thomas Huth --- meson.build | 13 ++++++++++++- meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 3 +++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8ae70dbe45a..ccd6c71577d 100644 --- a/meson.build +++ b/meson.build @@ -2618,7 +2618,17 @@ config_host_data.set('CONFIG_FSTRIM', qga_fstrim) # has_header config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h')) config_host_data.set('CONFIG_LINUX_MAGIC_H', cc.has_header('linux/magic.h'= )) -config_host_data.set('CONFIG_VALGRIND_H', cc.has_header('valgrind/valgrind= .h')) +valgrind =3D false +if get_option('valgrind').allowed() + if cc.has_header('valgrind/valgrind.h') + valgrind =3D true + else + if get_option('valgrind').enabled() + error('valgrind requested but valgrind.h not found') + endif + endif +endif +config_host_data.set('CONFIG_VALGRIND_H', valgrind) config_host_data.set('HAVE_BTRFS_H', cc.has_header('linux/btrfs.h')) config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h')) config_host_data.set('HAVE_OPENAT2_H', cc.has_header('linux/openat2.h')) @@ -4905,6 +4915,7 @@ endif if host_os =3D=3D 'darwin' summary_info +=3D {'ParavirtualizedGraphics support': pvg} endif +summary_info +=3D {'valgrind': valgrind} summary(summary_info, bool_yn: true, section: 'Dependencies') =20 if host_arch =3D=3D 'unknown' diff --git a/meson_options.txt b/meson_options.txt index 59d973bca00..0b4115e733a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -115,6 +115,8 @@ option('dbus_display', type: 'feature', value: 'auto', description: '-display dbus support') option('tpm', type : 'feature', value : 'auto', description: 'TPM support') +option('valgrind', type : 'feature', value: 'auto', + description: 'valgrind debug support for coroutine stacks') =20 # Do not enable it by default even for Mingw32, because it doesn't # work on Wine. diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 3e8e00852b2..d76a239130a 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -198,6 +198,7 @@ meson_options_help() { printf "%s\n" ' u2f U2F emulation support' printf "%s\n" ' uadk UADK Library support' printf "%s\n" ' usb-redir libusbredir support' + printf "%s\n" ' valgrind valgrind debug support for coroutine st= acks' printf "%s\n" ' vde vde network backend support' printf "%s\n" ' vdi vdi image format support' printf "%s\n" ' vduse-blk-export' @@ -526,6 +527,8 @@ _meson_option_parse() { --disable-ubsan) printf "%s" -Dubsan=3Dfalse ;; --enable-usb-redir) printf "%s" -Dusb_redir=3Denabled ;; --disable-usb-redir) printf "%s" -Dusb_redir=3Ddisabled ;; + --enable-valgrind) printf "%s" -Dvalgrind=3Denabled ;; + --disable-valgrind) printf "%s" -Dvalgrind=3Ddisabled ;; --enable-vde) printf "%s" -Dvde=3Denabled ;; --disable-vde) printf "%s" -Dvde=3Ddisabled ;; --enable-vdi) printf "%s" -Dvdi=3Denabled ;; --=20 2.49.0 From nobody Sat Nov 15 22:22:46 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746039168; cv=none; d=zohomail.com; s=zohoarc; b=YPZgvEXyZCrVaHytDcjRxqBjF0SchdQ4tdrqq74an8nYKoRdkf6w8mixxRlcMYGViL3bvLFXxc6pSSGM8Ajtqif7yq+DhJqCX6WW94Ea2RKkX48FO/GHVJwffDInijOWB/yyJ7NzR8JWz13VV9+XN2xaA7Giz5Wd/p/viCuKY2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746039168; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ldv+ZvSnaqon49LS8vP/zxr1bNQw7hvkTQu1b24RYhw=; b=LS7/7WcN1N9emjPGQu1GOBTDX581KoWYkokkX1q26V9/46eNfMMn6QAx+OngF2coXQxiS3iQUWMkvpYALu6G9KyyNsklhUic2VzJ8/qB5Lj75Kvu98sZ+f9lqtYhkd51uRH7uFN9Us0epGeNro2iJYHKT6j8TaLFbRmjaVtdzKI= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746039168661906.2229524228708; Wed, 30 Apr 2025 11:52:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uACWI-0003em-Dq; Wed, 30 Apr 2025 14:50:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uACWH-0003e9-0V for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:50:57 -0400 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 1uACWE-0008Kc-VU for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:50:56 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-446-nhYv9ujuOfG_vHLpmMtVAA-1; Wed, 30 Apr 2025 14:50:52 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C36BE1800984; Wed, 30 Apr 2025 18:50:51 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.67]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C334919560A3; Wed, 30 Apr 2025 18:50:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746039054; 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=ldv+ZvSnaqon49LS8vP/zxr1bNQw7hvkTQu1b24RYhw=; b=Hr0agMS8ilmhHeLWPlJXcfVwnZbsl3AuxspurvKrVBSYPEGI6O1U1DJacu5NO8kbv2UcbA zmdDsTvYsswqNKv7HYSjnx2IadrCzAiBSe0igH4E/swEIL4+NLJcy+TidxHAVsEFav/xep fK6e+lSOcgte5nC+xBhR9AFtkVK79jc= X-MC-Unique: nhYv9ujuOfG_vHLpmMtVAA-1 X-Mimecast-MFC-AGG-ID: nhYv9ujuOfG_vHLpmMtVAA_1746039051 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 5/9] Drop support for Python 3.8 Date: Wed, 30 Apr 2025 20:50:31 +0200 Message-ID: <20250430185035.724919-6-thuth@redhat.com> In-Reply-To: <20250430185035.724919-1-thuth@redhat.com> References: <20250430185035.724919-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.0 on 10.30.177.12 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.483, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1746039172299019100 From: Thomas Huth Python 3.8 went "end of life" in October 2024 and Fedora 42 dropped this version already, so the "python" CI job is currently failing. Thus it's time to drop support for this Python version in QEMU, too. While we're at it, also look for "python3.13" in the configure script. Message-ID: <20250425120710.879518-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- docs/about/build-platforms.rst | 2 +- configure | 14 +++++++------- python/Makefile | 8 ++++---- python/setup.cfg | 7 +++---- python/tests/minreqs.txt | 2 +- scripts/qapi/mypy.ini | 2 +- tests/docker/dockerfiles/python.docker | 1 - 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/docs/about/build-platforms.rst b/docs/about/build-platforms.rst index 52521552c8a..c3651871d20 100644 --- a/docs/about/build-platforms.rst +++ b/docs/about/build-platforms.rst @@ -101,7 +101,7 @@ Python runtime option of the ``configure`` script to point QEMU to a supported version of the Python runtime. =20 - As of QEMU |version|, the minimum supported version of Python is 3.8. + As of QEMU |version|, the minimum supported version of Python is 3.9. =20 Python build dependencies Some of QEMU's build dependencies are written in Python. Usually these diff --git a/configure b/configure index 000309cf610..40705afdf57 100755 --- a/configure +++ b/configure @@ -540,17 +540,17 @@ if test -n "$linux_arch" && ! test -d "$source_path/l= inux-headers/asm-$linux_arc fi =20 check_py_version() { - # We require python >=3D 3.8. + # We require python >=3D 3.9. # NB: a True python conditional creates a non-zero return code (Failur= e) - "$1" -c 'import sys; sys.exit(sys.version_info < (3,8))' + "$1" -c 'import sys; sys.exit(sys.version_info < (3,9))' } =20 first_python=3D if test -z "${PYTHON}"; then # A bare 'python' is traditionally python 2.x, but some distros # have it as python 3.x, so check in both places. - for binary in python3 python python3.12 python3.11 \ - python3.10 python3.9 python3.8; do + for binary in python3 python python3.13 python3.12 python3.11 \ + python3.10 python3.9 ; do if has "$binary"; then python=3D$(command -v "$binary") if check_py_version "$python"; then @@ -933,7 +933,7 @@ then # If first_python is set, there was a binary somewhere even though # it was not suitable. Use it for the error message. if test -n "$first_python"; then - error_exit "Cannot use '$first_python', Python >=3D 3.8 is require= d." \ + error_exit "Cannot use '$first_python', Python >=3D 3.9 is require= d." \ "Use --python=3D/path/to/python to specify a supported Python." else error_exit "Python not found. Use --python=3D/path/to/python" @@ -941,11 +941,11 @@ then fi =20 if ! check_py_version "$python"; then - error_exit "Cannot use '$python', Python >=3D 3.8 is required." \ + error_exit "Cannot use '$python', Python >=3D 3.9 is required." \ "Use --python=3D/path/to/python to specify a supported Python= ." \ "Maybe try:" \ " openSUSE Leap 15.3+: zypper install python39" \ - " CentOS 8: dnf install python38" + " CentOS: dnf install python3.12" fi =20 # Resolve PATH diff --git a/python/Makefile b/python/Makefile index 1fa4ba2498e..764b79ccb23 100644 --- a/python/Makefile +++ b/python/Makefile @@ -9,13 +9,13 @@ help: @echo "make check-minreqs:" @echo " Run tests in the minreqs virtual environment." @echo " These tests use the oldest dependencies." - @echo " Requires: Python 3.8" - @echo " Hint (Fedora): 'sudo dnf install python3.8'" + @echo " Requires: Python 3.9" + @echo " Hint (Fedora): 'sudo dnf install python3.9'" @echo "" @echo "make check-tox:" @echo " Run tests against multiple python versions." @echo " These tests use the newest dependencies." - @echo " Requires: Python 3.8 - 3.11, and tox." + @echo " Requires: Python 3.9 - 3.11, and tox." @echo " Hint (Fedora): 'sudo dnf install python3-tox python3.11'" @echo " The variable QEMU_TOX_EXTRA_ARGS can be use to pass extra" @echo " arguments to tox". @@ -59,7 +59,7 @@ PIP_INSTALL =3D pip install --disable-pip-version-check min-venv: $(QEMU_MINVENV_DIR) $(QEMU_MINVENV_DIR)/bin/activate $(QEMU_MINVENV_DIR) $(QEMU_MINVENV_DIR)/bin/activate: setup.cfg tests/minr= eqs.txt @echo "VENV $(QEMU_MINVENV_DIR)" - @python3.8 -m venv $(QEMU_MINVENV_DIR) + @python3.9 -m venv $(QEMU_MINVENV_DIR) @( \ echo "ACTIVATE $(QEMU_MINVENV_DIR)"; \ . $(QEMU_MINVENV_DIR)/bin/activate; \ diff --git a/python/setup.cfg b/python/setup.cfg index cf5af7e6641..c48dff280a3 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -14,7 +14,6 @@ classifiers =3D Natural Language :: English Operating System :: OS Independent Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 @@ -23,7 +22,7 @@ classifiers =3D Typing :: Typed =20 [options] -python_requires =3D >=3D 3.8 +python_requires =3D >=3D 3.9 packages =3D qemu.qmp qemu.machine @@ -78,7 +77,7 @@ exclude =3D __pycache__, =20 [mypy] strict =3D True -python_version =3D 3.8 +python_version =3D 3.9 warn_unused_configs =3D True namespace_packages =3D True warn_unused_ignores =3D False @@ -186,7 +185,7 @@ multi_line_output=3D3 # of python available on your system to run this test. =20 [tox:tox] -envlist =3D py38, py39, py310, py311, py312, py313 +envlist =3D py39, py310, py311, py312, py313 skip_missing_interpreters =3D true =20 [testenv] diff --git a/python/tests/minreqs.txt b/python/tests/minreqs.txt index a3f423efd84..6445407ba87 100644 --- a/python/tests/minreqs.txt +++ b/python/tests/minreqs.txt @@ -1,5 +1,5 @@ # This file lists the ***oldest possible dependencies*** needed to run -# "make check" successfully under ***Python 3.8***. It is used primarily +# "make check" successfully under ***Python 3.9***. It is used primarily # by GitLab CI to ensure that our stated minimum versions in setup.cfg # are truthful and regularly validated. # diff --git a/scripts/qapi/mypy.ini b/scripts/qapi/mypy.ini index 8109470a031..c9dbcec2db0 100644 --- a/scripts/qapi/mypy.ini +++ b/scripts/qapi/mypy.ini @@ -1,4 +1,4 @@ [mypy] strict =3D True disallow_untyped_calls =3D False -python_version =3D 3.8 +python_version =3D 3.9 diff --git a/tests/docker/dockerfiles/python.docker b/tests/docker/dockerfi= les/python.docker index 8f0af9ef25f..59e70a02484 100644 --- a/tests/docker/dockerfiles/python.docker +++ b/tests/docker/dockerfiles/python.docker @@ -15,7 +15,6 @@ ENV PACKAGES \ python3.11 \ python3.12 \ python3.13 \ - python3.8 \ python3.9 =20 RUN dnf install -y $PACKAGES --=20 2.49.0 From nobody Sat Nov 15 22:22:46 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746039068; cv=none; d=zohomail.com; s=zohoarc; b=iaX4gi1WFZJ4WLQ6Fanms2maKuDcWNGUBOWFtA0P/tWaQfKld5qK6pzIY9UgA5t7n4TzVCv7fF/B24y8sXazr1l3X8/amvONdtNfFQwcXOZOmPRHlgHw+mQx3g/jvPIatOr9OGl0p97b3K/Zvklt5fJCOe4YYfqEDp6iVizXGag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746039068; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yE+Dy3KSzP7hqd2P27FXKfvA+IPbYGVyZC5yv2AnfkE=; b=bXGHUcGKrdgYfxCEsypzrTiDZR82GduQmkQFdMJH7599OmAfltr/4dcYrxSHA6dYLT8asvj1seMBeINO7mEV3Fdev9iM7FiNtPe0MLSNO+tXDdcK9jF5kwZj8xcT1GrBZX13mPOv5O+vKFNLziaKVThAk60vBq0ktmoOkHtfZ/M= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746039068631673.3645384118156; Wed, 30 Apr 2025 11:51:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uACWK-0003iE-Kr; Wed, 30 Apr 2025 14:51:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uACWI-0003eq-Jc for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:50:58 -0400 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 1uACWH-0008Kn-3i for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:50:58 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-472-DotMhijkPq6TZPOChEJOzQ-1; Wed, 30 Apr 2025 14:50:55 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 025B819560AE; Wed, 30 Apr 2025 18:50:54 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.67]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 624BD19560A3; Wed, 30 Apr 2025 18:50:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746039056; 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=yE+Dy3KSzP7hqd2P27FXKfvA+IPbYGVyZC5yv2AnfkE=; b=HkZzYTgrmlSc0DDcL6z+xY1UsY2L3EqqRl8e/pIr5IZXlTxwd0tYcYa+DXwiLzGWzB7UNp krr7H04ZIyXPiIbzF0xBv+rhRZEAL12d3kRqIgsMYKWfHtZ2TmFzeAh7i1r/pAWXvlhQgf pBUx+l0J2crNxiXmHWhuAD2z19wCNSM= X-MC-Unique: DotMhijkPq6TZPOChEJOzQ-1 X-Mimecast-MFC-AGG-ID: DotMhijkPq6TZPOChEJOzQ_1746039054 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Harsh Prateek Bora Subject: [PULL 6/9] tests/functional/test_ppc64_pseries: Skip test_ppc64_linux_smt_boot if necessary Date: Wed, 30 Apr 2025 20:50:32 +0200 Message-ID: <20250430185035.724919-7-thuth@redhat.com> In-Reply-To: <20250430185035.724919-1-thuth@redhat.com> References: <20250430185035.724919-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.483, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1746039070893019100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The test_ppc64_linux_smt_boot function lacks the set_machine('pseries'), so this test is currently failing in case the 'pseries' machine has not been compiled into the binary. Add the check now to fix it. Message-ID: <20250424085426.663377-1-thuth@redhat.com> Reviewed-by: Harsh Prateek Bora Signed-off-by: Thomas Huth --- tests/functional/test_ppc64_pseries.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/functional/test_ppc64_pseries.py b/tests/functional/test= _ppc64_pseries.py index fdc404ed033..67057934e8d 100755 --- a/tests/functional/test_ppc64_pseries.py +++ b/tests/functional/test_ppc64_pseries.py @@ -63,6 +63,7 @@ def test_ppc64_linux_hpt_smp_boot(self): wait_for_console_pattern(self, self.good_message, self.panic_messa= ge) =20 def test_ppc64_linux_smt_boot(self): + self.set_machine('pseries') self.vm.add_args('-smp', '4,threads=3D4') self.do_test_ppc64_linux_boot() console_pattern =3D 'CPU maps initialized for 4 threads per core' --=20 2.49.0 From nobody Sat Nov 15 22:22:46 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746039096; cv=none; d=zohomail.com; s=zohoarc; b=Zdxsr8j+KOXYM4WbVHF7j143XMGJFkyy5P0o+hQnK4XFNqExnNsdyMVH7P9LYWEcmZ6+6OLxHw0maf7YnLJWOgAFVI8vRyU1JwLjSjBNSMLdhEHujmj0N9rG4KxzIcXig2OIX8dysVdwbnSnaN63/lZTiT7InA8ylYurSmNWO4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746039096; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LZvW2RNky95DizNFkoHrcOHvUETO94KZq32Qqt4f62s=; b=enzW7caWNE0TcAnHafn19KTh7u6ByL5IsMUAoz1WSbSSqjenqZHXs0YpfKXW1Cb1p50paSsremlHmTG7YjY67RhED/wnoZ3dMnG7UZK7j6Y3yf9JrJQXkDSKVi5jn7KMLVnWuJ8ioUh8h1TUF7KyyMqZWuypffWcVMkCtX8CVbg= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746039096941356.7504821439786; Wed, 30 Apr 2025 11:51:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uACWO-0003rj-FQ; Wed, 30 Apr 2025 14:51:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uACWN-0003oH-AD for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:51:03 -0400 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 1uACWL-0008LA-NV for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:51:03 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-691-SvkHwoCfO52CUvkJlTSkcw-1; Wed, 30 Apr 2025 14:50:57 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5249D180036F; Wed, 30 Apr 2025 18:50:56 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.67]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 78ADA19560A3; Wed, 30 Apr 2025 18:50:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746039061; 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=LZvW2RNky95DizNFkoHrcOHvUETO94KZq32Qqt4f62s=; b=Xh2vekSjnDr1MlVkEnFUpcBUv5fWretJW6ta1aX1AMmwoqv7fNoA+sOelRPCdthP6TPGLm 1EjcmVsxVWVhw6QQ4RovwM2+T515/2tXVJqA3OJM15HEQEJ77oZ2kBBRyaeB/hMuBiCNMv V20VpgAM52IhJ6kjAlFmG1kQcv9ln7E= X-MC-Unique: SvkHwoCfO52CUvkJlTSkcw-1 X-Mimecast-MFC-AGG-ID: SvkHwoCfO52CUvkJlTSkcw_1746039056 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 7/9] meson.build: Put the D-Bus summary into the UI section Date: Wed, 30 Apr 2025 20:50:33 +0200 Message-ID: <20250430185035.724919-8-thuth@redhat.com> In-Reply-To: <20250430185035.724919-1-thuth@redhat.com> References: <20250430185035.724919-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.0 on 10.30.177.12 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.483, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1746039098951019100 From: Thomas Huth We've got a dedicated section for UI options nowadays, so the D-Bus display should get reported here, too. Message-ID: <20250325055125.253669-1-thuth@redhat.com> Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Thomas Huth --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ccd6c71577d..6c61e1dcaec 100644 --- a/meson.build +++ b/meson.build @@ -4619,7 +4619,6 @@ summary_info +=3D {'Trace backends': ','.join(get_= option('trace_backends'))} if 'simple' in get_option('trace_backends') summary_info +=3D {'Trace output file': get_option('trace_file') + '-'} endif -summary_info +=3D {'D-Bus display': dbus_display} summary_info +=3D {'QOM debugging': get_option('qom_cast_debug')} summary_info +=3D {'Relocatable install': get_option('relocatable')} summary_info +=3D {'vhost-kernel support': have_vhost_kernel} @@ -4802,6 +4801,7 @@ summary_info =3D {} if host_os =3D=3D 'darwin' summary_info +=3D {'Cocoa support': cocoa} endif +summary_info +=3D {'D-Bus display': dbus_display} summary_info +=3D {'SDL support': sdl} summary_info +=3D {'SDL image support': sdl_image} summary_info +=3D {'GTK support': gtk} --=20 2.49.0 From nobody Sat Nov 15 22:22:46 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746039124; cv=none; d=zohomail.com; s=zohoarc; b=cL5tsqEEQkPXR2lmjWO0AHC4AS47WGSQi96atuYk4lhU6a7ggPJE6wG01ZPL1TDunrYtPN51QBZlN1dKOlKKribSNfFjdHehbMxSsP25tuHWFt5jroKv6VZGQRREFbM7XKHnucNsUZl/X3F9UbiT9V9rIPNoZzyH+qpCOb3mF5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746039124; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FGMmWQoDu0O44Khh2IplYBQXTQMrVHQxvhNgACgHD6s=; b=cg4bg1z2uhp9lCw8Mx0p+znII3S1gISghJxima5XCkGwQky0AKUZfi758Gc7Uyax2mUsQcSBO6fp1Z+jK3hhPpa+9Z4wyz5YkWtsmsWHb4eV+ekvflrkmME/f7nu4C00ndGOFcXN8m8LuXQa45Lh1uA/EiExe4TeZAc2P6CFv8g= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746039124825472.0760854219369; Wed, 30 Apr 2025 11:52:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uACWR-0003yo-KJ; Wed, 30 Apr 2025 14:51:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uACWP-0003tv-J5 for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:51:05 -0400 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 1uACWN-0008LJ-V1 for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:51:05 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-359-79j4yoelPomgWdzlEF3-LA-1; Wed, 30 Apr 2025 14:50:59 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8B9E21956086; Wed, 30 Apr 2025 18:50:58 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.67]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C91AA19560A3; Wed, 30 Apr 2025 18:50:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746039063; 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=FGMmWQoDu0O44Khh2IplYBQXTQMrVHQxvhNgACgHD6s=; b=YoQcF3r1PME9Kqdmu0gejmIiwE3NW1WuWZARk16IvY9iKDVEHOEe8yf+Faj0FSGb2ZBlzJ HdQ9OkqLyvHii5zydDe3BHQLcIeyooKBWUmKvVfsOfLYfXiHIZAH4UpLMhEckAU2Pnt4tR oepbc0bxkt7VQsuj7EXfinj2WLHQhq8= X-MC-Unique: 79j4yoelPomgWdzlEF3-LA-1 X-Mimecast-MFC-AGG-ID: 79j4yoelPomgWdzlEF3-LA_1746039058 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabiano Rosas Subject: [PULL 8/9] hw/rtc/mc146818rtc: Drop pre-v3 migration stream support Date: Wed, 30 Apr 2025 20:50:34 +0200 Message-ID: <20250430185035.724919-9-thuth@redhat.com> In-Reply-To: <20250430185035.724919-1-thuth@redhat.com> References: <20250430185035.724919-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.0 on 10.30.177.12 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.483, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1746039126966019000 From: Philippe Mathieu-Daud=C3=A9 mc146818rtc's migration stream is at version 3 since commit 56038ef6234 ("RTC: Update the RTC clock only when reading it") from 12 years ago, released in QEMU v1.3.0! No versioned machines are that old, we can safely remove support for older streams and the qdev_set_legacy_instance_id() call. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Fabiano Rosas Message-ID: <20250115210048.25396-1-philmd@linaro.org> Signed-off-by: Thomas Huth --- hw/rtc/mc146818rtc.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index 6f787be7af8..f9f5cf396f0 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -819,7 +819,7 @@ static const VMStateDescription vmstate_rtc_irq_reinjec= t_on_ack_count =3D { static const VMStateDescription vmstate_rtc =3D { .name =3D "mc146818rtc", .version_id =3D 3, - .minimum_version_id =3D 1, + .minimum_version_id =3D 3, .pre_save =3D rtc_pre_save, .post_load =3D rtc_post_load, .fields =3D (const VMStateField[]) { @@ -829,13 +829,13 @@ static const VMStateDescription vmstate_rtc =3D { VMSTATE_TIMER_PTR(periodic_timer, MC146818RtcState), VMSTATE_INT64(next_periodic_time, MC146818RtcState), VMSTATE_UNUSED(3*8), - VMSTATE_UINT32_V(irq_coalesced, MC146818RtcState, 2), - VMSTATE_UINT32_V(period, MC146818RtcState, 2), - VMSTATE_UINT64_V(base_rtc, MC146818RtcState, 3), - VMSTATE_UINT64_V(last_update, MC146818RtcState, 3), - VMSTATE_INT64_V(offset, MC146818RtcState, 3), - VMSTATE_TIMER_PTR_V(update_timer, MC146818RtcState, 3), - VMSTATE_UINT64_V(next_alarm_time, MC146818RtcState, 3), + VMSTATE_UINT32(irq_coalesced, MC146818RtcState), + VMSTATE_UINT32(period, MC146818RtcState), + VMSTATE_UINT64(base_rtc, MC146818RtcState), + VMSTATE_UINT64(last_update, MC146818RtcState), + VMSTATE_INT64(offset, MC146818RtcState), + VMSTATE_TIMER_PTR(update_timer, MC146818RtcState), + VMSTATE_UINT64(next_alarm_time, MC146818RtcState), VMSTATE_END_OF_LIST() }, .subsections =3D (const VMStateDescription * const []) { @@ -929,8 +929,6 @@ static void rtc_realizefn(DeviceState *dev, Error **err= p) memory_region_add_subregion(&s->io, 0, &s->coalesced_io); memory_region_add_coalescing(&s->coalesced_io, 0, 1); =20 - qdev_set_legacy_instance_id(dev, s->io_base, 3); - object_property_add_tm(OBJECT(s), "date", rtc_get_date); =20 qdev_init_gpio_out(dev, &s->irq, 1); --=20 2.49.0 From nobody Sat Nov 15 22:22:46 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746039124; cv=none; d=zohomail.com; s=zohoarc; b=OAK5ykpfDtMoFMksrLE0bMX2weMooP/dalNqpjP2Gz3DOJ7uVwbXqmBzzKrhZDC1R4rbOz2xDom6b2X3Uu8sl4BwQHhz1oDV3dR/hSsh2R+uHcpwLrlE5qcwpI0Ej4ruPXnC4QqBZK/kiH9ZrY9XJdytNqwGgBGTlGGDwpcgFF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746039124; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=H4DQGq/ACwgmOUzYeQSsZ/Bpcpk/DTfLt8SZX0de2w0=; b=ZV++n6m3z981ylX+yL5i0CYoIfN0ZJdPWzqzFg4W2Sm/HRaecxF3Wma4YNHmzfb3sAE/Y0bbKLgvoNHzIMJtX7SHIPYo23jZrrd7bHia1cFPLVY4Hx3CO+FnZgEj+NGKdus0ea7cf8ziTXKoCHPGPe3Ffo3BL38uuofypF1cKBE= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746039124772692.6017210358236; Wed, 30 Apr 2025 11:52:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uACWU-000459-9w; Wed, 30 Apr 2025 14:51:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uACWQ-0003ws-PT for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:51:06 -0400 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 1uACWO-0008LV-SV for qemu-devel@nongnu.org; Wed, 30 Apr 2025 14:51:06 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-136-5sXdg3OmMeeSbYWlqoLYhw-1; Wed, 30 Apr 2025 14:51:02 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 20CC919560AD; Wed, 30 Apr 2025 18:51:01 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.67]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3F2B719560A3; Wed, 30 Apr 2025 18:50:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746039064; 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=H4DQGq/ACwgmOUzYeQSsZ/Bpcpk/DTfLt8SZX0de2w0=; b=PLqo1usAIOnXCfm9pUy6cOU3mNkJBeMukQltqzj4xMOy2hmJjqlzF3jFLTGVDmR5wtOr9D xJ9Izw54dw73NHtmDvB/3BYvbExcUHW4WnA8AQyX0xduyp0aXoP7bwrBLageBXDSxL/Xkn el0AywDZ5pH3EPH6x5UcKuzX+b0yFyw= X-MC-Unique: 5sXdg3OmMeeSbYWlqoLYhw-1 X-Mimecast-MFC-AGG-ID: 5sXdg3OmMeeSbYWlqoLYhw_1746039061 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Pierrick Bouvier Subject: [PULL 9/9] docs/devel/build-environment: enhance MSYS2 instructions Date: Wed, 30 Apr 2025 20:50:35 +0200 Message-ID: <20250430185035.724919-10-thuth@redhat.com> In-Reply-To: <20250430185035.724919-1-thuth@redhat.com> References: <20250430185035.724919-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.483, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1746039126930019000 Content-Type: text/plain; charset="utf-8" From: Pierrick Bouvier Add missing prerequisite packages, and use more explicit makepkg command. Signed-off-by: Pierrick Bouvier Message-ID: <20250430181047.2043492-1-pierrick.bouvier@linaro.org> Signed-off-by: Thomas Huth --- docs/devel/build-environment.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/devel/build-environment.rst b/docs/devel/build-environmen= t.rst index f133ef2e012..661f6ea8504 100644 --- a/docs/devel/build-environment.rst +++ b/docs/devel/build-environment.rst @@ -97,11 +97,11 @@ build QEMU in MSYS2 itself. =20 :: =20 - pacman -S wget + pacman -S wget base-devel git wget https://raw.githubusercontent.com/msys2/MINGW-packages/refs/heads= /master/mingw-w64-qemu/PKGBUILD # Some packages may be missing for your environment, installation will= still # be done though. - makepkg -s PKGBUILD || true + makepkg --syncdeps --nobuild PKGBUILD || true =20 Build on windows-aarch64 ++++++++++++++++++++++++ --=20 2.49.0