From nobody Mon Sep 16 19:08:09 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=Bot+cRIyN5FYqkUQRP5dkfl3BAk/w72wJ5WLEaob1YtKtvnjQyazybpf06NieQfoPfJRd5ryrXDBYNjrVUy1RYiJPVoGDhh+mgpZShmZp/7JLe/L7BWorVtKd0cXIYF5AOcrZnUtSg1h6kzKjULwdKk6d5dX/dWL5SdsP1NrCwE= 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=Mw7+vnayvQzLm23rodP41BdrYXKy58CZwiDUK3gh3dk=; b=glN4+JYkkAAvY4pqqI85+yTpnZ/LEkDq4sdsY3dGfqF4LKEUCG4Q75ln7uVByg15ZDr5upoAog9+CM3fyNhWdlKwkn0LC2FOrDyud6naiA9q0Ty7O6Sz//vuZrrVoH+sNVgKTzTIsjnYDnMw8psDjkOKCuGWsPRSCNdz6aoyGSQ= 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 169392396482120.685554475803087; 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-27-ui_MRCEbOi2L6MNd7xh3KQ-1; Tue, 05 Sep 2023 10:25:38 -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 938321817931; Tue, 5 Sep 2023 14:25:00 +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 7C2525CC01; Tue, 5 Sep 2023 14:25:00 +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 610D519465A2; Tue, 5 Sep 2023 14:25:00 +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 CB5B11946597 for ; Tue, 5 Sep 2023 14:24:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AEE231121318; Tue, 5 Sep 2023 14:24:58 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FD771121314 for ; Tue, 5 Sep 2023 14:24:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923963; 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=Mw7+vnayvQzLm23rodP41BdrYXKy58CZwiDUK3gh3dk=; b=g+MPsohgswXaXkfNBy0+i5wwr4mMqGUJsMfWzQ8HLDoAJPUNOLlCAeUByDvBIjrE9pnjf1 EhRiEy4g8xcpBVJojT30gK1MN60LsZ4fPFUFb0RZbpy22lbk+Powlx88Q1urJuojrGBXCp XxcM6RcI4+ZaKt39YAHs5RHdkHAPtQk= X-MC-Unique: ui_MRCEbOi2L6MNd7xh3KQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 32/51] qemuxml2argvtest: Assume QEMU_CAPS_CPU_MIGRATABLE and QEMU_CAPS_SMP_DIES for fake-caps tests Date: Tue, 5 Sep 2023 16:23:59 +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: 1693923965662100009 Content-Type: text/plain; charset="utf-8" Assume the two features modern qemus have to bring the test data closer to the 'latest' real-caps versions. Signed-off-by: Peter Krempa --- tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +- tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-check-default-none.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-host-passthrough-features.args | 2 +- tests/qemuxml2argvdata/cpu-host-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +- tests/qemuxml2argvdata/cpu-numa-memshared.args | 2 +- tests/qemuxml2argvdata/cpu-numa-no-memory-element.args | 2 +- tests/qemuxml2argvdata/cpu-numa1.args | 2 +- tests/qemuxml2argvdata/cpu-numa2.args | 2 +- tests/qemuxml2argvdata/cpu-phys-bits-emulate.args | 2 +- tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-topology1.args | 2 +- tests/qemuxml2argvdata/cpu-topology2.args | 2 +- tests/qemuxml2argvdata/cpu-topology3.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 2 +- tests/qemuxml2argvdata/memory-hotplug.args | 2 +- tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args | 2 +- .../numad-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +- tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args | 2 +- tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/numad.args | 2 +- tests/qemuxml2argvdata/pci-expander-bus.args | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +- tests/qemuxml2argvdata/smp.args | 2 +- tests/qemuxml2argvtest.c | 4 ++++ 28 files changed, 31 insertions(+), 27 deletions(-) diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2= argvdata/cpu-cache-disable.args index 7f62c5c52e..f4b2fc51d6 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ --cpu host,host-cache-info=3Doff,l3-cache=3Doff \ +-cpu host,migratable=3Don,host-cache-info=3Doff,l3-cache=3Doff \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemux= ml2argvdata/cpu-cache-emulate-l3.args index ccc04d0691..15ca76b6ab 100644 --- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args +++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ --cpu host,l3-cache=3Don,host-cache-info=3Doff \ +-cpu host,migratable=3Don,l3-cache=3Don,host-cache-info=3Doff \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemu= xml2argvdata/cpu-cache-passthrough.args index 31f9002006..90261c5e5a 100644 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ --cpu host,host-cache-info=3Don,l3-cache=3Doff \ +-cpu host,migratable=3Don,host-cache-info=3Don,l3-cache=3Doff \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qem= uxml2argvdata/cpu-check-default-none.args index 71b3fedf8f..2f81053374 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none.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 kvm \ --cpu host \ +-cpu host,migratable=3Don \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2= argvdata/cpu-host-kvmclock.args index 9cb0ca84c4..4201ea331c 100644 --- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.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 kvm \ --cpu host,kvmclock=3Doff \ +-cpu host,migratable=3Don,kvmclock=3Doff \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/te= sts/qemuxml2argvdata/cpu-host-passthrough-features.args index 8604ce1586..2eedf77cad 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.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 kvm \ --cpu host,abm=3Don,ds=3Don,invtsc=3Doff \ +-cpu host,migratable=3Don,abm=3Don,ds=3Don,invtsc=3Doff \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemux= ml2argvdata/cpu-host-passthrough.args index 71b3fedf8f..2f81053374 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough.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 kvm \ --cpu host \ +-cpu host,migratable=3Don \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2= argvdata/cpu-numa-disjoint.args index 938a3ef3e2..3b12934425 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=3D1,cores=3D4,threads=3D2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":11219763= 2}' \ -numa node,nodeid=3D0,cpus=3D0-3,cpus=3D8-11,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":11219763= 2}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml= 2argvdata/cpu-numa-memshared.args index 4d33efb8e6..0c9ec88b8b 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=3D1,cores=3D4,threads=3D2 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":true,"size":112197= 632}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1","share":false,"size":11219= 7632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests= /qemuxml2argvdata/cpu-numa-no-memory-element.args index 80fc7306f7..31a61f023e 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=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}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata= /cpu-numa1.args index 80fc7306f7..31a61f023e 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.args +++ b/tests/qemuxml2argvdata/cpu-numa1.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=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}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata= /cpu-numa2.args index 80fc7306f7..31a61f023e 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.args +++ b/tests/qemuxml2argvdata/cpu-numa2.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=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}' \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args b/tests/qemu= xml2argvdata/cpu-phys-bits-emulate.args index 921dc891e3..3bf7649161 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ --cpu host,phys-bits=3D42 \ +-cpu host,migratable=3Don,phys-bits=3D42 \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args b/tests/= qemuxml2argvdata/cpu-phys-bits-passthrough.args index 12d5e59505..9dea8a3b1b 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ --cpu host,host-phys-bits=3Don \ +-cpu host,migratable=3Don,host-phys-bits=3Don \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argv= data/cpu-topology1.args index 1f81bc2149..c11b4cd307 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.args +++ b/tests/qemuxml2argvdata/cpu-topology1.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,cores=3D2,threads=3D1 \ +-smp 6,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-topology2.args b/tests/qemuxml2argv= data/cpu-topology2.args index b11f49db05..4639d34c56 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.args +++ b/tests/qemuxml2argvdata/cpu-topology2.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=3D1,cores=3D2,threads=3D3 \ +-smp 6,sockets=3D1,dies=3D1,cores=3D2,threads=3D3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argv= data/cpu-topology3.args index 1f81bc2149..c11b4cd307 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.args +++ b/tests/qemuxml2argvdata/cpu-topology3.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,cores=3D2,threads=3D1 \ +-smp 6,sockets=3D3,dies=3D1,cores=3D2,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxm= l2argvdata/memory-hotplug-dimm.args index 5c53800af4..71817da309 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2arg= vdata/memory-hotplug.args index 5cc5608944..53f0fbc68f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/te= sts/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index 261b3804be..d4238f3d9e 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.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,"= host-nodes":[0,1,2,3],"policy":"interleave"}' \ -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 \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-pl= acement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-= placement.args index 261b3804be..d4238f3d9e 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .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,"= host-nodes":[0,1,2,3],"policy":"interleave"}' \ -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 \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/= tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index a9e61c403f..9ddfb286b5 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.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,"= host-nodes":[0],"policy":"interleave"}' \ -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 \ diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/te= sts/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index 261b3804be..d4238f3d9e 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.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,"= host-nodes":[0,1,2,3],"policy":"interleave"}' \ -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 \ diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/num= ad.args index 261b3804be..d4238f3d9e 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.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,"= host-nodes":[0,1,2,3],"policy":"interleave"}' \ -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 \ diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2a= rgvdata/pci-expander-bus.args index 8bf472d386..bf553a8e32 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-expande= r-test/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=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}' \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2= argvdata/pcie-expander-bus.args index c14303213d..674beca027 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pcie-ex= pander-bus-te/.config \ -cpu qemu64 \ -m size=3D219136k \ -overcommit mem-lock=3Doff \ --smp 16,sockets=3D2,cores=3D4,threads=3D2 \ +-smp 16,sockets=3D2,dies=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}' \ diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.a= rgs index 7a589e5a36..352b1d3d6e 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.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=3D2,sockets=3D2,cores=3D1,threads=3D1 \ +-smp 1,maxcpus=3D2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7e1d132bf6..872a26c6dd 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -864,6 +864,8 @@ mymain(void) QEMU_CAPS_SECCOMP_SANDBOX, \ QEMU_CAPS_PIIX3_USB_UHCI, \ QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \ + QEMU_CAPS_CPU_MIGRATABLE, \ + QEMU_CAPS_SMP_DIES, \ __VA_ARGS__, \ QEMU_CAPS_LAST, \ ARG_END) @@ -876,6 +878,8 @@ mymain(void) QEMU_CAPS_SECCOMP_SANDBOX, \ QEMU_CAPS_PIIX3_USB_UHCI, \ QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, \ + QEMU_CAPS_CPU_MIGRATABLE, \ + QEMU_CAPS_SMP_DIES, \ QEMU_CAPS_LAST, \ ARG_END) --=20 2.41.0