From nobody Sun Jun 7 22:19:01 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1780671479; cv=none; d=zohomail.com; s=zohoarc; b=CuYJFDhNQ/Zh3u+NSibxND3QwX7O/EJqAAPZ9wsD3wlz9ODv/gSZDU0sgqJCAWctEo2+ObpZocCwbLds0DWTBhJsKyLGybm+KSGINvGDdIKSsQE1N3rauVUhwtYXxJrGSrVGfgmXkUJog5AVnYOC48HMLBOrcSqwWbcjpUYmHE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780671479; 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=IK2zUvZzYstfygcBmDiaz9MR1+tuQ5L5vdZXT9nUUd0=; b=NRPTnh0C//O8n5fxQBSF3eT3muRH+7Q6yrv+n9poj/mB62zvn+QhmCgMi892rRhdGBJ6Flp3ZIU9jAF+etaJViPSpeh/cT5vadJFLX2hwvvOsX5H/1RpgfBaB6RpBpBAnNtnIlsXqxTIy/l6SzQJz1sPuRq9k8F2QipKMmo5pc0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1780671479056375.955963326208; Fri, 5 Jun 2026 07:57:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wVVyp-000286-Nm; Fri, 05 Jun 2026 10:57:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wVVyo-00026w-I5 for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57:02 -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 1wVVym-0005O8-SE for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57:02 -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-653-ilsdAcdBOyeAwp1G5FMHsg-1; Fri, 05 Jun 2026 10:56:58 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 E616518001F9; Fri, 5 Jun 2026 14:56:56 +0000 (UTC) Received: from gondolin.redhat.com (unknown [10.44.48.119]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 109D0180049F; Fri, 5 Jun 2026 14:56:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780671420; 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=IK2zUvZzYstfygcBmDiaz9MR1+tuQ5L5vdZXT9nUUd0=; b=gvZMV1/SOC3Sb051239HVxwLRek7YxwMAK9UhbPDbILxUDUZG/14jZ7SX91CnHB5uk6R1a I7Il31Km1Sg9ADFsxnmButjF5d5Di7tLfOln3zX7Buk/wY2RKsBKJS5Y40jTfPmaeOu9Py ZLV2ASaKRTZWgPsk5LHwyp5ipa7KPnE= X-MC-Unique: ilsdAcdBOyeAwp1G5FMHsg-1 X-Mimecast-MFC-AGG-ID: ilsdAcdBOyeAwp1G5FMHsg_1780671417 From: Cornelia Huck To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Thomas Huth , Farhan Ali , Matthew Rosato , Cornelia Huck Subject: [PULL 1/7] hw/s390x: Fix memory leaks after removing elements with QTAILQ_REMOVE Date: Fri, 5 Jun 2026 16:56:41 +0200 Message-ID: <20260605145647.272621-2-cohuck@redhat.com> In-Reply-To: <20260605145647.272621-1-cohuck@redhat.com> References: <20260605145647.272621-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: qemu development 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: 1780671480505154100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The elements that get removed with QTAILQ_REMOVE are never referenced afterwards anymore, so the corresponding memory should get freed. Fixes: 37fa32de70 ("s390x/pci: Honor DMA limits set by vfio") Reviewed-by: Farhan Ali Signed-off-by: Thomas Huth Reviewed-by: Matthew Rosato Tested-by: Matthew Rosato Message-ID: <20260511063825.53633-1-thuth@redhat.com> Signed-off-by: Cornelia Huck --- hw/s390x/s390-pci-vfio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c index 7c754b656da0..db6de00bd285 100644 --- a/hw/s390x/s390-pci-vfio.c +++ b/hw/s390x/s390-pci-vfio.c @@ -101,6 +101,7 @@ void s390_pci_end_dma_count(S390pciState *s, S390PCIDMA= Count *cnt) cnt->users--; if (cnt->users =3D=3D 0) { QTAILQ_REMOVE(&s->zpci_dma_limit, cnt, link); + g_free(cnt); } } =20 --=20 2.54.0 From nobody Sun Jun 7 22:19:01 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1780671497; cv=none; d=zohomail.com; s=zohoarc; b=oJVIjDO4KVZo7F8AWy+7Z7xsPwRaK5SbtwP7kvvdKvi31kKrtO9QYZ0ymxbo4V0VV/vgGjpPqWMmioO6+BBPCYknB05GYJeMfOVoztHHeMCGIXI56Qjy+s38RiaIle1GYJOsPBQi92UgdjvX/Fojk+fd2Ls4mJVMs+1nfDCaAU0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780671497; 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=irnikjkMIeigUjbODCJXw4z7kWUOW7SYpDpm+2y9lvg=; b=d4PSjscd8ROjsrcZcBxPG+25R6hon8RSVu08OjAN8p//VyPxIRylqJY7tlAO5oIbY6YMz8N5UDbRwMYQ+X05DZ2cdLn8jm3uY7UNut/NLgqruz76KNo16YCF5g/U3HCYQX2E2aL4nKloK0jEWlJ86U9nqy0wYrkiA8VWEjurozU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1780671497955599.912726420956; Fri, 5 Jun 2026 07:58:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wVVyv-0002Hh-3v; Fri, 05 Jun 2026 10:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wVVys-0002Cg-JT for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57: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 1wVVyq-0005Pt-PR for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57:06 -0400 Received: from mx-prod-mc-01.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-652-WYBulYjhPXqrO73JhXnPig-1; Fri, 05 Jun 2026 10:57:00 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6BDDE1956096; Fri, 5 Jun 2026 14:56:59 +0000 (UTC) Received: from gondolin.redhat.com (unknown [10.44.48.119]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5B80B180049F; Fri, 5 Jun 2026 14:56:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780671424; 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=irnikjkMIeigUjbODCJXw4z7kWUOW7SYpDpm+2y9lvg=; b=ejFy15eBthrzoenUt+7bClKVMZiMiel01A0i8UmzgmGtcMMb2rzlznksn8axelUSuaegtI pVSWGacTBmG4Vfq0gPVagbHivug+a6Yfscp9U5YVRgBGGrLUfBPrl6ImzwGutbwcbFLPKs Y6rn8YBfZdK3FgFIddxN2DUHsIzQhM4= X-MC-Unique: WYBulYjhPXqrO73JhXnPig-1 X-Mimecast-MFC-AGG-ID: WYBulYjhPXqrO73JhXnPig_1780671419 From: Cornelia Huck To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Alexandra Winter , Hendrik Brueckner , Christian Borntraeger , Gautam Gala , Cornelia Huck Subject: [PULL 2/7] target/s390x: Make container ids in SysIB_15x 1-based Date: Fri, 5 Jun 2026 16:56:42 +0200 Message-ID: <20260605145647.272621-3-cohuck@redhat.com> In-Reply-To: <20260605145647.272621-1-cohuck@redhat.com> References: <20260605145647.272621-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1780671499030154100 Content-Type: text/plain; charset="utf-8" From: Alexandra Winter The Container Id in a container-type TLE of SysIB_15x is defined as 8-bit unsigned nonzero integer. Make stsi fc 15 emulation architecture compliant, by starting the container ids at 1 for the lowest numbered container. The qemu misbehaviour without this patch becomes obvious due to a recently proposed kernel fix. Older linux kernels pass the container ids from stsi fc15 unchanged to sysfs, i.e. starting at 1 on s390 hardware. This resulted in off-by-one values when compared to the values from HMC. A Linux kernel fix is being proposed to correct the sysfs topology ids by -1, so they start at 0, e.g. when displayed by 'lscpu -ye'. In case a KVM guest with a fixed kernel runs on a host with a qemu without this fix, this can result in container ids erroneously being shown as 255. Example (Fixed guest on unfixed qemu): $ lscpu -ye CPU NODE DRAWER BOOK SOCKET CORE L1d:L1i:L2 ONLINE CONFIGURED POLARIZATION = ADDRESS 0 0 255 255 255 0 0:0:0 yes yes vert-medium 0 1 0 255 255 0 1 1:1:1 yes yes vert-medium 1 After this fix: $ lscpu -ye CPU NODE DRAWER BOOK SOCKET CORE L1d:L1i:L2 ONLINE CONFIGURED POLARIZATION = ADDRESS 0 0 0 0 0 0 0:0:0 yes yes vert-medium 0 1 0 0 0 1 1 1:1:1 yes yes vert-medium 1 Fixes: f4f54b582f ("target/s390x/cpu topology: handle STSI(15) and build th= e SYSIB") Signed-off-by: Alexandra Winter Acked-by: Hendrik Brueckner Acked-by: Christian Borntraeger Reviewed-by: Gautam Gala Message-ID: <20260511134909.43802-1-wintera@linux.ibm.com> Signed-off-by: Cornelia Huck --- target/s390x/kvm/stsi-topology.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/s390x/kvm/stsi-topology.c b/target/s390x/kvm/stsi-topol= ogy.c index 301d41b68d2e..afd00da0e68b 100644 --- a/target/s390x/kvm/stsi-topology.c +++ b/target/s390x/kvm/stsi-topology.c @@ -90,9 +90,9 @@ static int stsi_topology_fill_sysib(S390TopologyList *top= ology_list, int last_drawer =3D -1; int last_book =3D -1; int last_socket =3D -1; - int drawer_id =3D 0; - int book_id =3D 0; - int socket_id =3D 0; + int drawer_id =3D 1; + int book_id =3D 1; + int socket_id =3D 1; int n =3D sizeof(SysIB_151x); =20 QTAILQ_FOREACH(entry, topology_list, next) { @@ -103,12 +103,12 @@ static int stsi_topology_fill_sysib(S390TopologyList = *topology_list, if (level > 3 && drawer_change) { SYSIB_GUARD(n, sizeof(SYSIBContainerListEntry)); p =3D fill_container(p, 3, drawer_id++); - book_id =3D 0; + book_id =3D 1; } if (level > 2 && book_change) { SYSIB_GUARD(n, sizeof(SYSIBContainerListEntry)); p =3D fill_container(p, 2, book_id++); - socket_id =3D 0; + socket_id =3D 1; } if (socket_change) { SYSIB_GUARD(n, sizeof(SYSIBContainerListEntry)); --=20 2.54.0 From nobody Sun Jun 7 22:19:01 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1780671480; cv=none; d=zohomail.com; s=zohoarc; b=NWl8vPG3bFhaomhG/54XUgHIPScNqeL7q9qQRGnvVBUf2y23/dexBhCnMpnyKzHYv0Sjf04kSqManuuuT5u0SVbyPf6CJzDoSSSxN0d1oM/nKGpQ2tJJyad94EsmhjMeEH0XWMxDS9ZvObwc41xy8FuF5hpDZrLg+Utdj3iJ7CE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780671480; 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=1H54cbYr+2kxG39h62zVmDx+o5zE08Ape6GxPEWxv2M=; b=M8+PJp9c56iU/I2GMJCmo8NYW1FWqIVQ+tdm/utWbTaV+SwJ3vKeaRYwcGC5OqrJZSUMWUkNTB94shTON3pwnNm0gIYPb9mwD8wIGOMUzyJ97XUuWbi2oXPridrmDL5DVUNLKXdsFRkCf9TkHXHjwn0KDC3BMmq1QsPI2qCfPUc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1780671480505492.6555054897998; Fri, 5 Jun 2026 07:58:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wVVyx-0002Lm-7X; Fri, 05 Jun 2026 10:57:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wVVyv-0002I0-2N for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57:09 -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 1wVVyt-0005RT-G5 for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57:08 -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-187-zeqxYuc3NdWULbKdLmFwnQ-1; Fri, 05 Jun 2026 10:57:02 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 775E419560A7; Fri, 5 Jun 2026 14:57:01 +0000 (UTC) Received: from gondolin.redhat.com (unknown [10.44.48.119]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D5853180049F; Fri, 5 Jun 2026 14:56:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780671426; 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=1H54cbYr+2kxG39h62zVmDx+o5zE08Ape6GxPEWxv2M=; b=Ae/o5a4S7hbEPwCOVAOWyvg1VSq3nk0TpVW3TS9eTtanR+Hm+SOxSNvTTIN5XgEc7q0Kmz EFsmSjXbaqz6yrULuJYWDkFSzinqAKJ1zQMdeKFdbGlBl1AXwjRpwixLI4Yc8Lj/Zmjxjx HaKOwwUnZEIaCnuoJ6FfBkWgCowl3Eo= X-MC-Unique: zeqxYuc3NdWULbKdLmFwnQ-1 X-Mimecast-MFC-AGG-ID: zeqxYuc3NdWULbKdLmFwnQ_1780671421 From: Cornelia Huck To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Jaehoon Kim , Matthew Rosato , Cornelia Huck Subject: [PULL 3/7] hw/s390x/ccw: Mark virtio-pci disable-legacy property as optional Date: Fri, 5 Jun 2026 16:56:43 +0200 Message-ID: <20260605145647.272621-4-cohuck@redhat.com> In-Reply-To: <20260605145647.272621-1-cohuck@redhat.com> References: <20260605145647.272621-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1780671481420158500 Content-Type: text/plain; charset="utf-8" From: Jaehoon Kim The s390-ccw-virtio-11.0 compatibility property for TYPE_VIRTIO_PCI "disable-legacy" causes QEMU to abort when instantiating vhost-user-fs-pci devices: Unexpected error in object_property_find_err() at ../qom/object.c:1284: qemu-system-s390x: -device vhost-user-fs-pci: can't apply global virtio-pci.disable-legacy=3Doff: Property 'vhost-user-fs-pci.disable-legacy' not found The issue occurs because some vhost-user devices like vhost-user-fs-pci only implement the non-transitional variant and do not define a generic device type. Non-transitional devices have disable-legacy hardcoded to "on" and do not expose it as a property, while only generic device types have the "disable-legacy" property. This affects users running older machine versions (11.0 and earlier) even when using the latest QEMU version. Mark the global property as optional so it only applies to devices that actually have the property, allowing vhost-user devices without a generic variant to be instantiated successfully on older machine versions. Fixes: 26103c13cff0 ("hw/s390x/ccw: Disable legacy virtio-pci by default (v= 11.1+)") Signed-off-by: Jaehoon Kim Reviewed-by: Matthew Rosato Message-ID: <20260520183403.223983-1-jhkim@linux.ibm.com> Signed-off-by: Cornelia Huck --- hw/s390x/s390-virtio-ccw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 4d35f9b10bcc..25a9fa495540 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -946,7 +946,7 @@ static void ccw_machine_11_0_class_options(MachineClass= *mc) * keep legacy virtio-pci enabled. */ static GlobalProperty compat[] =3D { - { TYPE_VIRTIO_PCI, "disable-legacy", "off" }, + { TYPE_VIRTIO_PCI, "disable-legacy", "off", .optional =3D true }, }; ccw_machine_11_1_class_options(mc); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); --=20 2.54.0 From nobody Sun Jun 7 22:19:01 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1780671472; cv=none; d=zohomail.com; s=zohoarc; b=IZYuHE0rWFHzgTjKAQ+4D7iiGH8RWBLWlPxUSFjn/ckudIHyMxYf1U3BU4HAp5Peh9o5ZNh7ehbqBaEs23G7OlcGY5WcwJkQF+1X0BcDc2HbPRGMgd3y60cKW9eUIgdfNB7FQLMCfdo5b3HzSGk7Elj0R6a1BHQiNilzb4v3IAQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780671472; 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=mLNs6ou2/7XWGG3hVFddxYG3IRO2nH++9xuk70SE6uI=; b=mP35eNABB9065/WlI4U66wj0gW9uPpXkNhyrH4ZfWtH7RXD4sSTxjgNxlau8BA9CxPkz6memcRbaHMCRnul49qDU9c0K5U/cCz3malMM9ztq7st062UdLdbqKFqtR9S/gCwG5aCEnUu4YaXQ5GoACms/Oml2TuKErhZT80Ih97M= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1780671472254801.9638097829204; Fri, 5 Jun 2026 07:57:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wVVz9-0002Qg-Fq; Fri, 05 Jun 2026 10:57:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wVVyx-0002M9-50 for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57:11 -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 1wVVyv-0005TG-O7 for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57:10 -0400 Received: from mx-prod-mc-01.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-133-KNKrEMSiPEGdheQ7mM99kg-1; Fri, 05 Jun 2026 10:57:05 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2DC1C19560A5; Fri, 5 Jun 2026 14:57:04 +0000 (UTC) Received: from gondolin.redhat.com (unknown [10.44.48.119]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DF0CF1800351; Fri, 5 Jun 2026 14:57:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780671429; 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=mLNs6ou2/7XWGG3hVFddxYG3IRO2nH++9xuk70SE6uI=; b=DyF7I4dN0DrQiQUi95oFeQWA33tOLFnBMZw275PU6oyE0mYhlsOkGRNsOmPkLizR0cMQey 03fseWonWhjAc98Tx/S0P8yiPfixMwFF2w0i5BJbesMhwc0NArqx73myCwpWRCRRn/ehZ3 GXhG3LbcCcRVH2lT5AaFya42/x/yO2Y= X-MC-Unique: KNKrEMSiPEGdheQ7mM99kg-1 X-Mimecast-MFC-AGG-ID: KNKrEMSiPEGdheQ7mM99kg_1780671424 From: Cornelia Huck To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Farhan Ali , qemu-stable@nongnu.org, Niklas Schnelle , Matthew Rosato , Omar Elghoul , Cornelia Huck Subject: [PULL 4/7] s390x/pci: Fix interrupt forwarding disable for interpreted devices Date: Fri, 5 Jun 2026 16:56:44 +0200 Message-ID: <20260605145647.272621-5-cohuck@redhat.com> In-Reply-To: <20260605145647.272621-1-cohuck@redhat.com> References: <20260605145647.272621-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1780671473528158500 Content-Type: text/plain; charset="utf-8" From: Farhan Ali Remove the FH_MASK_ENABLE check when disabling interrupt forwarding during device reset. This check was broken for the default case in the switch statement above, preventing proper cleanup of interrupt forwarding. The pbdev->aif check in s390_pci_kvm_aif_disable() already guards against double-disabling of interrupt forwarding. Cc: qemu-stable@nongnu.org Reported-by: Niklas Schnelle Signed-off-by: Farhan Ali Reviewed-by: Matthew Rosato Tested-by: Omar Elghoul Message-ID: <20260521182946.1607-1-alifm@linux.ibm.com> Signed-off-by: Cornelia Huck --- hw/s390x/s390-pci-bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 4de7b587e8a5..eb2b6185db0a 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -1504,7 +1504,7 @@ static void s390_pci_device_reset(DeviceState *dev) break; } =20 - if (pbdev->interp && (pbdev->fh & FH_MASK_ENABLE)) { + if (pbdev->interp) { /* Interpreted devices were using interrupt forwarding */ s390_pci_kvm_aif_disable(pbdev); } else if (pbdev->summary_ind) { --=20 2.54.0 From nobody Sun Jun 7 22:19:01 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1780671491; cv=none; d=zohomail.com; s=zohoarc; b=UFGwUqSzK9E6nWNMzy8PqnbY9GNjZ0/ubmc/u4u0uhKKX16TljL04Edz1jwWzRhA8fLClbIdJ2D+I6TJQSAYQLhbN+eSS/35gYEMQBwjdHY+w6m/2km5RODo19YAFIrrwtKr/4aUi3uLyCy4KhLXtckqPfV3gsvC+cUEF9voCA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780671491; 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=RWgkuD6J43RWVhhwNGFM/2u4gOFQlTN60r2vnD2CbTA=; b=Mjjl3Kq4Z8Ry8J6qNoPX8mOvIVWm9YUG2DnElER9iN//KCdBAafrj+a7f5TyTXeMa4Pp3r+bsnq9Ww+Tktz/uviTvj20E6sRG3g11sIuz/4wStkooQBD88sJsyybTnxeDfVXAmMebg062Aejd0dCP5yB0BVb1WLyN/hwqueCX8M= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1780671491083356.3745764147701; Fri, 5 Jun 2026 07:58:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wVVza-0002q1-SP; Fri, 05 Jun 2026 10:57:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wVVz5-0002QW-Nl for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57:23 -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 1wVVz0-0005V2-0S for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57:17 -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-439-PHW2tNDTMhydN1qQ7gv2fA-1; Fri, 05 Jun 2026 10:57:08 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 7B34A1800350; Fri, 5 Jun 2026 14:57:06 +0000 (UTC) Received: from gondolin.redhat.com (unknown [10.44.48.119]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9644A1800351; Fri, 5 Jun 2026 14:57:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780671432; 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=RWgkuD6J43RWVhhwNGFM/2u4gOFQlTN60r2vnD2CbTA=; b=e/txpq6tlk1TL+Ta6FqGVHsouOBm6GnMzBNFVQEvGjdaH7QdtYMMiRddgdrmcbIzN31ego Z0bFqSIPxLbVeCVSLfLODokDi5W0vheP9OnDADOwNpW9D5TjjxJPem9qUEioJ5gzCymhCW F4GhfqL6o1WBhTZ02ng3ILBSFrmA7Jk= X-MC-Unique: PHW2tNDTMhydN1qQ7gv2fA-1 X-Mimecast-MFC-AGG-ID: PHW2tNDTMhydN1qQ7gv2fA_1780671426 From: Cornelia Huck To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Thomas Huth , Cornelia Huck Subject: [PULL 5/7] MAINTAINERS: Fix s390x storage key/attribute device paths Date: Fri, 5 Jun 2026 16:56:45 +0200 Message-ID: <20260605145647.272621-6-cohuck@redhat.com> In-Reply-To: <20260605145647.272621-1-cohuck@redhat.com> References: <20260605145647.272621-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1780671492725154100 From: Philippe Mathieu-Daud=C3=A9 Fixes: 56e34834029 ("MAINTAINERS: split out s390x sections") Reported-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-ID: <20260519171240.97420-2-philmd@linaro.org> Signed-off-by: Cornelia Huck --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 4ff33eb630bd..48db280e478d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2973,7 +2973,7 @@ M: Halil Pasic M: Christian Borntraeger R: Jason Herne S: Supported -F: hw/s390x/storage-keys.h +F: include/hw/s390x/storage-keys.h F: hw/s390x/s390-skeys*.c L: qemu-s390x@nongnu.org =20 @@ -2982,7 +2982,7 @@ M: Halil Pasic M: Christian Borntraeger R: Jason Herne S: Supported -F: hw/s390x/storage-attributes.h +F: include/hw/s390x/storage-attributes.h F: hw/s390x/s390-stattrib*.c L: qemu-s390x@nongnu.org =20 --=20 2.54.0 From nobody Sun Jun 7 22:19:01 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1780671480; cv=none; d=zohomail.com; s=zohoarc; b=QMH/jdCFI7TBPwDVW5nVcuAbmEHZAd5m1S/t99PUWiX/NV/ikMFz/u2Whe2ftr6jwIKnd0ON8UNJGa/sKLgcsTInlfO7m+sH1BhUlFqA8i0cmpjreGkXBeODMiWScGKqZraQSppsNHYplRV4qk/E7y08wCjqdAWnPyPnUqvQsHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780671480; 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=yu0k+EaNtr0Bb3BwJsVH+VGpIo0wz9UuA/2j23ZuSzs=; b=XrhJHpHrZf5j549U+z6TatNq1vB+0B3wylVbCtI36Ik/6yfQnvwoGFTt4cmuD/6lHUyLacVdOiEvyZYBhisMg+AL7Kz19KtJVoQo9X+apy3k7+XH+wkXwKp+Q7qgo78vRO2ToSpyoMH8wwbtqcSjCkORuXFBfT20FOQHqLVG87c= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1780671480771516.8013936303154; Fri, 5 Jun 2026 07:58:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wVVzV-0002hs-1h; Fri, 05 Jun 2026 10:57:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wVVz5-0002QY-NI for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57:23 -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 1wVVz1-0005Vj-IP for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57:19 -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-358-yKN9ykOUMn235Qn7UOPRGA-1; Fri, 05 Jun 2026 10:57:11 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 0F86118002FF; Fri, 5 Jun 2026 14:57:09 +0000 (UTC) Received: from gondolin.redhat.com (unknown [10.44.48.119]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E66E9180049F; Fri, 5 Jun 2026 14:57:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780671433; 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=yu0k+EaNtr0Bb3BwJsVH+VGpIo0wz9UuA/2j23ZuSzs=; b=d1zlBCVLSjzDVPtFxKjnXyZyDuxB6WwoZ0ESh8GPtixgHksRtewVGkHYsyanWClBu7irp1 ACE1L5OZWgVV9Irdc43PvKodcIUAurogo1eiES5EFsHCUWmUSbZsaEp8N+r8PWl8rVwIfk CwNIgUmVb7JQy+vj2vh7bJ3mHOmn69I= X-MC-Unique: yKN9ykOUMn235Qn7UOPRGA-1 X-Mimecast-MFC-AGG-ID: yKN9ykOUMn235Qn7UOPRGA_1780671429 From: Cornelia Huck To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Thomas Huth , Richard Henderson , Cornelia Huck Subject: [PULL 6/7] MAINTAINERS: Fix tcg/s390x/ path Date: Fri, 5 Jun 2026 16:56:46 +0200 Message-ID: <20260605145647.272621-7-cohuck@redhat.com> In-Reply-To: <20260605145647.272621-1-cohuck@redhat.com> References: <20260605145647.272621-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: qemu development 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: 1780671481404158500 From: Philippe Mathieu-Daud=C3=A9 This folder was renamed in commit 3704993f545 ("tcg/s390x: Rename from tcg/s390"). Reported-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-ID: <20260519171240.97420-3-philmd@linaro.org> Signed-off-by: Cornelia Huck --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 48db280e478d..79ecac16fe01 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4171,7 +4171,7 @@ F: disas/riscv*.[ch] S390 TCG target M: Richard Henderson S: Maintained -F: tcg/s390/ +F: tcg/s390x/ L: qemu-s390x@nongnu.org =20 SPARC TCG target --=20 2.54.0 From nobody Sun Jun 7 22:19:01 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1780671507; cv=none; d=zohomail.com; s=zohoarc; b=IpgrEPKO/nh7lc8TJCw0lVhhlsDmugCTva/ElI8+Yx9ZxEMW29FhNVvCjGiYZ6mXYexRX3slUlaALImp03/+JA84NvvC3gKAdS4XzW503yErslldZGUrvmxtGgi1dKYc/fMChpj4vL/r5dNX9d9oDM9flq5zrM6TWyUgxtWR4iI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780671507; 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=lMZTgq+W3oaOEY/UcLBDVwkqAOLsLQfr+h1MNjhpmg8=; b=Zob+fI08Y0LY3wST7u6buc8e1ZKA20I/myZGjpbtTNZVzscZ+TelPB9fVZICDx7RErf3O43oIhJwBKi8MCXB3cWR2w1OTA+dekbkTjz898l/DiforMkOUipsChFFUiebAUbJNgOE9EoXJdSL3dK5M95uhMB0WUn9n/0HQIqsmS8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1780671507512587.2161728830628; Fri, 5 Jun 2026 07:58:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wVVzi-0003FO-FZ; Fri, 05 Jun 2026 10:57:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wVVz7-0002Qp-En for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57:23 -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 1wVVz5-0005WH-BC for qemu-devel@nongnu.org; Fri, 05 Jun 2026 10:57:20 -0400 Received: from mx-prod-mc-01.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-192-Mq9ssvv9MYOjvJWwMknkeQ-1; Fri, 05 Jun 2026 10:57:12 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 79CEA19560A5; Fri, 5 Jun 2026 14:57:11 +0000 (UTC) Received: from gondolin.redhat.com (unknown [10.44.48.119]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7A1DD180049F; Fri, 5 Jun 2026 14:57:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780671435; 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=lMZTgq+W3oaOEY/UcLBDVwkqAOLsLQfr+h1MNjhpmg8=; b=AOgYTjr06GgXEvbZtmhPHUzjQIhQhsAmPg6DMlY6o7qNpxCwMiYrVfNXmPciPrXdK6ludR C7xNGDfUPvWri3DAMaxD43Y6XCNrT/4go9ce6w1veVyao5mpEJuKekJ/1hyd8NlpU0l8r+ 0+4UI5ybnDjZPo3+jSTmQENs5oEllV4= X-MC-Unique: Mq9ssvv9MYOjvJWwMknkeQ-1 X-Mimecast-MFC-AGG-ID: Mq9ssvv9MYOjvJWwMknkeQ_1780671431 From: Cornelia Huck To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , Cornelia Huck Subject: [PULL 7/7] buildsys: Stop checking for ESA/390 host Date: Fri, 5 Jun 2026 16:56:47 +0200 Message-ID: <20260605145647.272621-8-cohuck@redhat.com> In-Reply-To: <20260605145647.272621-1-cohuck@redhat.com> References: <20260605145647.272621-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1780671509602158500 From: Philippe Mathieu-Daud=C3=A9 We still build QEMU tools on 32-bit hosts (see commit cf634dfcd8f), however no OS supported by QEMU still runs on ESA/390 (Linux dropped support in release 4.1 in 2015). Remove the configure check, directly checking for the 64-bit z/Architecture. Also per commit 3704993f545 from 2020: "we don't support s390, only 64-bit s390x hosts". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-ID: <20260519171240.97420-4-philmd@linaro.org> Signed-off-by: Cornelia Huck --- block/file-posix.c | 2 +- configure | 12 ++---------- disas/disas-host.c | 2 +- include/qemu/cacheflush.h | 2 +- include/qemu/timer.h | 2 +- util/cacheflush.c | 2 +- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index e49b13d6abb5..5019ddade9b5 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -79,7 +79,7 @@ #include #include #include -#ifdef __s390__ +#ifdef __s390x__ #include #endif #ifndef FS_NOCOW_FL diff --git a/configure b/configure index 1ceb4d7ecc42..d786d3a7c9b4 100755 --- a/configure +++ b/configure @@ -399,12 +399,8 @@ elif check_define _ARCH_PPC64 ; then else cpu=3D"ppc64" fi -elif check_define __s390__ ; then - if check_define __s390x__ ; then - cpu=3D"s390x" - else - cpu=3D"s390" - fi +elif check_define __s390x__ ; then + cpu=3D"s390x" elif check_define __riscv && check_define _LP64 ; then cpu=3D"riscv64" elif check_define __aarch64__ ; then @@ -461,10 +457,6 @@ case "$cpu" in linux_arch=3Driscv ;; =20 - s390) - linux_arch=3Ds390 - CPU_CFLAGS=3D"-m31" - ;; s390x) host_arch=3Ds390x linux_arch=3Ds390 diff --git a/disas/disas-host.c b/disas/disas-host.c index 7cf432938e0b..d41235250a0a 100644 --- a/disas/disas-host.c +++ b/disas/disas-host.c @@ -74,7 +74,7 @@ static void initialize_debug_host(CPUDebug *s) s->info.print_insn =3D print_insn_little_mips; #elif defined(__m68k__) s->info.print_insn =3D print_insn_m68k; -#elif defined(__s390__) +#elif defined(__s390x__) s->info.cap_arch =3D CS_ARCH_SYSZ; s->info.cap_insn_unit =3D 2; s->info.cap_insn_split =3D 6; diff --git a/include/qemu/cacheflush.h b/include/qemu/cacheflush.h index 8c64b8781458..0618966ddde0 100644 --- a/include/qemu/cacheflush.h +++ b/include/qemu/cacheflush.h @@ -19,7 +19,7 @@ * mappings of the same physical page(s). */ =20 -#if defined(__x86_64__) || defined(__s390__) +#if defined(__x86_64__) || defined(__s390x__) =20 static inline void flush_idcache_range(uintptr_t rx, uintptr_t rw, size_t = len) { diff --git a/include/qemu/timer.h b/include/qemu/timer.h index ec03635dd34c..9a62ac8cded1 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -889,7 +889,7 @@ static inline int64_t cpu_get_host_ticks(void) return val; } =20 -#elif defined(__s390__) +#elif defined(__s390x__) =20 static inline int64_t cpu_get_host_ticks(void) { diff --git a/util/cacheflush.c b/util/cacheflush.c index 247c4ce29803..a44fb136f7e0 100644 --- a/util/cacheflush.c +++ b/util/cacheflush.c @@ -223,7 +223,7 @@ static void __attribute__((constructor)) init_cache_inf= o(void) * Architecture (+ OS) specific cache flushing mechanisms. */ =20 -#if defined(__x86_64__) || defined(__s390__) +#if defined(__x86_64__) || defined(__s390x__) =20 /* Caches are coherent and do not require flushing; symbol inline. */ =20 --=20 2.54.0