From nobody Wed May 22 01:45:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1658918117; cv=none; d=zohomail.com; s=zohoarc; b=RS1Nf6Y+CxYtl6HTqocqblLjdg9fBVCtbjFeQjyuLt4aaqVGK6n1n+bZT/7pNwIbfA05IkGz8flfBuIeTswrXsuYb2HV4fAr3c77hwtO7JGdjz4tz5wx0EHi7lSqk38TH/YANkJKCakXkBvPEXovzBiOcyHNAXcjUnhR4EOPOPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658918117; h=Content-Type:Content-Transfer-Encoding:Cc: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=WHcXAGDWtE5rzw80O9PK2ZSgLtyAyyXTehe2YOYBgqI=; b=LqL/qZrzdhrioP/PoZzrjfVwVPxVHgdA1Vd8RA63VaySfWcAuukR/Z1VPVEOhSsq/hHq7DKMLTo086GU8teBJGFAjyt0j3bhlf7H/x4GbqHEEpASG6DIRqdhp0RuwepjbuxF0jsAHFm4TvxFjwFQ4fZCqmlmrzWypYcuE+qQMOg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 165891811741090.88260003143819; Wed, 27 Jul 2022 03:35:17 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-394-yLoJfbTKPiqBr1htnRhUtQ-1; Wed, 27 Jul 2022 06:35:13 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F36A2806023; Wed, 27 Jul 2022 10:35:10 +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 9B7E618ECC; Wed, 27 Jul 2022 10:35:07 +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 8D3A51945DA1; Wed, 27 Jul 2022 10:35:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 72F3C1945D94 for ; Wed, 27 Jul 2022 10:35:05 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 55F0BC27D95; Wed, 27 Jul 2022 10:35:05 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1DDDC15D67; Wed, 27 Jul 2022 10:35:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658918116; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=WHcXAGDWtE5rzw80O9PK2ZSgLtyAyyXTehe2YOYBgqI=; b=YrYuhR6Qrhge4fcrT4G1PzYV6yViBwoSlzbcIGZXZUQ5XrcZAyh+IsaBKDop55KQA+rlam sfC6993vY9NUxm6/43jtcNz5EN79SE4iX0V4stqbCd4NoBPZ/IFMAQMMg0dv0PdDooMz1f wtj+BKNAjUatz55aM2/IRbmgLyYHI6U= X-MC-Unique: yLoJfbTKPiqBr1htnRhUtQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v14 01/15] qemuxml2argvtest: Switch memory-hotplug-dimm-addr to latest caps Date: Wed, 27 Jul 2022 12:34:47 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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: , Cc: lin.a.yang@intel.com, jian-feng.ding@intel.com, haibin.huang@intel.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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) X-ZM-MESSAGEID: 1658918119429100002 Content-Type: text/plain; charset="utf-8"; x-default="true" So far, we are testing memory-hotplug-dimm-addr against a set of explicitly listed capabilities. While this works, lets switch it to DO_TEST_CAPS_LATEST() so that the latest capabilities are used. This in turn means, we have to update the because the latest capabilities don't contain caps for qemu-system-i386. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- ...mory-hotplug-dimm-addr.x86_64-latest.args} | 30 +++++++++++-------- .../memory-hotplug-dimm-addr.xml | 2 +- tests/qemuxml2argvtest.c | 3 +- 3 files changed, 19 insertions(+), 16 deletions(-) rename tests/qemuxml2argvdata/{memory-hotplug-dimm-addr.args =3D> memory-h= otplug-dimm-addr.x86_64-latest.args} (32%) diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/q= emuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args similarity index 32% rename from tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args rename to tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args index 110b1a32b7..ac24c77a2b 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args @@ -6,17 +6,18 @@ 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 \ -QEMU_AUDIO_DRV=3Dnone \ -/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 size=3D219136k,slots=3D16,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ --smp 2,sockets=3D2,cores=3D1,threads=3D1 \ --numa node,nodeid=3D0,cpus=3D0-1,mem=3D214 \ +-smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ +-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -27,12 +28,15 @@ QEMU_AUDIO_DRV=3Dnone \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ --object memory-backend-file,id=3Dmemdimm0,mem-path=3D/dev/hugepages2M/libv= irt/qemu/-1-QEMUGuest1,prealloc=3Don,size=3D536870912,host-nodes=3D1-3,poli= cy=3Dbind \ --device pc-dimm,node=3D0,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0,addr=3D4294= 967296 \ --object memory-backend-ram,id=3Dmemdimm2,size=3D536870912 \ --device pc-dimm,node=3D0,memdev=3Dmemdimm2,id=3Ddimm2,slot=3D2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-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","prealloc":true,"size":536870912,= "host-nodes":[1,2,3],"policy":"bind"}' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","sl= ot":0,"addr":4294967296}' \ +-object '{"qom-type":"memory-backend-ram","id":"memdimm2","size":536870912= }' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm2","id":"dimm2","sl= ot":2}' \ +-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/memory-hotplug-dimm-addr.xml b/tests/qe= muxml2argvdata/memory-hotplug-dimm-addr.xml index ea4f4fd745..92ea679bbe 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml @@ -20,7 +20,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 b72d61c3bc..d1a36f653c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3083,8 +3083,7 @@ mymain(void) DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA); DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUM= A, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("memory-hotplug-dimm-addr", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAP= S_NUMA, - QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr"); DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE= _PC_DIMM, QEMU_CAPS_NUMA, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); --=20 2.35.1 From nobody Wed May 22 01:45:13 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=1658918164; cv=none; d=zohomail.com; s=zohoarc; b=VNcgFis4x00dFwK51D42cGQlAs2BaZWSAB/ahGI/QRPem4hCxPpx43oVVf46JVxTK4br93ywDH3ADtnFHJgmPJs1gW7O0VsJF9OYfP8beol8YLAboWCHEzxA/6rkSBxEUCTHaLp6by0VVVfdjPodKLzw2QQK6kMHCCM9pXtnSPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658918164; h=Content-Type:Content-Transfer-Encoding:Cc: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=8yHaotJw3P7BVI3VqgW6t4CC8GCofhJ5ci+61MAKWbU=; b=VNZmcajM4MtqEVwZ1qyPWw2sL+hq7ddm/5de8A2kU1xbOWdM+7TVIHI8H02TcVQw+w3TF60syZchfNToaIfzSB3zh4uoBdpeh4+dwrT+8b5GgcCWrr4eUlnQh/qwxaXlI9dcJdXj7EU6zc9YEpJuy6WlTPLQmNWzjdpJ5/ZIrC8= 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 1658918164243749.6353167687136; Wed, 27 Jul 2022 03:36:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-338-kE9ctgKOMBCwaB0nROXX4g-1; Wed, 27 Jul 2022 06:35:13 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D93D31824619; Wed, 27 Jul 2022 10:35:10 +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 0FD64492CA2; Wed, 27 Jul 2022 10:35:09 +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 E67CA1945D9B; Wed, 27 Jul 2022 10:35:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4FB0C1945D94 for ; Wed, 27 Jul 2022 10:35:06 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 40AD3C2C7EC; Wed, 27 Jul 2022 10:35:06 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D05FC15D67; Wed, 27 Jul 2022 10:35:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658918163; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8yHaotJw3P7BVI3VqgW6t4CC8GCofhJ5ci+61MAKWbU=; b=RnoTzl+yvKB1Hop6Bz0TULl0vZRatyag48G1/bOgBsHK5NIz41EchnYkhbXHK4QocTCeKM teZUQGMZpF6fW0JlZcN0YeBoG3qjY2079ctjRN7nZqJhwZOUwKTKqszUtRweRdgICOrXMj WFFwrbB9+y4X4vlJfdZQm9y0zwrBNM4= X-MC-Unique: kE9ctgKOMBCwaB0nROXX4g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v14 02/15] qemuxml2xmltest: Test memory-hotplug-dimm-addr Date: Wed, 27 Jul 2022 12:34:48 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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: , Cc: lin.a.yang@intel.com, jian-feng.ding@intel.com, haibin.huang@intel.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 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) X-ZM-MESSAGEID: 1658918165926100001 Content-Type: text/plain; charset="utf-8"; x-default="true" After previous commit, when memory-hotplug-dimm-addr.xml file was fixed, we can also introduce the test case to qemuxml2xmltest. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- ...memory-hotplug-dimm-addr.x86_64-latest.xml | 63 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 2 files changed, 64 insertions(+) create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_6= 4-latest.xml diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-lates= t.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml new file mode 100644 index 0000000000..ef671fcfa3 --- /dev/null +++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml @@ -0,0 +1,63 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 1099511627776 + 7434230 + 7434230 + 2 + + hvm + + + + qemu64 + + + + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + +
+ + +
+ + +
+ + + + +