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>
This commit is contained in:
		
							parent
							
								
									a3abd0f28e
								
							
						
					
					
						commit
						079019f2e3
					
				| 
						 | 
				
			
			@ -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;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue