diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2016-10-19 14:05:40 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2016-10-24 17:29:15 -0200 |
| commit | 079019f2e319bd1279681b6c1d7dde785d09e69e (patch) | |
| tree | 5123158900396de73947e169ee7b8d43835be9f9 | |
| parent | a3abd0f28eb863206b4466a5bb484eb0d4025819 (diff) | |
Increase MAX_CPUMASK_BITS from 255 to 288
so that it would be possible to increase maxcpus limit
for x86 target. Keep spapr/virt_arm at limit they used
to have 255.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | hw/arm/virt.c | 2 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 2 | ||||
| -rw-r--r-- | include/sysemu/sysemu.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 895446f17c..c3a1e92e51 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1494,7 +1494,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) * it later in machvirt_init, where we have more information about the * configuration of the particular instance. */ - mc->max_cpus = MAX_CPUMASK_BITS; + mc->max_cpus = 255; mc->has_dynamic_sysbus = true; mc->block_default_type = IF_VIRTIO; mc->no_cdrom = 1; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index ddb7438434..486f57d6f6 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2438,7 +2438,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) mc->init = ppc_spapr_init; mc->reset = ppc_spapr_reset; mc->block_default_type = IF_SCSI; - mc->max_cpus = MAX_CPUMASK_BITS; + mc->max_cpus = 255; mc->no_parallel = 1; mc->default_boot_order = ""; mc->default_ram_size = 512 * M_BYTE; diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index b66883328d..66c6f1577e 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -173,7 +173,7 @@ extern int mem_prealloc; * * Note that cpu->get_arch_id() may be larger than MAX_CPUMASK_BITS. */ -#define MAX_CPUMASK_BITS 255 +#define MAX_CPUMASK_BITS 288 #define MAX_OPTION_ROMS 16 typedef struct QEMUOptionRom { |