From nobody Sun May 19 11:37:20 2024 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=1562076974; cv=none; d=zoho.com; s=zohoarc; b=cH7Foyc+HCXLjShd/tWZ0aZXrjB8eQ81TgAaGZFIiotH7gTYA0b/si5Xy1KEhq9lBuoEeXYZwx9YpTTJ9hyGIkK+ffRjyR1MSqCXBmzIF1LUsM9/eHUMvyMzACJabW7Xwy3o5POAarTRe06FDjYGCZBj/HEUHI9o+RcUI3dmcQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562076974; 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=3qPbgry7qmt3jeYtwTAt6IZSl+weRfN9ta5QiLZi2uA=; b=WMLxAoJ5L1wvU+X5UJM7/Dhawp16cIxlY4npOjaLfU63Jd1ZuBBZ8fZORm54Bnx2CJpDKNq96PLmyv2J0RsYpIQZktWpeyxRmNF7nzolqC/GpH9o9aQdmETf2UlBhnLM7QhCGkuSWrDJ3+QCF4//5cbGktuI94x7B6+2nFuWokA= 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 1562076974180409.9343889342457; Tue, 2 Jul 2019 07:16:14 -0700 (PDT) Received: from localhost ([::1]:53792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiJZp-0003K6-VB for importer@patchew.org; Tue, 02 Jul 2019 10:16:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44331) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiJRp-0004vI-IB for qemu-devel@nongnu.org; Tue, 02 Jul 2019 10:07:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiJRo-0002yP-Ik for qemu-devel@nongnu.org; Tue, 02 Jul 2019 10:07:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51786) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hiJRo-0002xr-CZ for qemu-devel@nongnu.org; Tue, 02 Jul 2019 10:07:52 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AFD273082E3F for ; Tue, 2 Jul 2019 14:07:51 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 928B17D5CF; Tue, 2 Jul 2019 14:07:50 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 2 Jul 2019 10:07:44 -0400 Message-Id: <20190702140745.27767-2-imammedo@redhat.com> In-Reply-To: <20190702140745.27767-1-imammedo@redhat.com> References: <20190702140745.27767-1-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 02 Jul 2019 14:07:51 +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] [PATCH 1/2] numa: allow memory-less nodes when using memdev as backend 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: Laurent Vivier , Paolo Bonzini , Thomas Huth , Eduardo Habkost 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" QEMU fails to start if memory-less node is present when memdev is used qemu-system-x86_64 -object memory-backend-ram,id=3Dram0,size=3D128M \ -numa node -numa node,memdev=3Dram0 with error: "memdev option must be specified for either all or no nodes" which works as expected if legacy 'mem' is used. Fix check to make memory-less nodes valid when memdev option is used but still disallow mix of mem and memdev options. Signed-off-by: Igor Mammedov --- numa.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/numa.c b/numa.c index 91a29138a2..cdef332773 100644 --- a/numa.c +++ b/numa.c @@ -48,7 +48,8 @@ QemuOptsList qemu_numa_opts =3D { .desc =3D { { 0 } } /* validated with OptsVisitor */ }; =20 -static int have_memdevs =3D -1; +static int have_memdevs; +static int have_mem; static int max_numa_nodeid; /* Highest specified NUMA node ID, plus one. * For all nodes, nodeid < max_numa_nodeid */ @@ -105,17 +106,11 @@ static void parse_numa_node(MachineState *ms, NumaNod= eOptions *node, } } =20 - if (node->has_mem && node->has_memdev) { - error_setg(errp, "cannot specify both mem=3D and memdev=3D"); - return; - } - - if (have_memdevs =3D=3D -1) { - have_memdevs =3D node->has_memdev; - } - if (node->has_memdev !=3D have_memdevs) { - error_setg(errp, "memdev option must be specified for either " - "all or no nodes"); + have_memdevs =3D have_memdevs ? : node->has_memdev; + have_mem =3D have_mem ? : node->has_mem; + if ((node->has_mem && have_memdevs) || (node->has_memdev && have_mem))= { + error_setg(errp, "numa configuration should use either mem=3D or m= emdev=3D," + "mixing both is not allowed"); return; } =20 --=20 2.18.1 From nobody Sun May 19 11:37:20 2024 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=1562076628; cv=none; d=zoho.com; s=zohoarc; b=kwZblTta+f9nv007zPIZ2cwCixKWVUnLEhbLqcQJp9U+/SKsGZO3kdIAPFLvKVnfhfAACgt9tPymIQEiAwGGghqv5xvwKe/c6GzL6J/cDIoFgONbLg1Tyv3wJ9ZYLcRNuMSsPC2Xa+YGbTcgzRWo0Ul8LHxpB+luV5gFcTrHRsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562076628; 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=g42nX+7jfwPAmvtJvVSFz08f9uVvAR8GiFxqK2x+ID0=; b=nzAc2fB4ijznp9B92gqGTOY5YwxdMJCg0ejrEP9hjUvb2R3uqGN+/xavrNQevPFTJhDxP/XWzuUG1p8774AbWHzRHJl56RjsbSdTuM3bcgQmkuQva/EFmKp77NgDkrr18VRaUvVn0Ku88+pbdnANIIc8z+7w+17fNawWvIenXnU= 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 1562076628442687.7125126366749; Tue, 2 Jul 2019 07:10:28 -0700 (PDT) Received: from localhost ([::1]:53734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiJUJ-0006n4-Bb for importer@patchew.org; Tue, 02 Jul 2019 10:10:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44377) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiJS1-00055j-7U for qemu-devel@nongnu.org; Tue, 02 Jul 2019 10:08:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiJRz-00037A-Ka for qemu-devel@nongnu.org; Tue, 02 Jul 2019 10:08:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40314) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hiJRz-00036M-BN for qemu-devel@nongnu.org; Tue, 02 Jul 2019 10:08:03 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D138821EF for ; Tue, 2 Jul 2019 14:07:53 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00BAD7D5CF; Tue, 2 Jul 2019 14:07:51 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 2 Jul 2019 10:07:45 -0400 Message-Id: <20190702140745.27767-3-imammedo@redhat.com> In-Reply-To: <20190702140745.27767-1-imammedo@redhat.com> References: <20190702140745.27767-1-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 02 Jul 2019 14:07:58 +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] [PATCH 2/2] 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: Laurent Vivier , Paolo Bonzini , Thomas Huth , Eduardo Habkost 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" it will test preferred memdev option more extensively and remove undesired deprecation warnings during 'make check' Signed-off-by: Igor Mammedov --- tests/bios-tables-test.c | 40 ++++++++++++++++++++++++++----------- tests/numa-test.c | 43 +++++++++++++++++++++++++++++----------- 2 files changed, 59 insertions(+), 24 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); diff --git a/tests/numa-test.c b/tests/numa-test.c index 8de8581231..902e8de4d1 100644 --- a/tests/numa-test.c +++ b/tests/numa-test.c @@ -26,8 +26,10 @@ static void test_mon_explicit(const void *data) QTestState *qts; =20 cli =3D make_cli(data, "-smp 8 " - "-numa node,nodeid=3D0,cpus=3D0-3 " - "-numa node,nodeid=3D1,cpus=3D4-7 "); + "-object memory-backend-ram,id=3Dram0,size=3D64M " + "-object memory-backend-ram,id=3Dram1,size=3D64M " + "-numa node,nodeid=3D0,cpus=3D0-3,memdev=3Dram0 " + "-numa node,nodeid=3D1,cpus=3D4-7,memdev=3Dram1 "); qts =3D qtest_init(cli); =20 s =3D qtest_hmp(qts, "info numa"); @@ -45,7 +47,10 @@ static void test_mon_default(const void *data) char *cli; QTestState *qts; =20 - cli =3D make_cli(data, "-smp 8 -numa node -numa node"); + cli =3D make_cli(data, "-smp 8 " + "-object memory-backend-ram,id=3Dram0,size=3D64M " + "-object memory-backend-ram,id=3Dram1,size=3D64M " + "-numa node,memdev=3Dram0 -numa node,memdev=3Dram1"); qts =3D qtest_init(cli); =20 s =3D qtest_hmp(qts, "info numa"); @@ -64,8 +69,10 @@ static void test_mon_partial(const void *data) QTestState *qts; =20 cli =3D make_cli(data, "-smp 8 " - "-numa node,nodeid=3D0,cpus=3D0-1 " - "-numa node,nodeid=3D1,cpus=3D4-5 "); + "-object memory-backend-ram,id=3Dram0,size=3D64M " + "-object memory-backend-ram,id=3Dram1,size=3D64M " + "-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram0 " + "-numa node,nodeid=3D1,cpus=3D4-5,memdev=3Dram1"); qts =3D qtest_init(cli); =20 s =3D qtest_hmp(qts, "info numa"); @@ -93,7 +100,11 @@ static void test_query_cpus(const void *data) QObject *e; QTestState *qts; =20 - cli =3D make_cli(data, "-smp 8 -numa node,cpus=3D0-3 -numa node,cpus= =3D4-7"); + cli =3D make_cli(data, "-smp 8 " + "-object memory-backend-ram,id=3Dram0,size=3D64M " + "-object memory-backend-ram,id=3Dram1,size=3D64M " + "-numa node,cpus=3D0-3,memdev=3Dram0 " + "-numa node,cpus=3D4-7,memdev=3Dram1"); qts =3D qtest_init(cli); cpus =3D get_cpus(qts, &resp); g_assert(cpus); @@ -132,7 +143,9 @@ static void pc_numa_cpu(const void *data) QTestState *qts; =20 cli =3D make_cli(data, "-cpu pentium -smp 8,sockets=3D2,cores=3D2,thre= ads=3D2 " - "-numa node,nodeid=3D0 -numa node,nodeid=3D1 " + "-object memory-backend-ram,id=3Dram0,size=3D64M " + "-object memory-backend-ram,id=3Dram1,size=3D64M " + "-numa node,nodeid=3D0,memdev=3Dram0 -numa node,nodeid=3D1,memdev= =3Dram1 " "-numa cpu,node-id=3D1,socket-id=3D0 " "-numa cpu,node-id=3D0,socket-id=3D1,core-id=3D0 " "-numa cpu,node-id=3D0,socket-id=3D1,core-id=3D1,thread-id=3D0 " @@ -186,7 +199,9 @@ static void spapr_numa_cpu(const void *data) QTestState *qts; =20 cli =3D make_cli(data, "-smp 4,cores=3D4 " - "-numa node,nodeid=3D0 -numa node,nodeid=3D1 " + "-object memory-backend-ram,id=3Dram0,size=3D64M " + "-object memory-backend-ram,id=3Dram1,size=3D64M " + "-numa node,nodeid=3D0,memdev=3Dram0 -numa node,nodeid=3D1,memdev= =3Dram1 " "-numa cpu,node-id=3D0,core-id=3D0 " "-numa cpu,node-id=3D0,core-id=3D1 " "-numa cpu,node-id=3D0,core-id=3D2 " @@ -232,7 +247,9 @@ static void aarch64_numa_cpu(const void *data) QTestState *qts; =20 cli =3D make_cli(data, "-smp 2 " - "-numa node,nodeid=3D0 -numa node,nodeid=3D1 " + "-object memory-backend-ram,id=3Dram0,size=3D64M " + "-object memory-backend-ram,id=3Dram1,size=3D64M " + "-numa node,nodeid=3D0,memdev=3Dram0 -numa node,nodeid=3D1,memdev= =3Dram1 " "-numa cpu,node-id=3D1,thread-id=3D0 " "-numa cpu,node-id=3D0,thread-id=3D1"); qts =3D qtest_init(cli); @@ -274,14 +291,16 @@ static void pc_dynamic_cpu_cfg(const void *data) QList *cpus; QTestState *qs; =20 - qs =3D qtest_initf("%s -nodefaults --preconfig -smp 2", + qs =3D qtest_initf("%s -nodefaults --preconfig -smp 2 " + "-object memory-backend-ram,id=3Dram0,size=3D64M " + "-object memory-backend-ram,id=3Dram1,size=3D64M", data ? (char *)data : ""); =20 /* create 2 numa nodes */ g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node'," - " 'arguments': { 'type': 'node', 'nodeid': 0 } }"))); + " 'arguments': { 'type': 'node', 'nodeid': 0, 'memdev': 'ram0' } }= "))); g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'set-numa-node'," - " 'arguments': { 'type': 'node', 'nodeid': 1 } }"))); + " 'arguments': { 'type': 'node', 'nodeid': 1, 'memdev': 'ram1' } }= "))); =20 /* map 2 cpus in non default reverse order * i.e socket1->node0, socket0->node1 --=20 2.18.1