Re: [Qemu-devel] [PATCH v1 04/27] s390x: introduce and use S390_MAX_CPUS

[Thomas Huth <thuth@redhat.com>]

On 18.09.2017 17:59, David Hildenbrand wrote:
> Will be handy in the next patches.
> 
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
>  hw/s390x/s390-virtio-ccw.c | 2 +-
>  target/s390x/cpu.h         | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index d5a12a2472..a57d435cbf 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -443,7 +443,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data)
>      mc->no_parallel = 1;
>      mc->no_sdcard = 1;
>      mc->use_sclp = 1;
> -    mc->max_cpus = 248;
> +    mc->max_cpus = S390_MAX_CPUS;
>      mc->has_hotpluggable_cpus = true;
>      mc->get_hotplug_handler = s390_get_hotplug_handler;
>      mc->cpu_index_to_instance_props = s390_cpu_index_to_props;
> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
> index f13aea3dd8..5f539b1057 100644
> --- a/target/s390x/cpu.h
> +++ b/target/s390x/cpu.h
> @@ -59,6 +59,8 @@
>  #define PSW_MCHK_MASK 0x0004000000000000
>  #define PSW_IO_MASK 0x0200000000000000
>  
> +#define S390_MAX_CPUS 248
> +
>  typedef struct PSW {
>      uint64_t mask;
>      uint64_t addr;
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>