From nobody Mon Sep 16 19:33:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1693923964; cv=none; d=zohomail.com; s=zohoarc; b=M9XoMVQt1C/gdwWLb9dVjQiM8eX8KySwQoBbGGLRwswIfJvb8aw7eQoDuKJuPYEFGQb/AyuXN7V5JbBQNJuo2WHJ3L/45bA6x1WrvMFUrnRiDeZQE4MKJQmF/TKAvXIbUAGfSdvhrNwvGal53hK5rb5A6LwCJUz1yJf2lppOctE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923964; 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=MTCAHOlPjM7xpxfAkOaE/ICa+8ID3EOd9/l8xf0I8ec=; b=Cl3QXXpPK289lU5iibwlpsHWTLYkRyVxUO3GKWX2gaSLDaLttBpReTU/zMi7I50ZK0GEBnw3K+jiqvgOLCH5YGaJfEVqNqN7yVxvwxuhtXolr1gZUSdCRL4c2mqmnfM7OC9N35YF+ZGDAXqZRMDUr8T2UYYSpxzdBv+4PLtHZEQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1693923964155322.95785636821324; Tue, 5 Sep 2023 07:26:04 -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-639-e2qd8Z22ODOWaKunEbA0xg-1; Tue, 05 Sep 2023 10:25:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9CD77181C998; Tue, 5 Sep 2023 14:25:05 +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 88A65C124A; Tue, 5 Sep 2023 14:25:05 +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 633051946A5E; Tue, 5 Sep 2023 14:25:05 +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 A7E331946589 for ; Tue, 5 Sep 2023 14:25:03 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 874471121318; Tue, 5 Sep 2023 14:25:03 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id C15001121314 for ; Tue, 5 Sep 2023 14:25:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923962; 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=MTCAHOlPjM7xpxfAkOaE/ICa+8ID3EOd9/l8xf0I8ec=; b=NIsypiqOZc5kCOGp78Kz6U+yEosLeFqsYxaB00IdKFD+vWfizGF0z7zVeYsn19YZg2spsV ikkPsoDJHFOrLMbl/93/gpLM5VQH1M5rols6U2sla0ss4kuzusrvF04PsIqhmXFXNbjWPW NfUyphARv9SKuTThbpLU9N+25Xw6c+Y= X-MC-Unique: e2qd8Z22ODOWaKunEbA0xg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 37/51] qemuxml2argvtest: Consolidate and modernize CPU topology testing Date: Tue, 5 Sep 2023 16:24:04 +0200 Message-ID: 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.5 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: 1693923965164100007 Content-Type: text/plain; charset="utf-8" Move the 'smp-dies' test case into 'cpu-topology4' and remove unnecessary cruft. Remove cpu definition from 'cpu-topology2' as it's not relevant to the test case. Remove 'smp' case as it's covered by the rest. Use real capabilities for all of them. Signed-off-by: Peter Krempa --- ....args =3D> cpu-topology1.x86_64-latest.args} | 2 +- tests/qemuxml2argvdata/cpu-topology1.xml | 4 +- ....args =3D> cpu-topology2.x86_64-latest.args} | 2 +- tests/qemuxml2argvdata/cpu-topology2.xml | 5 +-- ....args =3D> cpu-topology3.x86_64-latest.args} | 0 tests/qemuxml2argvdata/cpu-topology3.xml | 2 +- ....args =3D> cpu-topology4.x86_64-latest.args} | 6 +-- tests/qemuxml2argvdata/cpu-topology4.xml | 21 ++++++++++ tests/qemuxml2argvdata/smp-dies.xml | 33 ---------------- tests/qemuxml2argvdata/smp.args | 35 ----------------- tests/qemuxml2argvdata/smp.xml | 33 ---------------- tests/qemuxml2argvtest.c | 11 +++--- .../qemuxml2xmloutdata/smp.x86_64-latest.xml | 39 ------------------- tests/qemuxml2xmltest.c | 1 - 14 files changed, 35 insertions(+), 159 deletions(-) rename tests/qemuxml2argvdata/{cpu-topology3.args =3D> cpu-topology1.x86_6= 4-latest.args} (96%) rename tests/qemuxml2argvdata/{cpu-topology2.args =3D> cpu-topology2.x86_6= 4-latest.args} (98%) rename tests/qemuxml2argvdata/{cpu-topology1.args =3D> cpu-topology3.x86_6= 4-latest.args} (100%) rename tests/qemuxml2argvdata/{smp-dies.args =3D> cpu-topology4.x86_64-lat= est.args} (74%) create mode 100644 tests/qemuxml2argvdata/cpu-topology4.xml delete mode 100644 tests/qemuxml2argvdata/smp-dies.xml delete mode 100644 tests/qemuxml2argvdata/smp.args delete mode 100644 tests/qemuxml2argvdata/smp.xml delete mode 100644 tests/qemuxml2xmloutdata/smp.x86_64-latest.xml diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argv= data/cpu-topology1.x86_64-latest.args similarity index 96% rename from tests/qemuxml2argvdata/cpu-topology3.args rename to tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args index c11b4cd307..009c08d71a 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.args +++ b/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ --smp 6,sockets=3D3,dies=3D1,cores=3D2,threads=3D1 \ +-smp 1,maxcpus=3D6,sockets=3D3,dies=3D1,cores=3D2,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology1.xml b/tests/qemuxml2argvd= ata/cpu-topology1.xml index af82a1c51a..5cf49987e1 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.xml +++ b/tests/qemuxml2argvdata/cpu-topology1.xml @@ -3,7 +3,7 @@ c7a5fdbd-edaf-9455-926a-d65c16db1809 219100 219100 - 6 + 6 hvm @@ -16,6 +16,6 @@ restart destroy - /usr/bin/qemu-system-x86_64 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argv= data/cpu-topology2.x86_64-latest.args similarity index 98% rename from tests/qemuxml2argvdata/cpu-topology2.args rename to tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args index 4639d34c56..7ba175fa80 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.args +++ b/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -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,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ --cpu core2duo \ +-cpu qemu64 \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-topology2.xml b/tests/qemuxml2argvd= ata/cpu-topology2.xml index 1b113b8b13..dd125ec4e2 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.xml +++ b/tests/qemuxml2argvdata/cpu-topology2.xml @@ -8,8 +8,7 @@ hvm - - core2duo + @@ -17,6 +16,6 @@ restart destroy - /usr/bin/qemu-system-x86_64 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argv= data/cpu-topology3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-topology1.args rename to tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-topology3.xml b/tests/qemuxml2argvd= ata/cpu-topology3.xml index af82a1c51a..f8175fcd81 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.xml +++ b/tests/qemuxml2argvdata/cpu-topology3.xml @@ -16,6 +16,6 @@ restart destroy - /usr/bin/qemu-system-x86_64 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/= cpu-topology4.x86_64-latest.args similarity index 74% rename from tests/qemuxml2argvdata/smp-dies.args rename to tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args index a4d5fc3372..d0e31ba2b5 100644 --- a/tests/qemuxml2argvdata/smp-dies.args +++ b/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ --smp 1,maxcpus=3D4,sockets=3D2,dies=3D2,cores=3D1,threads=3D1 \ +-smp 1,maxcpus=3D6,sockets=3D1,dies=3D3,cores=3D2,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -27,9 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -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/cpu-topology4.xml b/tests/qemuxml2argvd= ata/cpu-topology4.xml new file mode 100644 index 0000000000..a60b5865fa --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-topology4.xml @@ -0,0 +1,21 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + diff --git a/tests/qemuxml2argvdata/smp-dies.xml b/tests/qemuxml2argvdata/s= mp-dies.xml deleted file mode 100644 index a29786c0c4..0000000000 --- a/tests/qemuxml2argvdata/smp-dies.xml +++ /dev/null @@ -1,33 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 4 - - hvm - - - - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - - -
- - - - - - - - - diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.a= rgs deleted file mode 100644 index 352b1d3d6e..0000000000 --- a/tests/qemuxml2argvdata/smp.args +++ /dev/null @@ -1,35 +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,memory-backend=3Dpc.ram,acpi= =3Doff \ --accel tcg \ --cpu qemu64 \ --m size=3D219136k \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ --overcommit mem-lock=3Doff \ --smp 1,maxcpus=3D2,sockets=3D2,dies=3D1,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 \ --boot strict=3Don \ --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"}' \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smp.xml b/tests/qemuxml2argvdata/smp.xml deleted file mode 100644 index 274aa37f1a..0000000000 --- a/tests/qemuxml2argvdata/smp.xml +++ /dev/null @@ -1,33 +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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ec06a734a1..d218b17d57 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1723,9 +1723,6 @@ mymain(void) DO_TEST_NOCAPS("qemu-ns-no-env"); DO_TEST_NOCAPS("qemu-ns-alt"); - DO_TEST_NOCAPS("smp"); - DO_TEST("smp-dies", QEMU_CAPS_SMP_DIES); - DO_TEST_CAPS_LATEST("iothreads-ids"); DO_TEST_CAPS_LATEST("iothreads-ids-partial"); DO_TEST_CAPS_LATEST("iothreads-ids-pool-sizes"); @@ -1735,9 +1732,11 @@ mymain(void) DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci"); DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x"); - DO_TEST_NOCAPS("cpu-topology1"); - DO_TEST_NOCAPS("cpu-topology2"); - DO_TEST_NOCAPS("cpu-topology3"); + DO_TEST_CAPS_LATEST("cpu-topology1"); + DO_TEST_CAPS_LATEST("cpu-topology2"); + DO_TEST_CAPS_LATEST("cpu-topology3"); + DO_TEST_CAPS_LATEST("cpu-topology4"); + DO_TEST("cpu-minimum1", QEMU_CAPS_KVM); DO_TEST("cpu-minimum2", QEMU_CAPS_KVM); DO_TEST("cpu-exact1", QEMU_CAPS_KVM); diff --git a/tests/qemuxml2xmloutdata/smp.x86_64-latest.xml b/tests/qemuxml= 2xmloutdata/smp.x86_64-latest.xml deleted file mode 100644 index a7f324afba..0000000000 --- a/tests/qemuxml2xmloutdata/smp.x86_64-latest.xml +++ /dev/null @@ -1,39 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 2 - - hvm - - - - qemu64 - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - - -
- - -
- - -
- - - - -