| Message ID | 1462786020-144172-12-git-send-email-imammedo@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 9 May 2016 11:26:57 +0200 Igor Mammedov <imammedo@redhat.com> 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> > --- As said in my other post, bumping up to 1024 seems reasonable for pseries. Would it be a problem for the x86 target ? If it is okay for you, I'd rather try to push this separately from your series. Anyway, Reviewed-by: Greg Kurz <gkurz@linux.vnet.ibm.com> > hw/arm/virt.c | 2 +- > hw/ppc/spapr.c | 2 +- > 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 56d35c7..438e09c 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1358,7 +1358,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 b69995e..d61ece2 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2280,7 +2280,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 38fb3ca..5edcc72 100644 > --- a/include/sysemu/sysemu.h > +++ b/include/sysemu/sysemu.h > @@ -185,7 +185,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 56d35c7..438e09c 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1358,7 +1358,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 b69995e..d61ece2 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2280,7 +2280,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 38fb3ca..5edcc72 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -185,7 +185,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 {
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> --- hw/arm/virt.c | 2 +- hw/ppc/spapr.c | 2 +- include/sysemu/sysemu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)