From nobody Mon Sep 16 19:19:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693923962; cv=none; d=zohomail.com; s=zohoarc; b=K/AZRX3/1WmOemoXslbKJU3yCMBDsV8G7qE15H52tZxZs0rknHKNbO75GXHihy7mVWHGqU2/fvwLBnltPtMIHBxXnttBK2JPypVgR46g6We4jr01ClJpplXCRtwoMhW8y4IUc4T+mbqNjwf4s6L2V9dKCqYev35DVU/WWcYar84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923962; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VZIVurORHlHkmeqP6akfvTzSyk9nHJvR5hFV/rqkWrk=; b=LHi6tFqLxIIVNdDQ6Vf/o6pjoCwb0IlgMLmA3oF9+7gcX+FO0cqm+9MyBEipBWX7Z3UBy/9dTF1CGQ6jMxxSL4XbNczO2Gesu/4PT84xrhLddPijg1/c3MJq2Dq46t7L5RNzgp2g+ItfRtj0AoWErAmRac5H5XQhFH2YHQj70p0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1693923962785856.435361262604; Tue, 5 Sep 2023 07:26:02 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-522-rPNf-m4BNmGJl_DmlUwJLw-1; Tue, 05 Sep 2023 10:25:35 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0761610518B1; Tue, 5 Sep 2023 14:24:50 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E423C493110; Tue, 5 Sep 2023 14:24:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C1E4E1946595; Tue, 5 Sep 2023 14:24:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3E4AF1946597 for ; Tue, 5 Sep 2023 14:24:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2D1701005B8E; Tue, 5 Sep 2023 14:24:48 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F6A41121314 for ; Tue, 5 Sep 2023 14:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923961; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VZIVurORHlHkmeqP6akfvTzSyk9nHJvR5hFV/rqkWrk=; b=gW+i0T1sxWzvJ19zLsmIHNtZvEi5wghJSIVgulSrioRac3XAzujdwZ8O9RY2XedkRiP0Kp Tgzc/j599EPObhDduSsqzIjWqrknqqBykT9aYBKCHd8nS79mU+mAJgPGxK228RNhxPomGw AulBX+3xXDDiapzhWelR/wp2FIjrBRY= X-MC-Unique: rPNf-m4BNmGJl_DmlUwJLw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 23/51] qemuxml2argvtest: Modernize 'numatune' tests Date: Tue, 5 Sep 2023 16:23:50 +0200 Message-ID: <617deb651fcd8e058ca484ad57f3f1b78b723786.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693923964526100005 Content-Type: text/plain; charset="utf-8" The 'numatune-memory' case is completely dropped as it's sufficiently covered by 'numatune-memnode'. The positive fake-caps version of 'numatune-memnode' is dropped as it's covered by the two existing real caps invocations. 'numatune-memory-invalid-nodeset', 'numatune-memnode-invalid-mode', 'numatune-memnode-nocpu', 'numatune-memnodes-problematic' parsing error negative cases are converted to use latest capabilities. 'numatune-static-nodeset-exceed-hostnode' commandline generation failure negative case is converted to use latest capabilities. 'numatune-memnode-no-memory', 'numatune-distances', 'numatune-auto-nodeset-invalid', 'numatune-auto-prefer' positive cases are converted to use latest capabilities. Signed-off-by: Peter Krempa --- ...e-auto-nodeset-invalid.x86_64-latest.args} | 10 +++-- ...> numatune-auto-prefer.x86_64-latest.args} | 10 +++-- ... =3D> numatune-distances.x86_64-latest.args} | 24 ++++++++---- ...ne-memnode-invalid-mode.x86_64-latest.err} | 0 ...tune-memnode-no-memory.x86_64-latest.args} | 7 ++-- ... numatune-memnode-nocpu.x86_64-latest.err} | 0 tests/qemuxml2argvdata/numatune-memnode.args | 37 ------------------- ...ne-memnodes-problematic.x86_64-latest.err} | 0 ...-memory-invalid-nodeset.x86_64-latest.err} | 0 tests/qemuxml2argvdata/numatune-memory.args | 34 ----------------- tests/qemuxml2argvdata/numatune-memory.xml | 31 ---------------- ...nodeset-exceed-hostnode.x86_64-latest.err} | 0 tests/qemuxml2argvtest.c | 21 +++++------ 13 files changed, 42 insertions(+), 132 deletions(-) rename tests/qemuxml2argvdata/{numatune-auto-nodeset-invalid.args =3D> num= atune-auto-nodeset-invalid.x86_64-latest.args} (76%) rename tests/qemuxml2argvdata/{numatune-auto-prefer.args =3D> numatune-aut= o-prefer.x86_64-latest.args} (71%) rename tests/qemuxml2argvdata/{numatune-distances.args =3D> numatune-dista= nces.x86_64-latest.args} (67%) rename tests/qemuxml2argvdata/{numatune-memnode-invalid-mode.err =3D> numa= tune-memnode-invalid-mode.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{numatune-memnode-no-memory.args =3D> numatu= ne-memnode-no-memory.x86_64-latest.args} (84%) rename tests/qemuxml2argvdata/{numatune-memnode-nocpu.err =3D> numatune-me= mnode-nocpu.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/numatune-memnode.args rename tests/qemuxml2argvdata/{numatune-memnodes-problematic.err =3D> numa= tune-memnodes-problematic.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{numatune-memory-invalid-nodeset.err =3D> nu= matune-memory-invalid-nodeset.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/numatune-memory.args delete mode 100644 tests/qemuxml2argvdata/numatune-memory.xml rename tests/qemuxml2argvdata/{numatune-static-nodeset-exceed-hostnode.err= =3D> numatune-static-nodeset-exceed-hostnode.x86_64-latest.err} (100%) diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/te= sts/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args similarity index 76% rename from tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args rename to tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-lates= t.args index d0703d283a..57a2b893f1 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.ar= gs @@ -10,11 +10,13 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -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,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0,1,2,3],"policy":"preferred"}' \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -23,12 +25,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -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/qemuxml2argvdata/numatune-auto-prefer.args b/tests/qemux= ml2argvdata/numatune-auto-prefer.x86_64-latest.args similarity index 71% rename from tests/qemuxml2argvdata/numatune-auto-prefer.args rename to tests/qemuxml2argvdata/numatune-auto-prefer.x86_64-latest.args index 5f8db1b479..d67d0dbe15 100644 --- a/tests/qemuxml2argvdata/numatune-auto-prefer.args +++ b/tests/qemuxml2argvdata/numatune-auto-prefer.x86_64-latest.args @@ -10,12 +10,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest/.config \ -name guest=3DQEMUGuest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D65536k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --numa node,nodeid=3D0,cpus=3D0,mem=3D64 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":67108864= ,"host-nodes":[0,1,2,3],"policy":"preferred"}' \ +-numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -display none \ -no-user-config \ @@ -24,9 +26,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ --usb \ +-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/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml= 2argvdata/numatune-distances.x86_64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/numatune-distances.args rename to tests/qemuxml2argvdata/numatune-distances.x86_64-latest.args index f349b5639c..8eb4883ed1 100644 --- a/tests/qemuxml2argvdata/numatune-distances.args +++ b/tests/qemuxml2argvdata/numatune-distances.x86_64-latest.args @@ -10,17 +10,24 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest/.config \ -name guest=3DQEMUGuest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Don \ -accel tcg \ +-cpu qemu64 \ -m size=3D12582912k \ -overcommit mem-lock=3Doff \ -smp 12,sockets=3D12,cores=3D1,threads=3D1 \ --numa node,nodeid=3D0,cpus=3D0,cpus=3D11,mem=3D2048 \ --numa node,nodeid=3D1,cpus=3D1,cpus=3D10,mem=3D2048 \ --numa node,nodeid=3D2,cpus=3D2,cpus=3D9,mem=3D2048 \ --numa node,nodeid=3D3,cpus=3D3,cpus=3D8,mem=3D2048 \ --numa node,nodeid=3D4,cpus=3D4,cpus=3D7,mem=3D2048 \ --numa node,nodeid=3D5,cpus=3D5-6,mem=3D2048 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21474836= 48}' \ +-numa node,nodeid=3D0,cpus=3D0,cpus=3D11,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":21474836= 48}' \ +-numa node,nodeid=3D1,cpus=3D1,cpus=3D10,memdev=3Dram-node1 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":21474836= 48}' \ +-numa node,nodeid=3D2,cpus=3D2,cpus=3D9,memdev=3Dram-node2 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node3","size":21474836= 48}' \ +-numa node,nodeid=3D3,cpus=3D3,cpus=3D8,memdev=3Dram-node3 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node4","size":21474836= 48}' \ +-numa node,nodeid=3D4,cpus=3D4,cpus=3D7,memdev=3Dram-node4 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node5","size":21474836= 48}' \ +-numa node,nodeid=3D5,cpus=3D5-6,memdev=3Dram-node5 \ -numa dist,src=3D0,dst=3D0,val=3D10 \ -numa dist,src=3D0,dst=3D1,val=3D21 \ -numa dist,src=3D0,dst=3D2,val=3D31 \ @@ -66,7 +73,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --usb \ +-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/qemuxml2argvdata/numatune-memnode-invalid-mode.err b/tes= ts/qemuxml2argvdata/numatune-memnode-invalid-mode.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-invalid-mode.err rename to tests/qemuxml2argvdata/numatune-memnode-invalid-mode.x86_64-lates= t.err diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args b/tests= /qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.args similarity index 84% rename from tests/qemuxml2argvdata/numatune-memnode-no-memory.args rename to tests/qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.a= rgs index efc9bb9476..a500dda611 100644 --- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args +++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -name guest=3DQEMUGuest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D65536k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ @@ -27,9 +28,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ --usb \ +-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/qemuxml2argvdata/numatune-memnode-nocpu.err b/tests/qemu= xml2argvdata/numatune-memnode-nocpu.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-nocpu.err rename to tests/qemuxml2argvdata/numatune-memnode-nocpu.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2a= rgvdata/numatune-memnode.args deleted file mode 100644 index 163aa530da..0000000000 --- a/tests/qemuxml2argvdata/numatune-memnode.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D24683520k \ --overcommit mem-lock=3Doff \ --smp 32,sockets=3D32,cores=3D1,threads=3D1 \ --object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520= ,"host-nodes":[3],"policy":"preferred"}' \ --numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ --object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":67633152= 0,"host-nodes":[0,1,2,3],"policy":"bind"}' \ --numa node,nodeid=3D1,cpus=3D1-27,cpus=3D29,memdev=3Dram-node1 \ --object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621= 440,"host-nodes":[0,2],"policy":"bind"}' \ --numa node,nodeid=3D2,cpus=3D28,cpus=3D30-31,memdev=3Dram-node2 \ --uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ --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 \ --no-acpi \ --boot strict=3Don \ --usb \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memnodes-problematic.err b/tes= ts/qemuxml2argvdata/numatune-memnodes-problematic.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnodes-problematic.err rename to tests/qemuxml2argvdata/numatune-memnodes-problematic.x86_64-lates= t.err diff --git a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.err b/t= ests/qemuxml2argvdata/numatune-memory-invalid-nodeset.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.err rename to tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.x86_64-lat= est.err diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2ar= gvdata/numatune-memory.args deleted file mode 100644 index d0703d283a..0000000000 --- a/tests/qemuxml2argvdata/numatune-memory.args +++ /dev/null @@ -1,34 +0,0 @@ -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,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --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 \ --no-acpi \ --boot strict=3Don \ --usb \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memory.xml b/tests/qemuxml2arg= vdata/numatune-memory.xml deleted file mode 100644 index ed86d5cf56..0000000000 --- a/tests/qemuxml2argvdata/numatune-memory.xml +++ /dev/null @@ -1,31 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 2 - - - - - hvm - - - - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - -
- - - - - diff --git a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode= .err b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.x86_6= 4-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.= err rename to tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.x8= 6_64-latest.err diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a6d569e0c6..04c7814dce 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1813,30 +1813,29 @@ mymain(void) DO_TEST_CAPS_LATEST("vcpu-placement-static"); DO_TEST_CAPS_LATEST("cputune-cpuset-big-id"); - DO_TEST_NOCAPS("numatune-memory"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memory-invalid-nodeset"); - DO_TEST_NOCAPS("numatune-memnode"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memory-invalid-nodeset"); DO_TEST_CAPS_VER("numatune-memnode", "5.2.0"); DO_TEST_CAPS_LATEST("numatune-memnode"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnode-invalid-mode"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnode-invalid-mode"); DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode"); DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnode-restrictive-mode-err= -mixed"); DO_TEST_CAPS_LATEST("numatune-system-memory"); - DO_TEST_NOCAPS("numatune-memnode-no-memory"); + DO_TEST_CAPS_LATEST("numatune-memnode-no-memory"); - DO_TEST_NOCAPS("numatune-distances"); + DO_TEST_CAPS_LATEST("numatune-distances"); DO_TEST_CAPS_LATEST("numatune-no-vcpu"); DO_TEST_CAPS_LATEST("numatune-hmat"); DO_TEST_CAPS_LATEST("numatune-hmat-none"); - DO_TEST_NOCAPS("numatune-auto-nodeset-invalid"); - DO_TEST_NOCAPS("numatune-auto-prefer"); - DO_TEST_FAILURE_NOCAPS("numatune-static-nodeset-exceed-hostnode"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnode-nocpu"); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnodes-problematic"); + DO_TEST_CAPS_LATEST("numatune-auto-nodeset-invalid"); + DO_TEST_CAPS_LATEST("numatune-auto-prefer"); + DO_TEST_CAPS_LATEST_FAILURE("numatune-static-nodeset-exceed-hostnode"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnode-nocpu"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("numatune-memnodes-problematic"); DO_TEST_CAPS_LATEST_FAILURE("numatune-memnode-unavailable-strict"); DO_TEST_CAPS_LATEST_FAILURE("numatune-memnode-unavailable-restrictive"= ); + DO_TEST_NOCAPS("numad"); DO_TEST_NOCAPS("numad-auto-vcpu-static-numatune"); DO_TEST_PARSE_ERROR_NOCAPS("numad-auto-vcpu-static-numatune-no-nodeset= "); --=20 2.41.0