qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [RFC 11/13] numa: use new machine.cpu property with -nu


From: Eduardo Habkost
Subject: Re: [Qemu-devel] [RFC 11/13] numa: use new machine.cpu property with -numa cpus=... CLI
Date: Wed, 18 Jan 2017 16:46:37 -0200
User-agent: Mutt/1.7.1 (2016-10-04)

On Wed, Jan 18, 2017 at 06:13:27PM +0100, Igor Mammedov wrote:
> add compat layer to legacy cpu_index based '-numa cpus=...'
> CLI option, which will use new machine.cpu property to set
> numa mapping if that propety is available.
> 
> This way machine that supports machine.cpu property will
> not break legacy CLI but will be able to move away from
> using numa_info[node_id].node_cpu bitmaps and use only
> possible_cpus instead.
> 
> Signed-off-by: Igor Mammedov <address@hidden>
> ---
>  numa.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++---------------
>  1 file changed, 48 insertions(+), 15 deletions(-)
> 
> diff --git a/numa.c b/numa.c
> index 887ee58..0c34130 100644
> --- a/numa.c
> +++ b/numa.c
> @@ -141,10 +141,35 @@ uint32_t numa_get_node(ram_addr_t addr, Error **errp)
>      return -1;
>  }
>  
> -static void numa_node_parse(NumaNodeOptions *node, QemuOpts *opts, Error 
> **errp)
> +static void numa_cpu_set_nid(MachineState *ms, CpuInstanceProperties *props,
> +                             Error **errp)
> +{
> +    Visitor *v;
> +    QObject *qobj;
> +    Error *local_error = NULL;
> +
> +    v = qobject_output_visitor_new(&qobj);
> +    visit_type_CpuInstanceProperties(v, "cpu", &props, &local_error);
> +    visit_complete(v, &qobj);
> +    visit_free(v);
> +    if (local_error) {
> +        goto end;
> +    }
> +    v = qobject_input_visitor_new(qobj, true);
> +    object_property_set(OBJECT(ms), v, "cpu", &local_error);
> +    visit_free(v);
> +    qobject_decref(qobj);
> +end:
> +    error_propagate(errp, local_error);
> +}
> +
> +static void numa_node_parse(MachineState *ms, NumaNodeOptions *node,
> +                            QemuOpts *opts, Error **errp)
>  {
>      uint16_t nodenr;
>      uint16List *cpus = NULL;
> +    MachineClass *mc = MACHINE_GET_CLASS(ms);
> +    bool has_cpu_prop = object_property_find(OBJECT(ms), "cpu", NULL);
>  
>      if (node->has_nodeid) {
>          nodenr = node->nodeid;
> @@ -172,6 +197,19 @@ static void numa_node_parse(NumaNodeOptions *node, 
> QemuOpts *opts, Error **errp)
>              return;
>          }
>          bitmap_set(numa_info[nodenr].node_cpu, cpus->value, 1);
> +        if (mc->cpu_index_to_instance_props && has_cpu_prop) {
> +            CpuInstanceProperties props;
> +            Error *local_error = NULL;
> +
> +            props = mc->cpu_index_to_instance_props(ms, cpus->value);
> +            props.has_node_id = true;
> +            props.node_id = nodenr;
> +            numa_cpu_set_nid(ms, &props, &local_error);
> +            if (local_error) {
> +                error_propagate(errp, local_error);
> +                return;
> +            }
> +        }
>      }

With this, now we have two completely different ways to store the
results of "-numa node,cpus...", and both are likely to stay
forever if we take too long to update the other machines.

Do you plan to make ppc/spapr and arm/virt use the new
machine.cpu system so we could remove numa_info[].node_cpu
completely in the same series?

-- 
Eduardo



reply via email to

[Prev in Thread] Current Thread [Next in Thread]