core: Change default vCPUS to 2
This behaves better when running multiple VMs. If one need full CPU power in some VM, it is always possible to increase vCPUs for this particular VM. Fixes QubesOS/qubes-issues#1891
This commit is contained in:
parent
db8e79a903
commit
92b49fe9a4
@ -136,7 +136,7 @@ class QubesVm(object):
|
|||||||
"pci_strictreset": {"default": True},
|
"pci_strictreset": {"default": True},
|
||||||
# Internal VM (not shown in qubes-manager, doesn't create appmenus entries
|
# Internal VM (not shown in qubes-manager, doesn't create appmenus entries
|
||||||
"internal": { "default": False, 'attr': '_internal' },
|
"internal": { "default": False, 'attr': '_internal' },
|
||||||
"vcpus": { "default": None },
|
"vcpus": { "default": 2 },
|
||||||
"uses_default_kernel": { "default": True, 'order': 30 },
|
"uses_default_kernel": { "default": True, 'order': 30 },
|
||||||
"uses_default_kernelopts": { "default": True, 'order': 30 },
|
"uses_default_kernelopts": { "default": True, 'order': 30 },
|
||||||
"kernel": {
|
"kernel": {
|
||||||
@ -327,11 +327,6 @@ class QubesVm(object):
|
|||||||
if self.maxmem > self.memory * 10:
|
if self.maxmem > self.memory * 10:
|
||||||
self.maxmem = self.memory * 10
|
self.maxmem = self.memory * 10
|
||||||
|
|
||||||
# By default allow use all VCPUs
|
|
||||||
if self.vcpus is None and not vmm.offline_mode:
|
|
||||||
qubes_host = QubesHost()
|
|
||||||
self.vcpus = qubes_host.no_cpus
|
|
||||||
|
|
||||||
# Always set if meminfo-writer should be active or not
|
# Always set if meminfo-writer should be active or not
|
||||||
if 'meminfo-writer' not in self.services:
|
if 'meminfo-writer' not in self.services:
|
||||||
self.services['meminfo-writer'] = not (len(self.pcidevs) > 0)
|
self.services['meminfo-writer'] = not (len(self.pcidevs) > 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user