From nobody Tue Oct 28 12:12:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514481910048149.0581983865676; Thu, 28 Dec 2017 09:25:10 -0800 (PST) Received: from localhost ([::1]:59028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUbvQ-0007kR-MV for importer@patchew.org; Thu, 28 Dec 2017 12:25:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUbtv-0006pf-3i for qemu-devel@nongnu.org; Thu, 28 Dec 2017 12:23:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUbtr-0006Rn-LX for qemu-devel@nongnu.org; Thu, 28 Dec 2017 12:23:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44458) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eUbtr-0006RE-By for qemu-devel@nongnu.org; Thu, 28 Dec 2017 12:23:23 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 83AA6629; Thu, 28 Dec 2017 17:23:22 +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 D443E5D9C6; Thu, 28 Dec 2017 17:23:20 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 28 Dec 2017 18:22:56 +0100 Message-Id: <1514481779-184817-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1514481779-184817-1-git-send-email-imammedo@redhat.com> References: <1514481779-184817-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 28 Dec 2017 17:23:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v2 1/4] numa: split out NumaOptions parsing into parse_NumaOptions() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, pkrempa@redhat.com, ehabkost@redhat.com, armbru@redhat.com, pbonzini@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" it will allow to reuse parse_NumaOptions() for parsing configuration commands received via QMP interface Signed-off-by: Igor Mammedov --- include/sysemu/numa.h | 1 + numa.c | 48 +++++++++++++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index b354521..4621312 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -23,6 +23,7 @@ struct NumaNodeMem { }; =20 extern NodeInfo numa_info[MAX_NODES]; +int parse_numa(void *opaque, QemuOpts *opts, Error **errp); void parse_numa_opts(MachineState *ms); void query_numa_node_mem(NumaNodeMem node_mem[]); extern QemuOptsList qemu_numa_opts; diff --git a/numa.c b/numa.c index 7b9c33a..d157961 100644 --- a/numa.c +++ b/numa.c @@ -168,28 +168,11 @@ static void parse_numa_distance(NumaDistOptions *dist= , Error **errp) have_numa_distance =3D true; } =20 -static int parse_numa(void *opaque, QemuOpts *opts, Error **errp) +static +void parse_NumaOptions(MachineState *ms, NumaOptions *object, Error **errp) { - NumaOptions *object =3D NULL; - MachineState *ms =3D opaque; Error *err =3D NULL; =20 - { - Visitor *v =3D opts_visitor_new(opts); - visit_type_NumaOptions(v, NULL, &object, &err); - visit_free(v); - } - - if (err) { - goto end; - } - - /* Fix up legacy suffix-less format */ - if ((object->type =3D=3D NUMA_OPTIONS_TYPE_NODE) && object->u.node.has= _mem) { - const char *mem_str =3D qemu_opt_get(opts, "mem"); - qemu_strtosz_MiB(mem_str, NULL, &object->u.node.mem); - } - switch (object->type) { case NUMA_OPTIONS_TYPE_NODE: parse_numa_node(ms, &object->u.node, &err); @@ -223,6 +206,33 @@ static int parse_numa(void *opaque, QemuOpts *opts, Er= ror **errp) } =20 end: + if (err) { + error_propagate(errp, err); + } +} + +int parse_numa(void *opaque, QemuOpts *opts, Error **errp) +{ + NumaOptions *object =3D NULL; + MachineState *ms =3D MACHINE(opaque); + Error *err =3D NULL; + Visitor *v =3D opts_visitor_new(opts); + + visit_type_NumaOptions(v, NULL, &object, &err); + visit_free(v); + if (err) { + goto end; + } + + /* Fix up legacy suffix-less format */ + if ((object->type =3D=3D NUMA_OPTIONS_TYPE_NODE) && object->u.node.has= _mem) { + const char *mem_str =3D qemu_opt_get(opts, "mem"); + qemu_strtosz_MiB(mem_str, NULL, &object->u.node.mem); + } + + parse_NumaOptions(ms, object, &err); + +end: qapi_free_NumaOptions(object); if (err) { error_report_err(err); --=20 2.7.4 From nobody Tue Oct 28 12:12:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514482021444699.3185881125318; Thu, 28 Dec 2017 09:27:01 -0800 (PST) Received: from localhost ([::1]:59083 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUbxM-00015o-Dd for importer@patchew.org; Thu, 28 Dec 2017 12:27:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUbtv-0006pe-37 for qemu-devel@nongnu.org; Thu, 28 Dec 2017 12:23:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUbtt-0006TP-PD for qemu-devel@nongnu.org; Thu, 28 Dec 2017 12:23:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35672) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eUbtt-0006Sv-HR for qemu-devel@nongnu.org; Thu, 28 Dec 2017 12:23:25 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A7BC881DFE; Thu, 28 Dec 2017 17:23:24 +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 CC2355D9C6; Thu, 28 Dec 2017 17:23:22 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 28 Dec 2017 18:22:57 +0100 Message-Id: <1514481779-184817-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1514481779-184817-1-git-send-email-imammedo@redhat.com> References: <1514481779-184817-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 28 Dec 2017 17:23:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v2 2/4] HMP: add set-numa-node command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, pkrempa@redhat.com, ehabkost@redhat.com, armbru@redhat.com, pbonzini@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Igor Mammedov --- hmp.h | 1 + hmp-commands.hx | 13 +++++++++++++ hmp.c | 23 +++++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/hmp.h b/hmp.h index a6f56b1..d861038 100644 --- a/hmp.h +++ b/hmp.h @@ -147,5 +147,6 @@ void hmp_info_ramblock(Monitor *mon, const QDict *qdict= ); void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict); void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict); void hmp_info_memory_size_summary(Monitor *mon, const QDict *qdict); +void hmp_set_numa_node(Monitor *mon, const QDict *qdict); =20 #endif diff --git a/hmp-commands.hx b/hmp-commands.hx index 6d5ebdf..17f8504 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1816,6 +1816,19 @@ Print QOM properties of object at location @var{path} ETEXI =20 { + .name =3D "set-numa-node", + .args_type =3D "numa:O", + .params =3D "see -numa CLI option for possible options", + .help =3D "assign CPU to numa node", + .cmd =3D hmp_set_numa_node, + }, + +STEXI +@item qom-set @var{path} @var{property} @var{value} +Set QOM property @var{property} of object at location @var{path} to value = @var{value} +ETEXI + + { .name =3D "qom-set", .args_type =3D "path:s,property:s,value:s", .params =3D "path property value", diff --git a/hmp.c b/hmp.c index 35a7041..c8ed910 100644 --- a/hmp.c +++ b/hmp.c @@ -43,6 +43,7 @@ #include "hw/intc/intc.h" #include "migration/snapshot.h" #include "migration/misc.h" +#include "sysemu/numa.h" =20 #ifdef CONFIG_SPICE #include @@ -2918,3 +2919,25 @@ void hmp_info_memory_size_summary(Monitor *mon, cons= t QDict *qdict) } hmp_handle_error(mon, &err); } + +void hmp_set_numa_node(Monitor *mon, const QDict *qdict) +{ + QemuOpts *opts; + Error *err =3D NULL; + MachineState *ms =3D MACHINE(qdev_get_machine()); + + opts =3D qemu_opts_from_qdict(qemu_find_opts("numa"), qdict, &err); + if (err) { + goto end; + } + + parse_numa(ms, opts, &err); + if (err) { + goto end; + } + +end: + if (err) { + hmp_handle_error(mon, &err); + } +} --=20 2.7.4 From nobody Tue Oct 28 12:12:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514481920248803.2878526905546; Thu, 28 Dec 2017 09:25:20 -0800 (PST) Received: from localhost ([::1]:59029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUbvU-0007nV-9B for importer@patchew.org; Thu, 28 Dec 2017 12:25:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUbtw-0006qc-RO for qemu-devel@nongnu.org; Thu, 28 Dec 2017 12:23:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUbtv-0006WG-Ve for qemu-devel@nongnu.org; Thu, 28 Dec 2017 12:23:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51246) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eUbtv-0006Uk-IH for qemu-devel@nongnu.org; Thu, 28 Dec 2017 12:23:27 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C82F2883D8; Thu, 28 Dec 2017 17:23:26 +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 F02AE5D9C6; Thu, 28 Dec 2017 17:23:24 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 28 Dec 2017 18:22:58 +0100 Message-Id: <1514481779-184817-4-git-send-email-imammedo@redhat.com> In-Reply-To: <1514481779-184817-1-git-send-email-imammedo@redhat.com> References: <1514481779-184817-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 28 Dec 2017 17:23:26 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v2 3/4] QMP: add set-numa-node command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, pkrempa@redhat.com, ehabkost@redhat.com, armbru@redhat.com, pbonzini@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Igor Mammedov --- hw/core/machine.c | 1 + numa.c | 5 +++++ qapi-schema.json | 13 +++++++++++++ 3 files changed, 19 insertions(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index c857f3f..212dfec 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -21,6 +21,7 @@ #include "qemu/error-report.h" #include "qemu/cutils.h" #include "sysemu/qtest.h" +#include "qmp-commands.h" =20 static char *machine_get_accel(Object *obj, Error **errp) { diff --git a/numa.c b/numa.c index d157961..fd2bf1c 100644 --- a/numa.c +++ b/numa.c @@ -442,6 +442,11 @@ void parse_numa_opts(MachineState *ms) } } =20 +void qmp_set_numa_node(NumaOptions *cmd, Error **errp) +{ + parse_NumaOptions(MACHINE(qdev_get_machine()), cmd, errp); +} + void numa_cpu_pre_plug(const CPUArchId *slot, DeviceState *dev, Error **er= rp) { int node_id =3D object_property_get_int(OBJECT(dev), "node-id", &error= _abort); diff --git a/qapi-schema.json b/qapi-schema.json index 5c06745..94ef197 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3189,3 +3189,16 @@ # Since: 2.11 ## { 'command': 'watchdog-set-action', 'data' : {'action': 'WatchdogAction'} } + +## +# @set-numa-node: +# +# Runtime equivalent of '-numa' CLI option, available at +# preconfigure stage to configure numa mapping before initializing +# machine. +# +# Since 2.10 +## +{ 'command': 'set-numa-node', 'boxed': true, + 'data': 'NumaOptions' +} --=20 2.7.4 From nobody Tue Oct 28 12:12:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514482018713162.41608912664412; Thu, 28 Dec 2017 09:26:58 -0800 (PST) Received: from localhost ([::1]:59081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUbxJ-00013X-Mg for importer@patchew.org; Thu, 28 Dec 2017 12:26:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUbtz-0006t7-Bj for qemu-devel@nongnu.org; Thu, 28 Dec 2017 12:23:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUbty-0006Z5-5p for qemu-devel@nongnu.org; Thu, 28 Dec 2017 12:23:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34482) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eUbtx-0006Xv-P0 for qemu-devel@nongnu.org; Thu, 28 Dec 2017 12:23:30 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03CFBC0568F9; Thu, 28 Dec 2017 17:23:29 +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 1B4E85D9C6; Thu, 28 Dec 2017 17:23:26 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 28 Dec 2017 18:22:59 +0100 Message-Id: <1514481779-184817-5-git-send-email-imammedo@redhat.com> In-Reply-To: <1514481779-184817-1-git-send-email-imammedo@redhat.com> References: <1514481779-184817-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 28 Dec 2017 17:23:29 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v2 4/4] numa: pc: reset machine if numa config has changed in prelaunch time X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, pkrempa@redhat.com, ehabkost@redhat.com, armbru@redhat.com, pbonzini@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Igor Mammedov --- include/hw/boards.h | 1 + hw/core/machine.c | 2 +- hw/i386/pc.c | 1 + numa.c | 14 +++++++++++--- vl.c | 4 ++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 156b16f..9b3ec6a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -62,6 +62,7 @@ MachineClass *find_default_machine(void); extern MachineState *current_machine; =20 void machine_run_board_init(MachineState *machine); +void machine_numa_finish_init(MachineState *machine); bool machine_usb(MachineState *machine); bool machine_kernel_irqchip_allowed(MachineState *machine); bool machine_kernel_irqchip_required(MachineState *machine); diff --git a/hw/core/machine.c b/hw/core/machine.c index 212dfec..120b7ca 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -701,7 +701,7 @@ static char *cpu_slot_to_string(const CPUArchId *cpu) return g_string_free(s, false); } =20 -static void machine_numa_finish_init(MachineState *machine) +void machine_numa_finish_init(MachineState *machine) { int i; bool default_mapping; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3fcf318..6c91554 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2244,6 +2244,7 @@ static void pc_machine_reset(void) CPUState *cs; X86CPU *cpu; =20 + parse_numa_opts(MACHINE(qdev_get_machine())); qemu_devices_reset(); =20 /* Reset APIC after devices have been reset to cancel diff --git a/numa.c b/numa.c index fd2bf1c..83eaaea 100644 --- a/numa.c +++ b/numa.c @@ -53,7 +53,7 @@ static int max_numa_nodeid; /* Highest specified NUMA nod= e ID, plus one. int nb_numa_nodes; bool have_numa_distance; NodeInfo numa_info[MAX_NODES]; - +static bool numa_inited; =20 static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, Error **errp) @@ -173,6 +173,11 @@ void parse_NumaOptions(MachineState *ms, NumaOptions *= object, Error **errp) { Error *err =3D NULL; =20 + if (numa_inited && runstate_check(RUN_STATE_PRELAUNCH)) { + qemu_system_reset_request(SHUTDOWN_CAUSE_HOST_QMP); + } + numa_inited =3D false; + switch (object->type) { case NUMA_OPTIONS_TYPE_NODE: parse_numa_node(ms, &object->u.node, &err); @@ -352,9 +357,10 @@ void parse_numa_opts(MachineState *ms) int i; MachineClass *mc =3D MACHINE_GET_CLASS(ms); =20 - if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, NULL)) { - exit(1); + if (numa_inited) { + return; } + numa_inited =3D true; =20 /* * If memory hotplug is enabled (slots > 0) but without '-numa' @@ -439,6 +445,8 @@ void parse_numa_opts(MachineState *ms) /* Validation succeeded, now fill in any missing distances. */ complete_init_numa_distance(); } + + machine_numa_finish_init(ms); } } =20 diff --git a/vl.c b/vl.c index d3a5c5d..9e00604 100644 --- a/vl.c +++ b/vl.c @@ -4690,6 +4690,10 @@ int main(int argc, char **argv, char **envp) current_machine->boot_order =3D boot_order; current_machine->cpu_model =3D cpu_model; =20 + if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, + current_machine, NULL)) { + exit(1); + } parse_numa_opts(current_machine); =20 /* parse features once if machine provides default cpu_type */ --=20 2.7.4