From nobody Sat Nov 23 18:02:42 2024 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 1723131521952439.5939074676555; Thu, 8 Aug 2024 08:38:41 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id DE5F51496; Thu, 8 Aug 2024 11:38:40 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 35EDE1452; Thu, 8 Aug 2024 11:37:52 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id EC58513E9; Thu, 8 Aug 2024 11:37:46 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 5CBF213E7 for ; Thu, 8 Aug 2024 11:37:46 -0400 (EDT) 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-311-bgwRL3b0N8OmuNg4SJbVOw-1; Thu, 08 Aug 2024 11:37:44 -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 742231954237 for ; Thu, 8 Aug 2024 15:37:43 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AC2951955F35 for ; Thu, 8 Aug 2024 15:37:42 +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_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE 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=1723131466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p3cqOfF/quMahHHzRunjnv640fcU0kru+zXdGt74oJY=; b=Q7lJfgWzsCQkWGi53ghV04sms+kojCQnuKfDDwQrpxcnaNsCSTiMgr9IBOFJfYiNwAbHt9 res1+W+5XEbl3howFGisHpZo46hGU2qHsOGecNImXwGa412WtHIyoLx1G+0jRxluhCKFcc D8SjTvkhbvlZhu4rTWwdnnb4tMuIoqY= X-MC-Unique: bgwRL3b0N8OmuNg4SJbVOw-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 1/3] qemuxmlconftest: Add test for old-style NUMA memory specification Date: Thu, 8 Aug 2024 17:37:37 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: OXL5FKW754MEO432WBWHL5QU4NN32C6I X-Message-ID-Hash: OXL5FKW754MEO432WBWHL5QU4NN32C6I X-MailFrom: pkrempa@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 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: 1723131523209116600 Content-Type: text/plain; charset="utf-8" This excercises the old-style NUMA memory commandline used with 5.0 and older machine types: -smp 16,sockets=3D2,dies=3D1,clusters=3D1,cores=3D4,threads=3D2 \ -numa node,nodeid=3D0,cpus=3D0-7,mem=3D107 \ -numa node,nodeid=3D1,cpus=3D8-15,mem=3D107 \ in contrast to the modern syntax: -smp 16,sockets=3D2,dies=3D1,clusters=3D1,cores=3D4,threads=3D2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ -numa node,nodeid=3D1,cpus=3D8-15,memdev=3Dram-node1 \ which is tested by the 'cpu-numa1' test case where this was copied from. This test is added so that other irrelevant test can be modernized. Signed-off-by: Peter Krempa --- ...pu-numa-memory-oldstyle.x86_64-latest.args | 34 ++++++++++++++++++ ...cpu-numa-memory-oldstyle.x86_64-latest.xml | 36 +++++++++++++++++++ .../cpu-numa-memory-oldstyle.xml | 27 ++++++++++++++ tests/qemuxmlconftest.c | 1 + 4 files changed, 98 insertions(+) create mode 100644 tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-l= atest.args create mode 100644 tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-l= atest.xml create mode 100644 tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.xml diff --git a/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-latest.args new file mode 100644 index 0000000000..5c936add9a --- /dev/null +++ b/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-latest.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D219136k \ +-overcommit mem-lock=3Doff \ +-smp 16,sockets=3D2,dies=3D1,clusters=3D1,cores=3D4,threads=3D2 \ +-numa node,nodeid=3D0,cpus=3D0-7,mem=3D107 \ +-numa node,nodeid=3D1,cpus=3D8-15,mem=3D107 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-latest.x= ml b/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-latest.xml new file mode 100644 index 0000000000..60a67bc2b5 --- /dev/null +++ b/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-latest.xml @@ -0,0 +1,36 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 16 + + hvm + + + + qemu64 + + + + + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + +
+ + + + +