From nobody Mon Apr 29 06:09:19 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=1667492551; cv=none; d=zohomail.com; s=zohoarc; b=IkImRJ/r4zgT+QV1rXCtbzZTtFleHNTmr9el7yUzPWA9DybXG+vxO5l31VHb9g82J0TetpGfnoaIoKvo5Gms0+HkWtIUFJzrvJ66mwbRe0lJcRivHLC8kDc+S+Nnfq/dk2+P17LO5xOtizNA1i7YyDl2I3M6kG9rmCEjHSqJ3a0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667492551; 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=EsJMbm+Yu59msyyYOb/sW9FJu3b8wqLEdq6kB0ghGlo=; b=fnZlqa2rm8zzhEEqLMjallCh/9SpvDYikUNZpEvilOQrljx+GqHjUVRarRwmwsL5rD/+6Ui5lN7A54y7ss3iRqtcLzcpCBekuN2E24RNRPhbOuxVYR/14HSp6ngAlWnEAWewxNiX28h0m8fR7IOVMwyFMiNNlIoUfoU9W+ofhX8= 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 1667492551477616.4118244134896; Thu, 3 Nov 2022 09:22:31 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-609-Zy29hikDMEenOvq89feQAg-1; Thu, 03 Nov 2022 12:22:23 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A8F6F381A729; Thu, 3 Nov 2022 16:22:17 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 579B3492B06; Thu, 3 Nov 2022 16:22:17 +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 EFC301946A42; Thu, 3 Nov 2022 16:22:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 17CED1946594 for ; Thu, 3 Nov 2022 16:22:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id F2CA61402BDA; Thu, 3 Nov 2022 16:22:15 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 430971402BD9 for ; Thu, 3 Nov 2022 16:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667492550; 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=EsJMbm+Yu59msyyYOb/sW9FJu3b8wqLEdq6kB0ghGlo=; b=MEAl7G/2Zz14eYpAbVkDT2YAh6pHxeOxojR5tQslNrlvwY7Q5Yh9bdYsX5n5/jCBDQUDn3 jHUBbtTesnd1PsY5jppUkhNDx92snTik1X8ypfddO/iB+qNkdBTrYP7s5Qq64VUrKDm4rO umiPBfIAVZ6BGEkfv+TPV3knps1QrV8= X-MC-Unique: Zy29hikDMEenOvq89feQAg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 01/15] qemuxml2argvtest: Convert hugepages related tests to _CAPS_LATEST Date: Thu, 3 Nov 2022 17:21:59 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.10 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: 1667492552715100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Currently, we have maybe a dozen tests for hugepages related stuff in qemuxml2argvtest. In all cases DO_TEST() is used, which means we have to enumerate all capabilities needed (though, it's usually just QEMU_CAPS_OBJECT_MEMORY_RAM and QEMU_CAPS_OBJECT_MEMORY_FILE, exceptionally QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD too). Nevertheless, these caps made sense back in QEMU 2.X era when these objects were being introduced. But now, almost 8 years after the fact we can safely assume every QEMU knows these caps. Therefore, switch to DO_TEST_CAPS_LATEST(). The qemuxml2xmltest will undergo similar treatment in next commit. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- ...> hugepages-default-2M.x86_64-latest.args} | 11 ++-- .../qemuxml2argvdata/hugepages-default-2M.xml | 4 +- ...es-default-system-size.x86_64-latest.args} | 13 ++-- .../hugepages-default-system-size.xml | 4 +- ...s =3D> hugepages-default.x86_64-latest.args} | 15 ++--- tests/qemuxml2argvdata/hugepages-default.xml | 4 +- .../qemuxml2argvdata/hugepages-memaccess.args | 44 ------------- .../hugepages-memaccess.x86_64-latest.args | 46 ++++++++++++++ .../qemuxml2argvdata/hugepages-memaccess.xml | 4 +- .../hugepages-memaccess2.args | 44 ------------- .../hugepages-memaccess2.x86_64-latest.args | 46 ++++++++++++++ .../qemuxml2argvdata/hugepages-memaccess2.xml | 4 +- ...epages-nodeset-nonexist.x86_64-latest.err} | 0 .../hugepages-nodeset-nonexist.xml | 4 +- ...s =3D> hugepages-nodeset.x86_64-latest.args} | 15 +++-- tests/qemuxml2argvdata/hugepages-nodeset.xml | 4 +- ...epages-numa-default-2M.x86_64-latest.args} | 14 +++-- .../hugepages-numa-default-2M.xml | 4 +- ...ages-numa-default-dimm.x86_64-latest.args} | 15 ++--- ...hugepages-numa-default.x86_64-latest.args} | 11 ++-- ...s-numa-nodeset-nonexist.x86_64-latest.err} | 0 .../hugepages-numa-nodeset-nonexist.xml | 4 +- ...ages-numa-nodeset-part.x86_64-latest.args} | 12 ++-- .../hugepages-numa-nodeset-part.xml | 4 +- .../hugepages-numa-nodeset.x86_64-latest.args | 40 ++++++++++++ .../hugepages-numa-nodeset.xml | 4 +- tests/qemuxml2argvdata/hugepages-shared.args | 42 ------------- .../hugepages-shared.x86_64-latest.args | 44 +++++++++++++ tests/qemuxml2argvdata/hugepages-shared.xml | 4 +- .../qemuxml2argvdata/pages-dimm-discard.args | 35 ----------- .../pages-dimm-discard.x86_64-latest.args | 38 ++++++++++++ .../pages-discard-hugepages.args | 34 ---------- ...pages-discard-hugepages.x86_64-latest.args | 36 +++++++++++ .../pages-discard-hugepages.xml | 4 +- tests/qemuxml2argvdata/pages-discard.args | 34 ---------- ....args =3D> pages-discard.x86_64-latest.args} | 16 ++--- tests/qemuxml2argvdata/pages-discard.xml | 4 +- tests/qemuxml2argvtest.c | 62 +++++-------------- .../qemuxml2xmloutdata/hugepages-default.xml | 4 +- .../qemuxml2xmloutdata/hugepages-nodeset.xml | 4 +- .../hugepages-numa-default-2M.xml | 4 +- .../hugepages-numa-nodeset-part.xml | 4 +- .../hugepages-numa-nodeset.xml | 4 +- tests/qemuxml2xmloutdata/hugepages-shared.xml | 4 +- 44 files changed, 375 insertions(+), 372 deletions(-) rename tests/qemuxml2argvdata/{hugepages-default-system-size.args =3D> hug= epages-default-2M.x86_64-latest.args} (55%) rename tests/qemuxml2argvdata/{hugepages-default-2M.args =3D> hugepages-de= fault-system-size.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{hugepages-default.args =3D> hugepages-defau= lt.x86_64-latest.args} (51%) delete mode 100644 tests/qemuxml2argvdata/hugepages-memaccess.args create mode 100644 tests/qemuxml2argvdata/hugepages-memaccess.x86_64-lates= t.args delete mode 100644 tests/qemuxml2argvdata/hugepages-memaccess2.args create mode 100644 tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-late= st.args rename tests/qemuxml2argvdata/{hugepages-nodeset-nonexist.err =3D> hugepag= es-nodeset-nonexist.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hugepages-numa-default-2M.args =3D> hugepag= es-nodeset.x86_64-latest.args} (55%) rename tests/qemuxml2argvdata/{hugepages-nodeset.args =3D> hugepages-numa-= default-2M.x86_64-latest.args} (51%) rename tests/qemuxml2argvdata/{hugepages-numa-default-dimm.args =3D> hugep= ages-numa-default-dimm.x86_64-latest.args} (51%) rename tests/qemuxml2argvdata/{hugepages-numa-default.args =3D> hugepages-= numa-default.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{hugepages-numa-nodeset-nonexist.err =3D> hu= gepages-numa-nodeset-nonexist.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hugepages-numa-nodeset-part.args =3D> hugep= ages-numa-nodeset-part.x86_64-latest.args} (60%) create mode 100644 tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-la= test.args delete mode 100644 tests/qemuxml2argvdata/hugepages-shared.args create mode 100644 tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.a= rgs delete mode 100644 tests/qemuxml2argvdata/pages-dimm-discard.args create mode 100644 tests/qemuxml2argvdata/pages-dimm-discard.x86_64-latest= .args delete mode 100644 tests/qemuxml2argvdata/pages-discard-hugepages.args create mode 100644 tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-l= atest.args delete mode 100644 tests/qemuxml2argvdata/pages-discard.args rename tests/qemuxml2argvdata/{hugepages-numa-nodeset.args =3D> pages-disc= ard.x86_64-latest.args} (59%) diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args b/te= sts/qemuxml2argvdata/hugepages-default-2M.x86_64-latest.args similarity index 55% rename from tests/qemuxml2argvdata/hugepages-default-system-size.args rename to tests/qemuxml2argvdata/hugepages-default-2M.x86_64-latest.args index ba2fcb6d67..50f1228093 100644 --- a/tests/qemuxml2argvdata/hugepages-default-system-size.args +++ b/tests/qemuxml2argvdata/hugepages-default-2M.x86_64-latest.args @@ -6,13 +6,15 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DSomeDummyHugepagesGuest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-Some= DummyHugepagesGu/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-SomeDummyHugepagesGu/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ +-object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/= hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","x-use-canonical-path-for= -ramblock-id":false,"prealloc":true,"size":1073741824}' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ @@ -25,6 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu= /.config \ -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"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.xml b/tests/qemuxm= l2argvdata/hugepages-default-2M.xml index fd3666c149..296933c6f2 100644 --- a/tests/qemuxml2argvdata/hugepages-default-2M.xml +++ b/tests/qemuxml2argvdata/hugepages-default-2M.xml @@ -10,7 +10,7 @@ 2 - hvm + hvm @@ -18,7 +18,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args b/tests/qemux= ml2argvdata/hugepages-default-system-size.x86_64-latest.args similarity index 61% rename from tests/qemuxml2argvdata/hugepages-default-2M.args rename to tests/qemuxml2argvdata/hugepages-default-system-size.x86_64-lates= t.args index 55aa0e8f52..a65bff0546 100644 --- a/tests/qemuxml2argvdata/hugepages-default-2M.args +++ b/tests/qemuxml2argvdata/hugepages-default-system-size.x86_64-latest.ar= gs @@ -6,15 +6,15 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DSomeDummyHugepagesGuest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-Some= DummyHugepagesGu/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-SomeDummyHugepagesGu/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ --mem-prealloc \ --mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ @@ -27,6 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu= /.config \ -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"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.xml b/tes= ts/qemuxml2argvdata/hugepages-default-system-size.xml index ac34623ed9..f9c99da400 100644 --- a/tests/qemuxml2argvdata/hugepages-default-system-size.xml +++ b/tests/qemuxml2argvdata/hugepages-default-system-size.xml @@ -10,7 +10,7 @@ 2 - hvm + hvm @@ -18,7 +18,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/hugepages-default.args b/tests/qemuxml2= argvdata/hugepages-default.x86_64-latest.args similarity index 51% rename from tests/qemuxml2argvdata/hugepages-default.args rename to tests/qemuxml2argvdata/hugepages-default.x86_64-latest.args index 9bfb277454..43e1b33e5b 100644 --- a/tests/qemuxml2argvdata/hugepages-default.args +++ b/tests/qemuxml2argvdata/hugepages-default.x86_64-latest.args @@ -6,15 +6,15 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 214 \ --mem-prealloc \ --mem-path /dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1 \ +-object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/= hugepages2M/libvirt/qemu/-1-QEMUGuest1","x-use-canonical-path-for-ramblock-= id":false,"prealloc":true,"size":224395264}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -27,7 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-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/hugepages-default.xml b/tests/qemuxml2a= rgvdata/hugepages-default.xml index 18508b381f..de1006b7d7 100644 --- a/tests/qemuxml2argvdata/hugepages-default.xml +++ b/tests/qemuxml2argvdata/hugepages-default.xml @@ -8,7 +8,7 @@ 1 - hvm + hvm @@ -16,7 +16,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxm= l2argvdata/hugepages-memaccess.args deleted file mode 100644 index 2d9431dab1..0000000000 --- a/tests/qemuxml2argvdata/hugepages-memaccess.args +++ /dev/null @@ -1,44 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D4194304k,slots=3D16,maxmem=3D8388608k \ --overcommit mem-lock=3Doff \ --smp 4,sockets=3D4,cores=3D1,threads=3D1 \ --object memory-backend-file,id=3Dram-node0,mem-path=3D/dev/hugepages1G/lib= virt/qemu/-1-QEMUGuest1,share=3Doff,prealloc=3Don,size=3D1073741824,host-no= des=3D0-3,policy=3Dbind \ --numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dram-node1,mem-path=3D/dev/hugepages2M/lib= virt/qemu/-1-QEMUGuest1,share=3Don,prealloc=3Don,size=3D1073741824,host-nod= es=3D0-3,policy=3Dbind \ --numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ --object memory-backend-file,id=3Dram-node2,mem-path=3D/dev/hugepages1G/lib= virt/qemu/-1-QEMUGuest1,share=3Doff,prealloc=3Don,size=3D1073741824,host-no= des=3D0-3,policy=3Dbind \ --numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ --object memory-backend-file,id=3Dram-node3,mem-path=3D/dev/hugepages1G/lib= virt/qemu/-1-QEMUGuest1,share=3Doff,prealloc=3Don,size=3D1073741824,host-no= des=3D3,policy=3Dbind \ --numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ --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 \ --object memory-backend-file,id=3Dmemdimm0,mem-path=3D/dev/hugepages2M/libv= irt/qemu/-1-QEMUGuest1,share=3Don,prealloc=3Don,size=3D536870912,host-nodes= =3D0-3,policy=3Dbind \ --device pc-dimm,node=3D1,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0,addr=3D4294= 967296 \ --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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.x86_64-latest.args = b/tests/qemuxml2argvdata/hugepages-memaccess.x86_64-latest.args new file mode 100644 index 0000000000..55a8d899b7 --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-memaccess.x86_64-latest.args @@ -0,0 +1,46 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/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":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D4194304k,slots=3D16,maxmem=3D8388608k \ +-overcommit mem-lock=3Doff \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","share":false,"prealloc":true,"s= ize":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"si= ze":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node2","mem-path":"/d= ev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","share":false,"prealloc":true,"s= ize":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node3","mem-path":"/d= ev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","share":false,"prealloc":true,"s= ize":1073741824,"host-nodes":[3],"policy":"bind"}' \ +-numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ +-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 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memdimm0","mem-path":"/de= v/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"siz= e":536870912,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-device '{"driver":"pc-dimm","node":1,"memdev":"memdimm0","id":"dimm0","sl= ot":0,"addr":4294967296}' \ +-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":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.xml b/tests/qemuxml= 2argvdata/hugepages-memaccess.xml index e09a8af8af..9d63ac4a3d 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess.xml +++ b/tests/qemuxml2argvdata/hugepages-memaccess.xml @@ -17,7 +17,7 @@ - hvm + hvm @@ -33,7 +33,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemux= ml2argvdata/hugepages-memaccess2.args deleted file mode 100644 index 0264fc7da9..0000000000 --- a/tests/qemuxml2argvdata/hugepages-memaccess2.args +++ /dev/null @@ -1,44 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D4194304k,slots=3D16,maxmem=3D8388608k \ --overcommit mem-lock=3Doff \ --smp 4,sockets=3D4,cores=3D1,threads=3D1 \ --object memory-backend-file,id=3Dram-node0,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-QEMUGuest1/ram-node0,share=3Doff,size=3D1073741824,host-nodes=3D0-= 3,policy=3Dbind \ --numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dram-node1,mem-path=3D/dev/hugepages2M/lib= virt/qemu/-1-QEMUGuest1,share=3Don,prealloc=3Don,size=3D1073741824,host-nod= es=3D0-3,policy=3Dbind \ --numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ --object memory-backend-file,id=3Dram-node2,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-QEMUGuest1/ram-node2,share=3Doff,size=3D1073741824,host-nodes=3D0-= 3,policy=3Dbind \ --numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ --object memory-backend-file,id=3Dram-node3,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-QEMUGuest1/ram-node3,share=3Doff,size=3D1073741824,host-nodes=3D3,= policy=3Dbind \ --numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ --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 \ --object memory-backend-file,id=3Dmemdimm0,mem-path=3D/dev/hugepages2M/libv= irt/qemu/-1-QEMUGuest1,share=3Don,prealloc=3Don,size=3D536870912,host-nodes= =3D0-3,policy=3Dbind \ --device pc-dimm,node=3D1,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0,addr=3D4294= 967296 \ --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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args= b/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args new file mode 100644 index 0000000000..187c0ab214 --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args @@ -0,0 +1,46 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/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":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D4194304k,slots=3D16,maxmem=3D8388608k \ +-overcommit mem-lock=3Doff \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":false,"size":10737= 41824,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"si= ze":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node2","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node2","share":false,"size":10737= 41824,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node3","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3","share":false,"size":10737= 41824,"host-nodes":[3],"policy":"bind"}' \ +-numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ +-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 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memdimm0","mem-path":"/de= v/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"siz= e":536870912,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-device '{"driver":"pc-dimm","node":1,"memdev":"memdimm0","id":"dimm0","sl= ot":0,"addr":4294967296}' \ +-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":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.xml b/tests/qemuxm= l2argvdata/hugepages-memaccess2.xml index 714f70b31d..119662b773 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess2.xml +++ b/tests/qemuxml2argvdata/hugepages-memaccess2.xml @@ -17,7 +17,7 @@ - hvm + hvm @@ -33,7 +33,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.err b/tests/= qemuxml2argvdata/hugepages-nodeset-nonexist.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-nodeset-nonexist.err rename to tests/qemuxml2argvdata/hugepages-nodeset-nonexist.x86_64-latest.e= rr diff --git a/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml b/tests/= qemuxml2argvdata/hugepages-nodeset-nonexist.xml index e082725844..1993a13aed 100644 --- a/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml +++ b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml @@ -10,7 +10,7 @@ 2 - hvm + hvm @@ -18,7 +18,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args b/tests/= qemuxml2argvdata/hugepages-nodeset.x86_64-latest.args similarity index 55% rename from tests/qemuxml2argvdata/hugepages-numa-default-2M.args rename to tests/qemuxml2argvdata/hugepages-nodeset.x86_64-latest.args index 75c0e8e7ca..50f1228093 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args +++ b/tests/qemuxml2argvdata/hugepages-nodeset.x86_64-latest.args @@ -6,19 +6,17 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DSomeDummyHugepagesGuest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-Some= DummyHugepagesGu/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-SomeDummyHugepagesGu/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ +-object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/= hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","x-use-canonical-path-for= -ramblock-id":false,"prealloc":true,"size":1073741824}' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --mem-prealloc \ --mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \ --numa node,nodeid=3D0,cpus=3D0,mem=3D256 \ --numa node,nodeid=3D1,cpus=3D1,mem=3D768 \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ -display none \ -no-user-config \ @@ -29,6 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu= /.config \ -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"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.xml b/tests/qemuxml2a= rgvdata/hugepages-nodeset.xml index 6aae88741c..5549cb82ff 100644 --- a/tests/qemuxml2argvdata/hugepages-nodeset.xml +++ b/tests/qemuxml2argvdata/hugepages-nodeset.xml @@ -10,7 +10,7 @@ 2 - hvm + hvm @@ -18,7 +18,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args b/tests/qemuxml2= argvdata/hugepages-numa-default-2M.x86_64-latest.args similarity index 51% rename from tests/qemuxml2argvdata/hugepages-nodeset.args rename to tests/qemuxml2argvdata/hugepages-numa-default-2M.x86_64-latest.ar= gs index 55aa0e8f52..55e21da98b 100644 --- a/tests/qemuxml2argvdata/hugepages-nodeset.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.x86_64-latest.args @@ -6,17 +6,20 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DSomeDummyHugepagesGuest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-Some= DummyHugepagesGu/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-SomeDummyHugepagesGu/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ --mem-prealloc \ --mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","prealloc":true,"size"= :268435456}' \ +-numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","prealloc":true,"size"= :805306368}' \ +-numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ -display none \ -no-user-config \ @@ -27,6 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu= /.config \ -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"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml b/tests/q= emuxml2argvdata/hugepages-numa-default-2M.xml index 87811aaf4b..130af8dd81 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml +++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml @@ -10,7 +10,7 @@ 2 - hvm + hvm @@ -24,7 +24,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/test= s/qemuxml2argvdata/hugepages-numa-default-dimm.x86_64-latest.args similarity index 51% rename from tests/qemuxml2argvdata/hugepages-numa-default-dimm.args rename to tests/qemuxml2argvdata/hugepages-numa-default-dimm.x86_64-latest.= args index 0cde2b06d3..015464bded 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.x86_64-latest.args @@ -9,15 +9,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfedora,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fedo= ra/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu qemu64 \ -m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --mem-prealloc \ --mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \ --numa node,nodeid=3D0,cpus=3D0-1,mem=3D1024 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-fedora","prealloc":true,"size":1073741824}' \ +-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ @@ -28,8 +28,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ --object memory-backend-file,id=3Dmemdimm0,mem-path=3D/dev/hugepages1G/libv= irt/qemu/-1-fedora,size=3D1073741824,host-nodes=3D1-3,policy=3Dbind \ --device pc-dimm,node=3D0,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memdimm0","mem-path":"/de= v/hugepages1G/libvirt/qemu/-1-fedora","prealloc":true,"size":1073741824,"ho= st-nodes":[1,2,3],"policy":"bind"}' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","sl= ot":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args b/tests/qem= uxml2argvdata/hugepages-numa-default.x86_64-latest.args similarity index 60% rename from tests/qemuxml2argvdata/hugepages-numa-default.args rename to tests/qemuxml2argvdata/hugepages-numa-default.x86_64-latest.args index ea1766ab2f..450fcb15fe 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default.x86_64-latest.args @@ -9,15 +9,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dfedora,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fedo= ra/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --mem-prealloc \ --mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \ --numa node,nodeid=3D0,cpus=3D0-1,mem=3D1024 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-fedora","prealloc":true,"size":1073741824}' \ +-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -display none \ -no-user-config \ @@ -28,6 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -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"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.err b/t= ests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.err rename to tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.x86_64-lat= est.err diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml b/t= ests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml index eed8922071..4b26e07ad5 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml @@ -11,7 +11,7 @@ 4 - hvm + hvm @@ -27,7 +27,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args b/test= s/qemuxml2argvdata/hugepages-numa-nodeset-part.x86_64-latest.args similarity index 60% rename from tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args rename to tests/qemuxml2argvdata/hugepages-numa-nodeset-part.x86_64-latest.= args index 5af3aa370e..d1300996c3 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.x86_64-latest.args @@ -6,18 +6,19 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DSomeDummyHugepagesGuest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-Some= DummyHugepagesGu/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-SomeDummyHugepagesGu/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu qemu64 \ -m 1024 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --object memory-backend-ram,id=3Dram-node0,size=3D268435456 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":26843545= 6}' \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dram-node1,mem-path=3D/dev/hugepages1G/lib= virt/qemu/-1-SomeDummyHugepagesGu,prealloc=3Don,size=3D805306368 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/d= ev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu","prealloc":true,"size"= :805306368}' \ -numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ -display none \ @@ -29,6 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu= /.config \ -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"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml b/tests= /qemuxml2argvdata/hugepages-numa-nodeset-part.xml index 6c0eb24c98..5fbf6b5e85 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml @@ -10,7 +10,7 @@ 2 - hvm + hvm @@ -24,7 +24,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-latest.args new file mode 100644 index 0000000000..62a5eca51f --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-latest.args @@ -0,0 +1,40 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/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":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m 4096 \ +-overcommit mem-lock=3Doff \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":107374182= 4}' \ +-numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":107374182= 4}' \ +-numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node2","mem-path":"/d= ev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":107374182= 4}' \ +-numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node3","mem-path":"/d= ev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":107374182= 4}' \ +-numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ +-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 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml b/tests/qemu= xml2argvdata/hugepages-numa-nodeset.xml index 00d390dc20..31ebc1553a 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml @@ -11,7 +11,7 @@ 4 - hvm + hvm @@ -27,7 +27,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2a= rgvdata/hugepages-shared.args deleted file mode 100644 index 08ce2f49cd..0000000000 --- a/tests/qemuxml2argvdata/hugepages-shared.args +++ /dev/null @@ -1,42 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m 4096 \ --overcommit mem-lock=3Doff \ --smp 4,sockets=3D4,cores=3D1,threads=3D1 \ --object memory-backend-file,id=3Dram-node0,mem-path=3D/dev/hugepages1G/lib= virt/qemu/-1-QEMUGuest1,prealloc=3Don,size=3D1073741824,host-nodes=3D0-3,po= licy=3Dbind \ --numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dram-node1,mem-path=3D/dev/hugepages2M/lib= virt/qemu/-1-QEMUGuest1,share=3Don,prealloc=3Don,size=3D1073741824,host-nod= es=3D0-3,policy=3Dbind \ --numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ --object memory-backend-file,id=3Dram-node2,mem-path=3D/dev/hugepages1G/lib= virt/qemu/-1-QEMUGuest1,share=3Doff,prealloc=3Don,size=3D1073741824,host-no= des=3D0-3,policy=3Dbind \ --numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ --object memory-backend-file,id=3Dram-node3,mem-path=3D/dev/hugepages1G/lib= virt/qemu/-1-QEMUGuest1,prealloc=3Don,size=3D1073741824,host-nodes=3D3,poli= cy=3Dbind \ --numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ --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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args b/t= ests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args new file mode 100644 index 0000000000..f4fea870fc --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args @@ -0,0 +1,44 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/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":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m 4096 \ +-overcommit mem-lock=3Doff \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":107374182= 4,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"si= ze":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node2","mem-path":"/d= ev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","share":false,"prealloc":true,"s= ize":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node3","mem-path":"/d= ev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":107374182= 4,"host-nodes":[3],"policy":"bind"}' \ +-numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ +-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 \ +-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/hugepages-shared.xml b/tests/qemuxml2ar= gvdata/hugepages-shared.xml index 462ca8a5ae..33abe71d9e 100644 --- a/tests/qemuxml2argvdata/hugepages-shared.xml +++ b/tests/qemuxml2argvdata/hugepages-shared.xml @@ -15,7 +15,7 @@ - hvm + hvm @@ -31,7 +31,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml= 2argvdata/pages-dimm-discard.args deleted file mode 100644 index 7f2cfa4234..0000000000 --- a/tests/qemuxml2argvdata/pages-dimm-discard.args +++ /dev/null @@ -1,35 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-fedora \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-fedora/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-fedora/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3Dfedora,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fedo= ra/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ --overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --numa node,nodeid=3D0,cpus=3D0-1,mem=3D1024 \ --uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ --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 \ --object memory-backend-file,id=3Dmemdimm0,mem-path=3D/dev/hugepages1G/libv= irt/qemu/-1-fedora,prealloc=3Don,size=3D1073741824,host-nodes=3D1-3,policy= =3Dbind \ --device pc-dimm,node=3D0,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0 \ --object memory-backend-file,id=3Dmemdimm1,mem-path=3D/var/lib/libvirt/qemu= /ram/-1-fedora/dimm1,discard-data=3Don,share=3Doff,size=3D536870912 \ --device pc-dimm,node=3D0,memdev=3Dmemdimm1,id=3Ddimm1,slot=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.x86_64-latest.args b= /tests/qemuxml2argvdata/pages-dimm-discard.x86_64-latest.args new file mode 100644 index 0000000000..6324443e93 --- /dev/null +++ b/tests/qemuxml2argvdata/pages-dimm-discard.x86_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-fedora \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-fedora/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-fedora/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dfedora,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-fedora/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D1048576k,slots=3D16,maxmem=3D1099511627776k \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":10737418= 24}' \ +-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memdimm0","mem-path":"/de= v/hugepages1G/libvirt/qemu/-1-fedora","prealloc":true,"size":1073741824,"ho= st-nodes":[1,2,3],"policy":"bind"}' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","sl= ot":0}' \ +-object '{"qom-type":"memory-backend-file","id":"memdimm1","mem-path":"/va= r/lib/libvirt/qemu/ram/-1-fedora/dimm1","discard-data":true,"share":false,"= size":536870912}' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm1","id":"dimm1","sl= ot":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/pages-discard-hugepages.args b/tests/qe= muxml2argvdata/pages-discard-hugepages.args deleted file mode 100644 index 75c0e8e7ca..0000000000 --- a/tests/qemuxml2argvdata/pages-discard-hugepages.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \ -/usr/bin/qemu-system-i386 \ --name guest=3DSomeDummyHugepagesGuest,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-Some= DummyHugepagesGu/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m 1024 \ --overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --mem-prealloc \ --mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \ --numa node,nodeid=3D0,cpus=3D0,mem=3D256 \ --numa node,nodeid=3D1,cpus=3D1,mem=3D768 \ --uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ --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"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-latest.args new file mode 100644 index 0000000000..880e0de192 --- /dev/null +++ b/tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DSomeDummyHugepagesGuest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-SomeDummyHugepagesGu/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","prealloc":true,"size"= :268435456}' \ +-numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","discard-data":true,"p= realloc":true,"size":805306368}' \ +-numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ +-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ +-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 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.xml b/tests/qem= uxml2argvdata/pages-discard-hugepages.xml index 953d0c5d20..70c5eca0d0 100644 --- a/tests/qemuxml2argvdata/pages-discard-hugepages.xml +++ b/tests/qemuxml2argvdata/pages-discard-hugepages.xml @@ -8,7 +8,7 @@ 2 - hvm + hvm @@ -22,7 +22,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/pages-discard.args b/tests/qemuxml2argv= data/pages-discard.args deleted file mode 100644 index b7d2731755..0000000000 --- a/tests/qemuxml2argvdata/pages-discard.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m 4096 \ --overcommit mem-lock=3Doff \ --smp 4,sockets=3D4,cores=3D1,threads=3D1 \ --numa node,nodeid=3D0,cpus=3D0,mem=3D1024 \ --numa node,nodeid=3D1,cpus=3D1,mem=3D1024 \ --numa node,nodeid=3D2,cpus=3D2,mem=3D1024 \ --numa node,nodeid=3D3,cpus=3D3,mem=3D1024 \ --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 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args b/tests/qem= uxml2argvdata/pages-discard.x86_64-latest.args similarity index 59% rename from tests/qemuxml2argvdata/hugepages-numa-nodeset.args rename to tests/qemuxml2argvdata/pages-discard.x86_64-latest.args index 89018d92a2..4f43c6f504 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args +++ b/tests/qemuxml2argvdata/pages-discard.x86_64-latest.args @@ -6,22 +6,23 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu qemu64 \ -m 4096 \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ --object memory-backend-file,id=3Dram-node0,mem-path=3D/dev/hugepages1G/lib= virt/qemu/-1-QEMUGuest1,prealloc=3Don,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":10737418= 24}' \ -numa node,nodeid=3D0,cpus=3D0,memdev=3Dram-node0 \ --object memory-backend-file,id=3Dram-node1,mem-path=3D/dev/hugepages2M/lib= virt/qemu/-1-QEMUGuest1,prealloc=3Don,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":10737418= 24}' \ -numa node,nodeid=3D1,cpus=3D1,memdev=3Dram-node1 \ --object memory-backend-file,id=3Dram-node2,mem-path=3D/dev/hugepages1G/lib= virt/qemu/-1-QEMUGuest1,prealloc=3Don,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":10737418= 24}' \ -numa node,nodeid=3D2,cpus=3D2,memdev=3Dram-node2 \ --object memory-backend-file,id=3Dram-node3,mem-path=3D/dev/hugepages1G/lib= virt/qemu/-1-QEMUGuest1,prealloc=3Don,size=3D1073741824 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node3","size":10737418= 24}' \ -numa node,nodeid=3D3,cpus=3D3,memdev=3Dram-node3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ @@ -33,6 +34,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pages-discard.xml b/tests/qemuxml2argvd= ata/pages-discard.xml index 58a59a370c..99b842dabf 100644 --- a/tests/qemuxml2argvdata/pages-discard.xml +++ b/tests/qemuxml2argvdata/pages-discard.xml @@ -8,7 +8,7 @@ 4 - hvm + hvm @@ -24,7 +24,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7ede68d555..227493fe32 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1214,54 +1214,26 @@ mymain(void) DO_TEST_NOCAPS("pmu-feature"); DO_TEST_NOCAPS("pmu-feature-off"); =20 - DO_TEST("pages-discard", - QEMU_CAPS_OBJECT_MEMORY_FILE, - QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD); - DO_TEST("pages-discard-hugepages", - QEMU_CAPS_OBJECT_MEMORY_RAM, - QEMU_CAPS_OBJECT_MEMORY_FILE, - QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD); - DO_TEST("pages-dimm-discard", - QEMU_CAPS_DEVICE_PC_DIMM, - QEMU_CAPS_OBJECT_MEMORY_FILE, - QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD); - DO_TEST("hugepages-default", QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-default-2M", QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-default-system-size", QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST_CAPS_LATEST("pages-discard"); + DO_TEST_CAPS_LATEST("pages-discard-hugepages"); + DO_TEST_CAPS_LATEST("pages-dimm-discard"); + DO_TEST_CAPS_LATEST("hugepages-default"); + DO_TEST_CAPS_LATEST("hugepages-default-2M"); + DO_TEST_CAPS_LATEST("hugepages-default-system-size"); DO_TEST_CAPS_LATEST_FAILURE("hugepages-default-5M"); DO_TEST_PARSE_ERROR_NOCAPS("hugepages-default-1G-nodeset-2M"); - DO_TEST("hugepages-nodeset", QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST_PARSE_ERROR("hugepages-nodeset-nonexist", - QEMU_CAPS_DEVICE_PC_DIMM, - QEMU_CAPS_OBJECT_MEMORY_FILE, - QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD); - DO_TEST("hugepages-numa-default", - QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-numa-default-2M", - QEMU_CAPS_OBJECT_MEMORY_RAM, - QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-numa-default-dimm", - QEMU_CAPS_DEVICE_PC_DIMM, - QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-numa-nodeset", - QEMU_CAPS_OBJECT_MEMORY_RAM, - QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-numa-nodeset-part", - QEMU_CAPS_OBJECT_MEMORY_RAM, - QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST_PARSE_ERROR("hugepages-numa-nodeset-nonexist", - QEMU_CAPS_OBJECT_MEMORY_RAM, - QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-shared", - QEMU_CAPS_OBJECT_MEMORY_RAM, - QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST_CAPS_LATEST("hugepages-nodeset"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-nodeset-nonexist"); + DO_TEST_CAPS_LATEST("hugepages-numa-default"); + DO_TEST_CAPS_LATEST("hugepages-numa-default-2M"); + DO_TEST_CAPS_LATEST("hugepages-numa-default-dimm"); + DO_TEST_CAPS_LATEST("hugepages-numa-nodeset"); + DO_TEST_CAPS_LATEST("hugepages-numa-nodeset-part"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("hugepages-numa-nodeset-nonexist"); + DO_TEST_CAPS_LATEST("hugepages-shared"); DO_TEST_PARSE_ERROR_NOCAPS("hugepages-memaccess-invalid"); - DO_TEST("hugepages-memaccess", QEMU_CAPS_OBJECT_MEMORY_FILE, - QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM, - QEMU_CAPS_NUMA); - DO_TEST("hugepages-memaccess2", QEMU_CAPS_OBJECT_MEMORY_FILE, - QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM, - QEMU_CAPS_NUMA); + DO_TEST_CAPS_LATEST("hugepages-memaccess"); + DO_TEST_CAPS_LATEST("hugepages-memaccess2"); DO_TEST_PARSE_ERROR("hugepages-memaccess3", QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); diff --git a/tests/qemuxml2xmloutdata/hugepages-default.xml b/tests/qemuxml= 2xmloutdata/hugepages-default.xml index e14eb577a8..977993fa52 100644 --- a/tests/qemuxml2xmloutdata/hugepages-default.xml +++ b/tests/qemuxml2xmloutdata/hugepages-default.xml @@ -8,7 +8,7 @@ 1 - hvm + hvm @@ -16,7 +16,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml b/tests/qemuxml= 2xmloutdata/hugepages-nodeset.xml index fd3666c149..296933c6f2 100644 --- a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml +++ b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml @@ -10,7 +10,7 @@ 2 - hvm + hvm @@ -18,7 +18,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml b/tests= /qemuxml2xmloutdata/hugepages-numa-default-2M.xml index b12b9735c8..bf9f352d98 100644 --- a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml +++ b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml @@ -10,7 +10,7 @@ 2 - hvm + hvm @@ -24,7 +24,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml b/tes= ts/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml index 3ca5a1fcaf..177faaa19f 100644 --- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml +++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml @@ -10,7 +10,7 @@ 2 - hvm + hvm @@ -24,7 +24,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml b/tests/qe= muxml2xmloutdata/hugepages-numa-nodeset.xml index 2122f76aee..e63407d1e2 100644 --- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml +++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml @@ -11,7 +11,7 @@ 4 - hvm + hvm @@ -27,7 +27,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2xmloutdata/hugepages-shared.xml b/tests/qemuxml2= xmloutdata/hugepages-shared.xml index 4dcabe06f8..4310442936 100644 --- a/tests/qemuxml2xmloutdata/hugepages-shared.xml +++ b/tests/qemuxml2xmloutdata/hugepages-shared.xml @@ -15,7 +15,7 @@ - hvm + hvm @@ -31,7 +31,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 --=20 2.37.4 From nobody Mon Apr 29 06:09:19 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=1667492573; cv=none; d=zohomail.com; s=zohoarc; b=SYAYCOtLcWgFpWpHyjHzzmXXXixuQkKylYOEwjiY5XBJw1yyivFcmF7BT6NEeZ6/kcAQZy1Le/jI8SE7dslsZXVokh+zNFHvrii7iqLHEkM5slgpOZ4wc/YcQ/PkkPKFwXgYN/Vzu1DmGrf/lYql+YJ6ENAIPw6HhSeH3u+5kEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667492573; 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=zuOTFnA66n+VuXQcj4reLrUooJrDMv0NXXF9BkO4TEE=; b=cL5VPqwuShyXwKkyP5eU6SC1gvmQKeE7tFoYkFD/7MqEBPiiFzad6caxu7NTvnscIvhHdMY6m84WGvOuAB6B5UX0uFqWgFZ9HndxAWAUDuFMfQdYcpZCZKR/0dn0NyUGLdlxyjG70CaCyGJdXyGFADXf1VVm7f88VUCs88IeGeA= 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 1667492573959157.56627455973057; Thu, 3 Nov 2022 09:22:53 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-1-pil7ONAdPB-ECBruk7JCcw-1; Thu, 03 Nov 2022 12:22:37 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F3A313C0ED6B; Thu, 3 Nov 2022 16:22:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBCC940C2087; Thu, 3 Nov 2022 16:22:18 +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 739C91947054; Thu, 3 Nov 2022 16:22:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A253A1946594 for ; Thu, 3 Nov 2022 16:22:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 92A011402BDA; Thu, 3 Nov 2022 16:22:16 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37C0B1402BD9 for ; Thu, 3 Nov 2022 16:22:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667492572; 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=zuOTFnA66n+VuXQcj4reLrUooJrDMv0NXXF9BkO4TEE=; b=PJotCu/VjDh2b1cjcersNC2FTj60dmsTQ8g7pbOiBDuliBsZsbfwWJBIcLNPF9F/E3GoWT jnMVxiovyF9KYf6OS0IaFSvHVuvbckAB+iCfvjF3ZnXjOgVmr1inWht8jULIc+0W1SryE8 9VR58qS/6hrwVKi94S5bJdwI2nc/9R4= X-MC-Unique: pil7ONAdPB-ECBruk7JCcw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 02/15] qemuxml2xmltest: Convert hugepages related tests to _CAPS_LATEST Date: Thu, 3 Nov 2022 17:22:00 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.1 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: 1667492575084100004 Content-Type: text/plain; charset="utf-8"; x-default="true" Currently, we have maybe a dozen tests for hugepages related stuff in qemuxml2xmltest. In all cases DO_TEST() is used, which means we have to enumerate all capabilities needed (though, it's usually just QEMU_CAPS_OBJECT_MEMORY_RAM and QEMU_CAPS_OBJECT_MEMORY_FILE, exceptionally QEMU_CAPS_DEVICE_PC_DIMM too). Nevertheless, these caps made sense back in QEMU 2.X era when these objects were being introduced. But now, almost 8 years after the fact we can safely assume every QEMU knows these caps. Therefore, switch to DO_TEST_CAPS_LATEST(). Since some of our expected output files are just a symlink to their respective input files, these are changed too. But from QEMU's POV nothing changes as no .args file is changed. Oh, and I'm also adding a 'hugepages-memaccess3' test case, which was missing, surprisingly. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- .../qemuxml2argvdata/hugepages-default-2M.xml | 5 +- .../hugepages-default-system-size.xml | 5 +- tests/qemuxml2argvdata/hugepages-default.xml | 16 +++++- .../qemuxml2argvdata/hugepages-memaccess.xml | 5 +- .../qemuxml2argvdata/hugepages-memaccess2.xml | 5 +- .../qemuxml2argvdata/hugepages-memaccess3.xml | 10 +++- tests/qemuxml2argvdata/hugepages-nodeset.xml | 8 ++- .../hugepages-numa-default-2M.xml | 8 ++- .../hugepages-numa-default-dimm.xml | 5 +- .../hugepages-numa-nodeset-part.xml | 8 ++- .../hugepages-numa-nodeset.xml | 8 ++- tests/qemuxml2argvdata/hugepages-nvdimm.xml | 5 +- tests/qemuxml2argvdata/hugepages-shared.xml | 17 ++++-- tests/qemuxml2argvdata/pages-dimm-discard.xml | 5 +- .../pages-discard-hugepages.xml | 5 +- ...=3D> hugepages-default-2M.x86_64-latest.xml} | 0 ...ges-default-system-size.x86_64-latest.xml} | 0 .../hugepages-default.x86_64-latest.xml | 1 + .../qemuxml2xmloutdata/hugepages-default.xml | 34 ------------ ... =3D> hugepages-memaccess.x86_64-latest.xml} | 0 ...=3D> hugepages-memaccess2.x86_64-latest.xml} | 0 .../hugepages-memaccess3.x86_64-latest.xml | 1 + .../hugepages-nodeset.x86_64-latest.xml | 1 + .../qemuxml2xmloutdata/hugepages-nodeset.xml | 31 ----------- ...ugepages-numa-default-2M.x86_64-latest.xml | 1 + .../hugepages-numa-default-2M.xml | 37 ------------- ...pages-numa-default-dimm.x86_64-latest.xml} | 0 ...epages-numa-nodeset-part.x86_64-latest.xml | 1 + .../hugepages-numa-nodeset-part.xml | 37 ------------- .../hugepages-numa-nodeset.x86_64-latest.xml | 1 + .../hugepages-numa-nodeset.xml | 40 -------------- ...xml =3D> hugepages-nvdimm.x86_64-latest.xml} | 0 .../hugepages-shared.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/hugepages-shared.xml | 55 ------------------- ...l =3D> pages-dimm-discard.x86_64-latest.xml} | 0 ...pages-discard-hugepages.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 33 +++++------ 37 files changed, 107 insertions(+), 282 deletions(-) rename tests/qemuxml2xmloutdata/{hugepages-default-2M.xml =3D> hugepages-d= efault-2M.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{hugepages-default-system-size.xml =3D> hu= gepages-default-system-size.x86_64-latest.xml} (100%) create mode 120000 tests/qemuxml2xmloutdata/hugepages-default.x86_64-lates= t.xml delete mode 100644 tests/qemuxml2xmloutdata/hugepages-default.xml rename tests/qemuxml2xmloutdata/{hugepages-memaccess.xml =3D> hugepages-me= maccess.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{hugepages-memaccess2.xml =3D> hugepages-m= emaccess2.x86_64-latest.xml} (100%) create mode 120000 tests/qemuxml2xmloutdata/hugepages-memaccess3.x86_64-la= test.xml create mode 120000 tests/qemuxml2xmloutdata/hugepages-nodeset.x86_64-lates= t.xml delete mode 100644 tests/qemuxml2xmloutdata/hugepages-nodeset.xml create mode 120000 tests/qemuxml2xmloutdata/hugepages-numa-default-2M.x86_= 64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml rename tests/qemuxml2xmloutdata/{hugepages-numa-default-dimm.xml =3D> huge= pages-numa-default-dimm.x86_64-latest.xml} (100%) create mode 120000 tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.x8= 6_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml create mode 120000 tests/qemuxml2xmloutdata/hugepages-numa-nodeset.x86_64-= latest.xml delete mode 100644 tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml rename tests/qemuxml2xmloutdata/{hugepages-nvdimm.xml =3D> hugepages-nvdim= m.x86_64-latest.xml} (100%) create mode 120000 tests/qemuxml2xmloutdata/hugepages-shared.x86_64-latest= .xml delete mode 100644 tests/qemuxml2xmloutdata/hugepages-shared.xml rename tests/qemuxml2xmloutdata/{pages-dimm-discard.xml =3D> pages-dimm-di= scard.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{pages-discard-hugepages.xml =3D> pages-di= scard-hugepages.x86_64-latest.xml} (100%) diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.xml b/tests/qemuxm= l2argvdata/hugepages-default-2M.xml index 296933c6f2..49d1f45c0d 100644 --- a/tests/qemuxml2argvdata/hugepages-default-2M.xml +++ b/tests/qemuxml2argvdata/hugepages-default-2M.xml @@ -13,13 +13,16 @@ hvm + + qemu64 + destroy restart destroy /usr/bin/qemu-system-x86_64 - +
diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.xml b/tes= ts/qemuxml2argvdata/hugepages-default-system-size.xml index f9c99da400..7cb8078844 100644 --- a/tests/qemuxml2argvdata/hugepages-default-system-size.xml +++ b/tests/qemuxml2argvdata/hugepages-default-system-size.xml @@ -13,13 +13,16 @@ hvm + + qemu64 + destroy restart destroy /usr/bin/qemu-system-x86_64 - +
diff --git a/tests/qemuxml2argvdata/hugepages-default.xml b/tests/qemuxml2a= rgvdata/hugepages-default.xml index de1006b7d7..9e4568bcf3 100644 --- a/tests/qemuxml2argvdata/hugepages-default.xml +++ b/tests/qemuxml2argvdata/hugepages-default.xml @@ -11,17 +11,27 @@ hvm + + qemu64 + destroy restart destroy /usr/bin/qemu-system-x86_64 - - + +
+ + +
+ - +