From nobody Fri May 3 09:58:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1602057725; cv=none; d=zohomail.com; s=zohoarc; b=RsuwJwSUZs0Zi/bJ2E5FcDMhdEReibhwujBzV7bntHoZZTBAu7eTzoodP6jroV/b2aJiNdghn0yk9qZPbZXj6WsRDHtIgK1+sNXCOJS2IOhlzL2MTTsPXv2WvuI7eVkAU9D3bmTBha/6yu6YxNuZ7dzbXjFcbYzULwzkGq5SjHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602057725; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=a1dAZ9kU5YYFh1Lwd5bWWTaw8C1xy9J1/9entoSHolA=; b=XobESvrv3Ap38WswC5YN5hDjTIMJ62D517jlt08MgiXjmnIWevim1RxlbxQSYJZ5N6TIkpSKJJ/LSfhd3Djs2xEVZan+MG4aiJtLjo6t2c6I8WSa2B3Ra8NGSBDBJ6P534WTDW/0vn2+sqNNt3ptuhM2X49qwGAwiqOMjByJs30= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602057725161308.99467305594055; Wed, 7 Oct 2020 01:02:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-557-wKSTcPOCOueibEV2Po1Alw-1; Wed, 07 Oct 2020 04:02:01 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0CC5E57059; Wed, 7 Oct 2020 08:01:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CAB5173692; Wed, 7 Oct 2020 08:01:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 50FFB180B658; Wed, 7 Oct 2020 08:01:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09781ow0009559 for ; Wed, 7 Oct 2020 04:01:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8D81C76650; Wed, 7 Oct 2020 08:01:50 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C33C76668; Wed, 7 Oct 2020 08:01:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602057723; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=a1dAZ9kU5YYFh1Lwd5bWWTaw8C1xy9J1/9entoSHolA=; b=TWZmEzs661796MoGqMyIGynEHOqxoTNi03xwNvzYc52WdRKrIBnjqnwdWMdKgVQ5xA9qxb qXVjNvqs2ZOST7P7mfmykclhLXoOwPFvIvS/r4HIbvm22E06BChBPm+IUhzBrex1XM8Fwi wxuks9VDQhRcrO2TNhR6QrVbCmVaQ5A= X-MC-Unique: wKSTcPOCOueibEV2Po1Alw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2] qemu: Don't generate '-machine memory-backend' and '-numa memdev' Date: Wed, 7 Oct 2020 10:01:34 +0200 Message-Id: <2fcaa53735f27c57a23f0ff1bebcbbd6b3192cd3.1602057694.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: msys.mizuma@gmail.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" In 88957116c9 I've switched to -machine memory-backend=3DID and -object memory-backend-* because QEMU is obsoleting -mem-path and -mem-prealloc. However, what I did not foresee was that using -machine memory-backend in combination with -numa is not allowed in QEMU. This was reported upstream and fortunately not released yet. The problem is that if domain has NUMA nodes then we will generate memory-backend-* objects for NUMA nodes (because if QEMU is new enough to expose default RAM ID it also supports -numa memdev=3D) and adding non-NUMA memory backend is wrong. Reported-by: Masayoshi Mizuma Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/qemu/qemu_command.c | 32 +++++++++++++++---- .../hugepages-nvdimm.x86_64-latest.args | 6 +--- ...memory-default-hugepage.x86_64-latest.args | 5 +-- .../memfd-memory-numa.x86_64-latest.args | 5 +-- ...y-hotplug-nvdimm-access.x86_64-latest.args | 4 +-- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 4 +-- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 4 +-- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 4 +-- ...hotplug-nvdimm-readonly.x86_64-latest.args | 4 +-- .../memory-hotplug-nvdimm.x86_64-latest.args | 4 +-- .../numatune-hmat.x86_64-latest.args | 4 +-- ...vhost-user-fs-fd-memory.x86_64-latest.args | 4 +-- ...vhost-user-fs-hugepages.x86_64-latest.args | 5 +-- ...host-user-gpu-secondary.x86_64-latest.args | 3 +- .../vhost-user-vga.x86_64-latest.args | 3 +- 15 files changed, 39 insertions(+), 52 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 476cf6972e..c347f80f08 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6829,7 +6829,6 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virTristateSwitch vmport =3D def->features[VIR_DOMAIN_FEATURE_VMPORT]; virTristateSwitch smm =3D def->features[VIR_DOMAIN_FEATURE_SMM]; virCPUDefPtr cpu =3D def->cpu; - const char *defaultRAMid =3D NULL; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; =20 @@ -7046,11 +7045,24 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, if (virDomainNumaHasHMAT(def->numa)) virBufferAddLit(&buf, ",hmat=3Don"); =20 - defaultRAMid =3D virQEMUCapsGetMachineDefaultRAMid(qemuCaps, - def->virtType, - def->os.machine); - if (defaultRAMid) - virBufferAsprintf(&buf, ",memory-backend=3D%s", defaultRAMid); + if (!virDomainNumaGetNodeCount(def->numa)) { + const char *defaultRAMid =3D NULL; + + /* QEMU is obsoleting -mem-path and -mem-prealloc. That means we h= ave + * to switch to memory-backend-* even for regular RAM and to keep + * domain migratable we have to set the same ID as older QEMUs wou= ld. + * If domain has no NUMA nodes and QEMU is new enough to expose ID= of + * the default RAM we want to use it for default RAM (construct + * memory-backend-* with corresponding attributes instead of obsol= ete + * -mem-path and -mem-prealloc. + * This generates only reference for the memory-backend-* object a= dded + * later in qemuBuildMemCommandLine() */ + defaultRAMid =3D virQEMUCapsGetMachineDefaultRAMid(qemuCaps, + def->virtType, + def->os.machine); + if (defaultRAMid) + virBufferAsprintf(&buf, ",memory-backend=3D%s", defaultRAMid); + } =20 virCommandAddArgBuffer(cmd, &buf); =20 @@ -7216,7 +7228,13 @@ qemuBuildMemCommandLine(virCommandPtr cmd, def->os.machine); =20 if (defaultRAMid) { - qemuBuildMemCommandLineMemoryDefaultBackend(cmd, def, priv, defaul= tRAMid); + /* As documented in qemuBuildMachineCommandLine() if QEMU is new e= nough + * to expose default RAM ID we must use memory-backend-* even for + * regular memory because -mem-path and -mem-prealloc are obsolete. + * However, if domain has one or more NUMA nodes then there is no + * default RAM and we mustn't generate the memory object. */ + if (!virDomainNumaGetNodeCount(def->numa)) + qemuBuildMemCommandLineMemoryDefaultBackend(cmd, def, priv, de= faultRAMid); } else { if (def->mem.allocation =3D=3D VIR_DOMAIN_MEMORY_ALLOCATION_IMMEDI= ATE) { virCommandAddArgList(cmd, "-mem-prealloc", NULL); diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/t= ests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index 192b033e9e..969bb713b5 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -12,13 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don,\ -memory-backend=3Dpc.ram \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ --object memory-backend-file,id=3Dpc.ram,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=3Dyes,preallo= c=3Dyes,\ -size=3D1073741824 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-la= test.args b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-lat= est.args index b43e7d9c3c..ef15e2e97e 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.ar= gs @@ -12,12 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-instance-00000092/master-key.aes \ --machine pc-i440fx-2.3,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,\ -memory-backend=3Dpc.ram \ +-machine pc-i440fx-2.3,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 14336 \ --object memory-backend-memfd,id=3Dpc.ram,hugetlb=3Dyes,hugetlbsize=3D20971= 52,\ -share=3Dyes,prealloc=3Dyes,size=3D15032385536 \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D1,dies=3D1,cores=3D8,threads=3D1 \ -object memory-backend-memfd,id=3Dram-node0,hugetlb=3Dyes,hugetlbsize=3D20= 97152,\ diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/= tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index b43e7d9c3c..ef15e2e97e 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -12,12 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-instance-00000092/master-key.aes \ --machine pc-i440fx-2.3,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,\ -memory-backend=3Dpc.ram \ +-machine pc-i440fx-2.3,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 14336 \ --object memory-backend-memfd,id=3Dpc.ram,hugetlb=3Dyes,hugetlbsize=3D20971= 52,\ -share=3Dyes,prealloc=3Dyes,size=3D15032385536 \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D1,dies=3D1,cores=3D8,threads=3D1 \ -object memory-backend-memfd,id=3Dram-node0,hugetlb=3Dyes,hugetlbsize=3D20= 97152,\ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-lat= est.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-lates= t.args index c5c5befdd5..8d3fa2e867 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -12,11 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don,\ -memory-backend=3Dpc.ram \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-late= st.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.= args index 418bf1158d..4f22f78277 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -12,11 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don,\ -memory-backend=3Dpc.ram \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-late= st.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.= args index 66477a2b09..53dda234a2 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -12,11 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don,\ -memory-backend=3Dpc.ram \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-lates= t.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.ar= gs index 759d749c2e..cac02a6f6d 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -12,11 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don,\ -memory-backend=3Dpc.ram \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-l= atest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-l= atest.args index b195b8625c..5e44496e39 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.a= rgs @@ -12,11 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don,\ -memory-backend=3Dpc.ram \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ --object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D224395264 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.arg= s b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index ae416d7c7f..94f8444d95 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -12,11 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don,\ -memory-backend=3Dpc.ram \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don \ -cpu qemu64 \ -m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ --object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D1073741824 \ diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/test= s/qemuxml2argvdata/numatune-hmat.x86_64-latest.args index be4a9ed871..c52015caa8 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args @@ -12,11 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,hmat=3Don,\ -memory-backend=3Dpc.ram \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,hmat=3Don \ -cpu qemu64 \ -m 12288 \ --object memory-backend-ram,id=3Dpc.ram,size=3D12884901888 \ -overcommit mem-lock=3Doff \ -smp 12,sockets=3D12,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D2147483648 \ diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args index 13359c91fe..dd5f68abc5 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args @@ -12,11 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-guest/master-key.aes \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 14336 \ --object memory-backend-file,id=3Dpc.ram,\ -mem-path=3D/var/lib/libvirt/qemu/ram/-1-guest/pc.ram,share=3Dyes,size=3D15= 032385536 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args index 59f45d466b..e4f5db7a63 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args @@ -12,12 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= pc.ram \ +-machine q35,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 2048 \ --object memory-backend-file,id=3Dpc.ram,\ -mem-path=3D/dev/hugepages2M/libvirt/qemu/-1-guest,share=3Dyes,prealloc=3Dy= es,\ -size=3D2147483648 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,\ diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.= args b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args index e7d3315b8f..e99a5342dc 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -12,10 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 214 \ --object memory-backend-memfd,id=3Dpc.ram,share=3Dyes,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -object memory-backend-memfd,id=3Dram-node0,share=3Dyes,size=3D224395264 \ diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tes= ts/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args index df5b1b481d..277bf8c646 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args @@ -12,10 +12,9 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -cpu qemu64 \ -m 214 \ --object memory-backend-memfd,id=3Dpc.ram,share=3Dyes,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -object memory-backend-memfd,id=3Dram-node0,share=3Dyes,size=3D224395264 \ --=20 2.26.2