From a5bf9fbcc92322e9919113c14dee9838bee4cab4 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Wed, 29 May 2019 18:07:47 +0200 Subject: [PATCH 1/2] numa: improve cpu hotplug error message with a wrong node-id On pseries, core-ids are strongly binded to a node-id by the command line option. If an user tries to add a CPU to the wrong node, he has an error but it is not really helpful: qemu-system-ppc64 ... -smp 1,maxcpus=64,cores=1,threads=1,sockets=1 \ -numa node,nodeid=0 -numa node,nodeid=1 ... (qemu) device_add power9_v2.0-spapr-cpu-core,core-id=30,node-id=1 Error: node-id=1 must match numa node specified with -numa option This patch improves this error message by giving to the user the good node-id to use with the core-id he's providing Error: invalid node-id, must be 0 Signed-off-by: Laurent Vivier Message-Id: <20190529160747.778-1-lvivier@redhat.com> Reviewed-by: Igor Mammedov Signed-off-by: Eduardo Habkost --- numa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/numa.c b/numa.c index 3875e1efda..955ec0c830 100644 --- a/numa.c +++ b/numa.c @@ -470,8 +470,8 @@ void numa_cpu_pre_plug(const CPUArchId *slot, DeviceState *dev, Error **errp) "node-id", errp); } } else if (node_id != slot->props.node_id) { - error_setg(errp, "node-id=%d must match numa node specified " - "with -numa option", node_id); + error_setg(errp, "invalid node-id, must be %"PRId64, + slot->props.node_id); } } From 754f1dbcf1d4d543167e3212366055761c30bcf4 Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Fri, 31 May 2019 12:53:34 -0400 Subject: [PATCH 2/2] accel: Remove unused AccelClass::opt_name attribute The AccelType type was converted to AccelClass QOM object on b14a0b7469f, and the original data type had a field to store the option name which in turn was used to search an accelerator. The lookup method (accel_find) changed too, making the option field unnecessary but it became AccelClass::opt_name despite that. Therefore, and given that none accelerator implementation sets AccelClass::opt_name, let's remove this attribute. Signed-off-by: Wainer dos Santos Moschetta Message-Id: <20190531165334.20403-2-wainersm@redhat.com> Signed-off-by: Eduardo Habkost --- include/sysemu/accel.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h index 70e9e2f2a1..81293cdb08 100644 --- a/include/sysemu/accel.h +++ b/include/sysemu/accel.h @@ -36,7 +36,6 @@ typedef struct AccelClass { ObjectClass parent_class; /*< public >*/ - const char *opt_name; const char *name; int (*init_machine)(MachineState *ms); void (*setup_post)(MachineState *ms, AccelState *accel);