From nobody Sat Nov 23 17:39:13 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 1723131578298168.618878234181; Thu, 8 Aug 2024 08:39:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 34889149C; Thu, 8 Aug 2024 11:39:37 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0372913FA; Thu, 8 Aug 2024 11:37:54 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 26CE1149E; Thu, 8 Aug 2024 11:37:49 -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 8620D13E7 for ; Thu, 8 Aug 2024 11:37:47 -0400 (EDT) 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-193-wjtt5XdOPKa6EQDm04bdfA-1; Thu, 08 Aug 2024 11:37:45 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D3F031934B88 for ; Thu, 8 Aug 2024 15:37:44 +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 EE35E1955F35 for ; Thu, 8 Aug 2024 15:37:43 +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=1723131467; 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=hSo++HzGHTkSKwpHhbYAxdM16ZBjoo1MDGW3cTlnNCU=; b=MAXDbquKQgeoJDAwxcEc3Yk/3xFEh/YBWUnETY1kAZMURNjeLzH/HRCTFqSew/d4F2Bn+n 4jMckqN5odKq5036xP28dfnPg8UtSx9rBn1gnHD84iWv1bpDPKKMuJGOOM/WSnFlr3erCu 0Bj3itGT6FJAklpO0pN8MO+xSZnTR+0= X-MC-Unique: wjtt5XdOPKa6EQDm04bdfA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 2/3] qemuxmlconftest: Don't use soon-to-be-removed machine types Date: Thu, 8 Aug 2024 17:37:38 +0200 Message-ID: <488607509597255cc72c35ce684ed1ab332787e9.1723131382.git.pkrempa@redhat.com> 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: 4KLTXMS727EOLNPOV5FKEKTKEHJQ3FXQ X-Message-ID-Hash: 4KLTXMS727EOLNPOV5FKEKTKEHJQ3FXQ 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: 1723131579525116600 Content-Type: text/plain; charset="utf-8" Latest qemu will be dropping some very old machine types (2.0 - 2.3) and some of our tests use them. As in none of the cases the test actually needs given machine type, switch them to 'pc' instead. In one case 'numavcpus-topology-mismatch' this caused switch to a more modern syntax for NUMA memory specification, but the test is testing a different aspect, thus we can modernize this. Signed-off-by: Peter Krempa --- .../controller-usb-order.x86_64-latest.args | 2 +- .../controller-usb-order.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/controller-usb-order.xml | 2 +- ...isk-network-rbd-encryption-layering.x86_64-latest.args | 2 +- ...disk-network-rbd-encryption-layering.x86_64-latest.xml | 2 +- .../disk-network-rbd-encryption-layering.xml | 2 +- ...isk-network-rbd-encryption-luks-any.x86_64-latest.args | 2 +- ...disk-network-rbd-encryption-luks-any.x86_64-latest.xml | 2 +- .../disk-network-rbd-encryption-luks-any.xml | 2 +- .../disk-network-rbd-encryption.x86_64-latest.args | 2 +- .../disk-network-rbd-encryption.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/disk-network-rbd-encryption.xml | 2 +- tests/qemuxmlconfdata/luks-disk-invalid.xml | 2 +- .../qemuxmlconfdata/luks-disks-source.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/luks-disks-source.xml | 2 +- tests/qemuxmlconfdata/luks-disks.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/luks-disks.xml | 2 +- .../memfd-memory-default-hugepage.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml | 2 +- .../qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/memfd-memory-numa.xml | 2 +- .../numavcpus-topology-mismatch.x86_64-latest.args | 8 +++++--- .../numavcpus-topology-mismatch.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml | 2 +- 25 files changed, 29 insertions(+), 27 deletions(-) diff --git a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args = b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args index d07006fe64..cdfa9dd447 100644 --- a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args +++ b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-rhel7/.= config \ -name guest=3Drhel7,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-rhel7/master-key.aes"}' \ --machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ -m size=3D2097152k \ diff --git a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml b= /tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml index 7692ffca5f..63197d5f33 100644 --- a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxmlconfdata/controller-usb-order.xml b/tests/qemuxml= confdata/controller-usb-order.xml index 6cc0f503ff..c227e54a9e 100644 --- a/tests/qemuxmlconfdata/controller-usb-order.xml +++ b/tests/qemuxmlconfdata/controller-usb-order.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm destroy diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86= _64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layerin= g.x86_64-latest.args index 76a61dc985..de6bcb3db2 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-lat= est.args +++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-lat= est.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -name guest=3Dencryptdisk,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \ --machine pc-i440fx-2.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86= _64-latest.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering= .x86_64-latest.xml index e3a9463e43..20201a51a7 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-lat= est.xml +++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-lat= est.xml @@ -5,7 +5,7 @@ 524288 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml= b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml index 8c2c008dc3..448e263832 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml +++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml @@ -5,7 +5,7 @@ 524288 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86= _64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-an= y.x86_64-latest.args index 734f63b31e..af178782b9 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-lat= est.args +++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-lat= est.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -name guest=3Dencryptdisk,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \ --machine pc-i440fx-2.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86= _64-latest.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any= .x86_64-latest.xml index d9f4ad17d9..9eb8071925 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-lat= est.xml +++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-lat= est.xml @@ -5,7 +5,7 @@ 524288 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml= b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml index 37d9900e74..bd28d0b6e5 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml +++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml @@ -5,7 +5,7 @@ 524288 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-lates= t.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.ar= gs index b5c2e16cb0..4b6afbb85d 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -name guest=3Dencryptdisk,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \ --machine pc-i440fx-2.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-lates= t.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.xml index 99bba52db5..c7f4571a05 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.xml @@ -5,7 +5,7 @@ 524288 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption.xml b/tests/= qemuxmlconfdata/disk-network-rbd-encryption.xml index d1fcf2da61..d45f7e71c8 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd-encryption.xml +++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption.xml @@ -5,7 +5,7 @@ 524288 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/luks-disk-invalid.xml b/tests/qemuxmlcon= fdata/luks-disk-invalid.xml index bea769584b..36c7e92980 100644 --- a/tests/qemuxmlconfdata/luks-disk-invalid.xml +++ b/tests/qemuxmlconfdata/luks-disk-invalid.xml @@ -5,7 +5,7 @@ 524288 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args b/t= ests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args index a4de92bb31..6eedd9a33f 100644 --- a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args +++ b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -name guest=3Dencryptdisk,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \ --machine pc-i440fx-2.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml b/te= sts/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml index ed9df66413..6e5f495c4c 100644 --- a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.xml @@ -5,7 +5,7 @@ 524288 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/luks-disks-source.xml b/tests/qemuxmlcon= fdata/luks-disks-source.xml index 293877df9e..a16f088fbb 100644 --- a/tests/qemuxmlconfdata/luks-disks-source.xml +++ b/tests/qemuxmlconfdata/luks-disks-source.xml @@ -5,7 +5,7 @@ 524288 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args b/tests/qe= muxmlconfdata/luks-disks.x86_64-latest.args index 2788fe4fc1..a8dc1b4f53 100644 --- a/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args +++ b/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -name guest=3Dencryptdisk,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes"}' \ --machine pc-i440fx-2.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/luks-disks.xml b/tests/qemuxmlconfdata/l= uks-disks.xml index 93718daaf4..e430ac0585 100644 --- a/tests/qemuxmlconfdata/luks-disks.xml +++ b/tests/qemuxmlconfdata/luks-disks.xml @@ -5,7 +5,7 @@ 524288 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-lat= est.args b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-lates= t.args index f850d7be60..ad4620175e 100644 --- a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -name guest=3Dinstance-00000092,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}' \ --machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ -m size=3D14680064k \ diff --git a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml b/test= s/qemuxmlconfdata/memfd-memory-default-hugepage.xml index a70bd53134..4ff3892adf 100644 --- a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml +++ b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml @@ -14,7 +14,7 @@ - hvm + hvm diff --git a/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args b/t= ests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args index dbe2b82a56..861d9fb18c 100644 --- a/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -name guest=3Dinstance-00000092,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}' \ --machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don,acpi=3D= off \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ -m size=3D14680064k,slots=3D16,maxmem=3D1099511627776k \ diff --git a/tests/qemuxmlconfdata/memfd-memory-numa.xml b/tests/qemuxmlcon= fdata/memfd-memory-numa.xml index 0c5d7ba4ef..0b1464feba 100644 --- a/tests/qemuxmlconfdata/memfd-memory-numa.xml +++ b/tests/qemuxmlconfdata/memfd-memory-numa.xml @@ -17,7 +17,7 @@ - hvm + hvm diff --git a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-lates= t.args b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.ar= gs index 72b025c2f6..0d4866d277 100644 --- a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args @@ -10,14 +10,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-dummy= /.config \ -name guest=3Ddummy,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-dummy/master-key.aes"}' \ --machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ -m size=3D7864320k,slots=3D16,maxmem=3D16777216k \ -overcommit mem-lock=3Doff \ -smp 12,sockets=3D12,cores=3D1,threads=3D1 \ --numa node,nodeid=3D0,cpus=3D0-1,cpus=3D5,cpus=3D7-11,mem=3D3840 \ --numa node,nodeid=3D1,cpus=3D2-4,cpus=3D6,mem=3D3840 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":40265318= 40,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-numa node,nodeid=3D0,cpus=3D0-1,cpus=3D5,cpus=3D7-11,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":40265318= 40,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-numa node,nodeid=3D1,cpus=3D2-4,cpus=3D6,memdev=3Dram-node1 \ -uuid 4d92ec27-9ebf-400b-ae91-20c71c647c19 \ -display none \ -no-user-config \ diff --git a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-lates= t.xml b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.xml index fdf7e83587..13ed2e5eee 100644 --- a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.xml @@ -9,7 +9,7 @@ - hvm + hvm diff --git a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml b/tests/= qemuxmlconfdata/numavcpus-topology-mismatch.xml index d3b2c1297e..6f512100f2 100644 --- a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml +++ b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml @@ -9,7 +9,7 @@ - hvm + hvm --=20 2.45.2