runqemu: remove setting of mem on kernel command line for certain systems
PATCH 1/2 runqemu: remove setting of mem on kernel command line for certain systems
Some emulated hardware will not boot if mem is set on the kernel command line. Also, it is not necessary if the device tree file, as that _should_ have the memory size specified in it. Add a check for QB_DTB and don't set it if specified.
--- scripts/runqemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/runqemu +1 -1
@@ -883,7 +883,7 @@ to your build configuration. self.set('QB_MEM', qb_mem) mach = self.get('MACHINE') - if not mach.startswith(('qemumips', 'qemux86', 'qemuloongarch64')): + if not mach.startswith(('qemumips', 'qemux86', 'qemuloongarch64')) and self.get('QB_DTB') == "": self.kernel_cmdline_script += ' mem=%s' % self.get('QB_MEM').replace('-m','').strip() + 'M' self.qemu_opt_script += ' %s' % self.get('QB_MEM')
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH 2/2 runqemu: resize rootfs image to power of 2 for SD or pflash
QEMU requires that SD and pflash images are sized to be a power of 2 (e.g., 32M, 64M, etc). So, if the image being used is not a power of 2 and it's being used for SD or pflash, increase it to the next power of 2 size via the truncate command.
This might not be an actual spec requirement, and is being investigated in https://gitlab.com/qemu-project/qemu/-/issues/1754
--- scripts/runqemu | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
scripts/runqemu +22 -2
@@ -420,7 +420,27 @@ class BaseConfig(object): else: raise RunQemuError("Unknown path arg %s" % p) - def uncompress_rootfs(self): + def rootfs_fixups(self): + + """Resize rootfs image if needed""" + qb_rootfs_opt = self.get('QB_ROOTFS_OPT') + + # Check if sdcard size is a power of 2, as that is currently a requirement for qemu + # See https://gitlab.com/qemu-project/qemu/-/issues/1754 + rootfs_size = os.path.getsize(self.rootfs) + rootfs_size_pwr2 = 1 << (rootfs_size - 1).bit_length() + if ("if=sd" in qb_rootfs_opt or "if=pflash" in qb_rootfs_opt) and rootfs_size != rootfs_size_pwr2: + logger.info("Using sd-card or pflash and is not power of 2. File size %d, power of 2 size %d" %(rootfs_size, rootfs_size_pwr2)) + logger.info("Attempting to use truncate to correct this.") + + # Ensure the 'truncate' tool is installed before attempting to make a power of 2. + if not shutil.which('truncate'): + raise RunQemuError(f"'truncate' is required to make {self.rootfs} a power of 2 in size but was not found in PATH") + try: + subprocess.check_call(['truncate', '-s', str(rootfs_size_pwr2), self.rootfs]) + except subprocess.CalledProcessError as e: + raise RunQemuError(f"Failed to make {self.rootfs} power of 2 in size: {e}") + """Decompress ZST rootfs image if needed""" if not self.rootfs or not self.fstype.endswith('.zst'): return
@@ -1807,7 +1827,7 @@ def main(): config.check_args() config.read_qemuboot() config.check_and_set() - config.uncompress_rootfs() + config.rootfs_fixups() # Check whether the combos is valid or not config.validate_combos() config.print_config()
Signature · 1 line
2.39.5 (Apple Git-154)
Quoted 5 lines · Jon Mason via lists.openembedded.org
Some emulated hardware will not boot if mem is set on the kernel command line. Also, it is not necessary if the device tree file, as that _should_ have the memory size specified in it. Add a check for
QB_DTBand don't set it if specified.
Can you elaborate on “some” so this can be verified or tested in the future?
Ross
Quoted 9 lines · Ross Burton via lists.openembedded.org
Quoted 5 lines · Jon Mason via lists.openembedded.org
Some emulated hardware will not boot if mem is set on the kernel command line. Also, it is not necessary if the device tree file, as that _should_ have the memory size specified in it. Add a check for
QB_DTBand don't set it if specified.Can you elaborate on “some” so this can be verified or tested in the future?
The machines in question are the QEMU emulated Raspberry Pis, all of them. Given the amount of time since I originally sent this, I'll resend the series with a modified comment saying this. Also, I managed to mess up the intended mailing list (but it magically landed there somehow). So, another reason to resend.
Thanks,
Jon
Quoted 10 lines
Ross
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#222676): https://lists.openembedded.org/g/openembedded-core/message/222676
Mute This Topic: https://lists.openembedded.org/mt/114931906/3616920
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-