From nobody Tue Sep 9 03:13:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1737721364273699.1002123138733; Fri, 24 Jan 2025 04:22:44 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 47A401475; Fri, 24 Jan 2025 07:22:43 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 291951513; Fri, 24 Jan 2025 07:21:57 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2917D1361; Fri, 24 Jan 2025 07:21:52 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 553961392 for ; Fri, 24 Jan 2025 07:21:51 -0500 (EST) 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-454-Ub1mevpJORuAWW2iN22U7Q-1; Fri, 24 Jan 2025 07:21:49 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 D103E195608B for ; Fri, 24 Jan 2025 12:21:48 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E318C1800358; Fri, 24 Jan 2025 12:21:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737721311; 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=HnCfYfvOeQnnNRzIuvJBa39II3Snv6nUpSJMnLSOi5M=; b=Fgkpjkxo3f8Sj0To+IVrMpAHkVDGzAUQtjfjf5mD36PPdhn1dQ9hZFSKQRDOwlRjet369V nrlxenUMMacp1yneFperWbdKhRkcP2uBOXjavwpCYrOtT8zlmfnS46P08NgOnl8tza4Lx1 2ee/ZeEflvcH9S0vrVbqR9vrvokhOwY= X-MC-Unique: Ub1mevpJORuAWW2iN22U7Q-1 X-Mimecast-MFC-AGG-ID: Ub1mevpJORuAWW2iN22U7Q From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 1/8] qemu: Do NOT autoadd NUMA node for s390 Date: Fri, 24 Jan 2025 13:21:35 +0100 Message-ID: <31784a60f5c6fd5d34dc6e52c734025ffbf2ff99.1737721109.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: y5gJDexUAhZnOVyx9FP5ngMuMAd71-FXgZwU0Ezc8M4_1737721308 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WA2NX3WDXC7TXWHQ6VYJHAZBXRDN7HUM X-Message-ID-Hash: WA2NX3WDXC7TXWHQ6VYJHAZBXRDN7HUM X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: david@redhat.com X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1737721366596019100 Content-Type: text/plain; charset="utf-8"; x-default="true" In some cases, we might automatically add a NUMA node. But this doesn't work for s390 really, because in its commit v2.12.0-rc0~41^2~6 QEMU forbade specifying NUMA nodes for s390. Suppress automatic adding of NUMA node on our side. Signed-off-by: Michal Privoznik Reviewed-by: Boris Fiuczynski Reviewed-by: David Hildenbrand --- src/qemu/qemu_domain.c | 3 ++- src/qemu/qemu_postparse.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c7d7ac26ce..6554b992f0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7761,7 +7761,8 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef= *def, return 0; } =20 - if (!ARCH_IS_PPC64(def->os.arch)) { + if (!ARCH_IS_PPC64(def->os.arch) && + !ARCH_IS_S390(def->os.arch)) { /* due to guest support, qemu would silently enable NUMA with one = node * once the memory hotplug backend is enabled. To avoid possible * confusion we will enforce user originated numa configuration al= ong diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 1f9077982a..20ee333e0d 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1805,6 +1805,7 @@ qemuDomainDefNumaAutoAdd(virDomainDef *def, =20 if (!abiUpdate || !virDomainDefHasMemoryHotplug(def) || + qemuDomainIsS390CCW(def) || virDomainNumaGetNodeCount(def->numa) > 0) { return 0; } --=20 2.45.2