hw/arm/virt: Increase max_cpus to 512
virt 3.0 now allows up to 512 vcpus whereas for earlier machine types, max_cpus was set to 255 and any attempt to start the machine with vcpus > 255 was rejected at a very early stage, in vl.c/main level. 512 is the max supported by KVM. Anyway the actual vcpu count that can be achieved depends on other parameters such as the acceleration mode, the vgic version, the host kernel version. Those are discovered later on. Signed-off-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: Andrew Jones <drjones@redhat.com> Message-id: 1529072910-16156-12-git-send-email-eric.auger@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
17ec075a65
commit
b10fbd5363
|
@ -1706,11 +1706,11 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
|
||||||
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
|
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
|
||||||
|
|
||||||
mc->init = machvirt_init;
|
mc->init = machvirt_init;
|
||||||
/* Start max_cpus at the maximum QEMU supports. We'll further restrict
|
/* Start with max_cpus set to 512, which is the maximum supported by KVM.
|
||||||
* it later in machvirt_init, where we have more information about the
|
* The value may be reduced later when we have more information about the
|
||||||
* configuration of the particular instance.
|
* configuration of the particular instance.
|
||||||
*/
|
*/
|
||||||
mc->max_cpus = 255;
|
mc->max_cpus = 512;
|
||||||
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_CALXEDA_XGMAC);
|
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_CALXEDA_XGMAC);
|
||||||
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE);
|
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE);
|
||||||
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
|
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);
|
||||||
|
@ -1837,6 +1837,7 @@ static void virt_machine_2_12_options(MachineClass *mc)
|
||||||
virt_machine_3_0_options(mc);
|
virt_machine_3_0_options(mc);
|
||||||
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_12);
|
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_12);
|
||||||
vmc->no_highmem_ecam = true;
|
vmc->no_highmem_ecam = true;
|
||||||
|
mc->max_cpus = 255;
|
||||||
}
|
}
|
||||||
DEFINE_VIRT_MACHINE(2, 12)
|
DEFINE_VIRT_MACHINE(2, 12)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue