| Message ID | 1476352367-69400-12-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Oct 13, 2016 at 11:52:45AM +0200, Igor Mammedov wrote: > 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> > --- > CC: david@gibson.dropbear.id.au > CC: peter.maydell@linaro.org > CC: drjones@redhat.com > > include/sysemu/sysemu.h | 2 +- > hw/arm/virt.c | 2 +- > hw/ppc/spapr.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h > index b668833..66c6f15 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 { > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 795740d..186b5bd 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1491,7 +1491,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 03e3803..fb3b498 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2388,7 +2388,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; > -- > 2.7.4 > > Reviewed-by: Andrew Jones <drjones@redhat.com>
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index b668833..66c6f15 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 { diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 795740d..186b5bd 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1491,7 +1491,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 03e3803..fb3b498 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2388,7 +2388,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;
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> --- CC: david@gibson.dropbear.id.au CC: peter.maydell@linaro.org CC: drjones@redhat.com include/sysemu/sysemu.h | 2 +- hw/arm/virt.c | 2 +- hw/ppc/spapr.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)