[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v5 19/22] s390x: get rid of cpu_states and use p
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-devel] [PATCH v5 19/22] s390x: get rid of cpu_states and use possible_cpus instead |
Date: |
Wed, 13 Sep 2017 16:45:06 +0200 |
On Wed, 13 Sep 2017 15:24:14 +0200
David Hildenbrand <address@hidden> wrote:
> Now that we have possible_cpus, we can get rid of the global variable
> and rewrite s390_cpu_addr2state() to use it.
>
> Signed-off-by: David Hildenbrand <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
> ---
> hw/s390x/s390-virtio-ccw.c | 36 ++++++++++--------------------------
> 1 file changed, 10 insertions(+), 26 deletions(-)
>
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index cc64a81321..720f145054 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -36,23 +36,26 @@
> #include "qapi/qmp/qerror.h"
> #include "hw/nmi.h"
>
> -static S390CPU **cpu_states;
> -
> S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)
> {
> - if (cpu_addr >= max_cpus) {
> - return NULL;
> + static MachineState *ms;
> +
> + if (!ms) {
> + ms = MACHINE(qdev_get_machine());
> + g_assert(ms->possible_cpus);
> }
>
> - /* Fast lookup via CPU ID */
> - return cpu_states[cpu_addr];
> + /* CPU address corresponds to the core_id and the index */
> + if (cpu_addr >= ms->possible_cpus->len) {
> + return NULL;
> + }
> + return S390_CPU(ms->possible_cpus->cpus[cpu_addr].cpu);
> }
>
> static void s390_init_cpus(MachineState *machine)
> {
> MachineClass *mc = MACHINE_GET_CLASS(machine);
> int i;
> - gchar *name;
>
> if (machine->cpu_model == NULL) {
> machine->cpu_model = s390_default_cpu_model_name();
> @@ -63,18 +66,6 @@ static void s390_init_cpus(MachineState *machine)
> exit(1);
> }
>
> - cpu_states = g_new0(S390CPU *, max_cpus);
> -
> - for (i = 0; i < max_cpus; i++) {
> - name = g_strdup_printf("cpu[%i]", i);
> - object_property_add_link(OBJECT(machine), name, TYPE_S390_CPU,
> - (Object **) &cpu_states[i],
> - object_property_allow_set_link,
> - OBJ_PROP_LINK_UNREF_ON_RELEASE,
> - &error_abort);
> - g_free(name);
> - }
> -
> /* initialize possible_cpus */
> mc->possible_cpu_arch_ids(machine);
>
> @@ -310,15 +301,8 @@ static void ccw_init(MachineState *machine)
> static void s390_cpu_plug(HotplugHandler *hotplug_dev,
> DeviceState *dev, Error **errp)
> {
> - gchar *name;
> MachineState *ms = MACHINE(hotplug_dev);
> S390CPU *cpu = S390_CPU(dev);
> - CPUState *cs = CPU(dev);
> -
> - name = g_strdup_printf("cpu[%i]", cpu->env.core_id);
> - object_property_set_link(OBJECT(hotplug_dev), OBJECT(cs), name,
> - errp);
> - g_free(name);
>
> g_assert(!ms->possible_cpus->cpus[cpu->env.core_id].cpu);
> ms->possible_cpus->cpus[cpu->env.core_id].cpu = OBJECT(dev);
- [Qemu-devel] [PATCH v5 13/22] target/s390x: use "core-id" for cpu number/address/id handling, (continued)
- [Qemu-devel] [PATCH v5 13/22] target/s390x: use "core-id" for cpu number/address/id handling, David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 15/22] s390x: print CPU definitions in sorted order, David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 16/22] s390x: allow cpu hotplug via device_add, David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 17/22] s390x: CPU hot unplug via device_del cannot work for now, David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 18/22] s390x: implement query-hotpluggable-cpus, David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 19/22] s390x: get rid of cpu_states and use possible_cpus instead, David Hildenbrand, 2017/09/13
- Re: [Qemu-devel] [PATCH v5 19/22] s390x: get rid of cpu_states and use possible_cpus instead,
Igor Mammedov <=
- [Qemu-devel] [PATCH v5 20/22] s390x: get rid of cpu_s390x_create(), David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 21/22] s390x: generate sclp cpu information from possible_cpus, David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 22/22] s390x: allow CPU hotplug in random core-id order, David Hildenbrand, 2017/09/13
- Re: [Qemu-devel] [PATCH v5 00/22] s390x cleanups and CPU hotplug via device_add, Cornelia Huck, 2017/09/13