Skip to content

Commit ffa5cc5

Browse files
committed
boot-qemu.py: Increase default memory to 1G
512m is becoming tight in some configurations, so bump the default to 1G to give a little more headroom. The palmetto machine for ARMv5 testing does not support this new value qemu-system-arm: Invalid RAM size 1 GiB So use the old default there. Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent bb73d7d commit ffa5cc5

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

boot-qemu.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def __init__(self):
5050
self.interactive = False
5151
self.kernel = None
5252
self.kernel_dir = None
53-
self.memory = '512m'
53+
self.memory = '1G'
5454
self.supports_efi = False
5555
# It may be tempting to use self.use_kvm during initialization of
5656
# subclasses to set certain properties but the user can explicitly opt
@@ -371,6 +371,7 @@ def __init__(self):
371371
super().__init__()
372372

373373
self.cmdline.append('earlycon')
374+
self.memory = '512m'
374375

375376
self._dtbs = [
376377
'aspeed/aspeed-bmc-opp-palmetto.dtb', 'aspeed-bmc-opp-palmetto.dtb'
@@ -597,7 +598,6 @@ class PowerPC64QEMURunner(QEMURunner):
597598
def __init__(self):
598599
super().__init__()
599600

600-
self.memory = '1G'
601601
self._default_kernel_path = Path('vmlinux')
602602
self._initrd_arch = self._qemu_arch = 'ppc64'
603603
self._qemu_args += [

0 commit comments

Comments
 (0)