From nobody Mon Feb 9 11:32:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562190617; cv=none; d=zoho.com; s=zohoarc; b=dWIlfsLz+5JdKN/o32MKEz9HytdvNggJAl7h64tGF1TmzG6uEuz7/8xS0gGIS+4hR6Z/hK1wKe9JVOGi1Wms12N3vjHD5/KsZVLwjXFEvgZR7FFq+QkOv3gC0Mrb00eXG4EBzPT+84Fx2vzSYaA9J3+x6uI8/BrTb4hJZEAvpQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562190617; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=V1NUNjHLnMz7jXLD/Gm+uPY0UOxDA9xZv73fl5HZsNI=; b=BPhwYThZGQQ9aNpKVvj8SraLYdgeVF8nfFDcRPk/aRWjigj6vNo1DzxX/ka+Zl/jQA7y3Gnr5WqK6HAUUzEeUVjurMd2UOqZ8JRGyOC+5cqvhJ9v/P9fNg9x67B/zwwCUXpSFygEEWIwavRHcR6aQ4tK9HEr4E1y4iPrTCkT5Qo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562190617716564.5831799296081; Wed, 3 Jul 2019 14:50:17 -0700 (PDT) Received: from localhost ([::1]:40984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hin8n-0007PQ-Oy for importer@patchew.org; Wed, 03 Jul 2019 17:50:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38615) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1himWA-0006gh-1k for qemu-devel@nongnu.org; Wed, 03 Jul 2019 17:10:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1himW7-0007YT-3r for qemu-devel@nongnu.org; Wed, 03 Jul 2019 17:10:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36806) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1himW6-0007WQ-RQ for qemu-devel@nongnu.org; Wed, 03 Jul 2019 17:10:15 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0B31560CC; Wed, 3 Jul 2019 21:10:14 +0000 (UTC) Received: from localhost (ovpn-116-30.gru2.redhat.com [10.97.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E0E01001925; Wed, 3 Jul 2019 21:10:13 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , Paolo Bonzini , qemu-devel@nongnu.org, Marcel Apfelbaum , Richard Henderson Date: Wed, 3 Jul 2019 18:08:21 -0300 Message-Id: <20190703210821.27550-44-ehabkost@redhat.com> In-Reply-To: <20190703210821.27550-1-ehabkost@redhat.com> References: <20190703210821.27550-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 03 Jul 2019 21:10:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v5 43/43] tests: use -numa memdev option in tests instead of legacy 'mem' option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Igor Mammedov it will test preferred memdev option more extensively and remove undesired deprecation warnings during 'make check' Signed-off-by: Igor Mammedov Message-Id: <20190702140745.27767-3-imammedo@redhat.com> [ehabkost: remove numa-test.c changes] Signed-off-by: Eduardo Habkost --- tests/bios-tables-test.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 0ce55182f2..d863233fe9 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -688,6 +688,8 @@ static void test_acpi_q35_tcg_mmio64(void) }; =20 test_acpi_one("-m 128M,slots=3D1,maxmem=3D2G " + "-object memory-backend-ram,id=3Dram0,size=3D128M " + "-numa node,memdev=3Dram0 " "-device pci-testdev,membar=3D2G", &data); free_test_data(&data); @@ -701,7 +703,9 @@ static void test_acpi_piix4_tcg_cphp(void) data.machine =3D MACHINE_PC; data.variant =3D ".cphp"; test_acpi_one("-smp 2,cores=3D3,sockets=3D2,maxcpus=3D6" - " -numa node -numa node" + " -object memory-backend-ram,id=3Dram0,size=3D64M" + " -object memory-backend-ram,id=3Dram1,size=3D64M" + " -numa node,memdev=3Dram0 -numa node,memdev=3Dram1" " -numa dist,src=3D0,dst=3D1,val=3D21", &data); free_test_data(&data); @@ -715,7 +719,9 @@ static void test_acpi_q35_tcg_cphp(void) data.machine =3D MACHINE_Q35; data.variant =3D ".cphp"; test_acpi_one(" -smp 2,cores=3D3,sockets=3D2,maxcpus=3D6" - " -numa node -numa node" + " -object memory-backend-ram,id=3Dram0,size=3D64M" + " -object memory-backend-ram,id=3Dram1,size=3D64M" + " -numa node,memdev=3Dram0 -numa node,memdev=3Dram1" " -numa dist,src=3D0,dst=3D1,val=3D21", &data); free_test_data(&data); @@ -766,7 +772,9 @@ static void test_acpi_q35_tcg_memhp(void) data.machine =3D MACHINE_Q35; data.variant =3D ".memhp"; test_acpi_one(" -m 128,slots=3D3,maxmem=3D1G" - " -numa node -numa node" + " -object memory-backend-ram,id=3Dram0,size=3D64M" + " -object memory-backend-ram,id=3Dram1,size=3D64M" + " -numa node,memdev=3Dram0 -numa node,memdev=3Dram1" " -numa dist,src=3D0,dst=3D1,val=3D21", &data); free_test_data(&data); @@ -780,7 +788,9 @@ static void test_acpi_piix4_tcg_memhp(void) data.machine =3D MACHINE_PC; data.variant =3D ".memhp"; test_acpi_one(" -m 128,slots=3D3,maxmem=3D1G" - " -numa node -numa node" + " -object memory-backend-ram,id=3Dram0,size=3D64M" + " -object memory-backend-ram,id=3Dram1,size=3D64M" + " -numa node,memdev=3Dram0 -numa node,memdev=3Dram1" " -numa dist,src=3D0,dst=3D1,val=3D21", &data); free_test_data(&data); @@ -793,7 +803,8 @@ static void test_acpi_q35_tcg_numamem(void) memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".numamem"; - test_acpi_one(" -numa node -numa node,mem=3D128", &data); + test_acpi_one(" -object memory-backend-ram,id=3Dram0,size=3D128M" + " -numa node -numa node,memdev=3Dram0", &data); free_test_data(&data); } =20 @@ -804,7 +815,8 @@ static void test_acpi_piix4_tcg_numamem(void) memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".numamem"; - test_acpi_one(" -numa node -numa node,mem=3D128", &data); + test_acpi_one(" -object memory-backend-ram,id=3Dram0,size=3D128M" + " -numa node -numa node,memdev=3Dram0", &data); free_test_data(&data); } =20 @@ -818,17 +830,21 @@ static void test_acpi_tcg_dimm_pxm(const char *machin= e) test_acpi_one(" -machine nvdimm=3Don,nvdimm-persistence=3Dcpu" " -smp 4,sockets=3D4" " -m 128M,slots=3D3,maxmem=3D1G" - " -numa node,mem=3D32M,nodeid=3D0" - " -numa node,mem=3D32M,nodeid=3D1" - " -numa node,mem=3D32M,nodeid=3D2" - " -numa node,mem=3D32M,nodeid=3D3" + " -object memory-backend-ram,id=3Dram0,size=3D32M" + " -object memory-backend-ram,id=3Dram1,size=3D32M" + " -object memory-backend-ram,id=3Dram2,size=3D32M" + " -object memory-backend-ram,id=3Dram3,size=3D32M" + " -numa node,memdev=3Dram0,nodeid=3D0" + " -numa node,memdev=3Dram1,nodeid=3D1" + " -numa node,memdev=3Dram2,nodeid=3D2" + " -numa node,memdev=3Dram3,nodeid=3D3" " -numa cpu,node-id=3D0,socket-id=3D0" " -numa cpu,node-id=3D1,socket-id=3D1" " -numa cpu,node-id=3D2,socket-id=3D2" " -numa cpu,node-id=3D3,socket-id=3D3" - " -object memory-backend-ram,id=3Dram0,size=3D128M" + " -object memory-backend-ram,id=3Dram4,size=3D128M" " -object memory-backend-ram,id=3Dnvm0,size=3D128M" - " -device pc-dimm,id=3Ddimm0,memdev=3Dram0,node=3D1" + " -device pc-dimm,id=3Ddimm0,memdev=3Dram4,node=3D1" " -device nvdimm,id=3Ddimm1,memdev=3Dnvm0,node=3D2", &data); free_test_data(&data); --=20 2.18.0.rc1.1.g3f1ff2140