]> code.ossystems Code Review - openembedded-core.git/commitdiff
runqemu: Make QB_MEM easier to set
authorRobert Yang <liezhi.yang@windriver.com>
Fri, 15 Feb 2019 08:14:52 +0000 (16:14 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 15 Feb 2019 16:05:29 +0000 (16:05 +0000)
It only could be set as the following in the past:
QB_MEM = "-m 256"

Now it also can be set as:
QB_MEM = "-m 256M (or m)"
QB_MEM = "256M (or m)"

[YOCTO #11522]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/runqemu

index 10f61e4c7fa0ea0fe5be5716c63127502814af3d..d171c4f894507cfa5e374886773bb4dbc3acef16 100755 (executable)
@@ -679,6 +679,17 @@ class BaseConfig(object):
             logger.info('QB_MEM is not set, use 512M by default')
             self.set('QB_MEM', '-m 512')
 
+        # Check and remove M or m suffix
+        qb_mem = self.get('QB_MEM')
+        if qb_mem.endswith('M') or qb_mem.endswith('m'):
+            qb_mem = qb_mem[:-1]
+
+        # Add -m prefix it not present
+        if not qb_mem.startswith('-m'):
+            qb_mem = '-m %s' % qb_mem
+
+        self.set('QB_MEM', qb_mem)
+
         mach = self.get('MACHINE')
         if not mach.startswith('qemumips'):
             self.kernel_cmdline_script += ' mem=%s' % self.get('QB_MEM').replace('-m','').strip() + 'M'