summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/runqemu7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index b6c6a8747c..c5fa88e341 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -188,6 +188,7 @@ class BaseConfig(object):
188 self.kernel = '' 188 self.kernel = ''
189 self.kernel_cmdline = '' 189 self.kernel_cmdline = ''
190 self.kernel_cmdline_script = '' 190 self.kernel_cmdline_script = ''
191 self.bootparams = ''
191 self.dtb = '' 192 self.dtb = ''
192 self.fstype = '' 193 self.fstype = ''
193 self.kvm_enabled = False 194 self.kvm_enabled = False
@@ -411,7 +412,7 @@ class BaseConfig(object):
411 elif arg.startswith('qemuparams='): 412 elif arg.startswith('qemuparams='):
412 self.qemu_opt_script += ' %s' % arg[len('qemuparams='):] 413 self.qemu_opt_script += ' %s' % arg[len('qemuparams='):]
413 elif arg.startswith('bootparams='): 414 elif arg.startswith('bootparams='):
414 self.kernel_cmdline_script += ' %s' % arg[len('bootparams='):] 415 self.bootparams = arg[len('bootparams='):]
415 elif os.path.exists(arg) or (re.search(':', arg) and re.search('/', arg)): 416 elif os.path.exists(arg) or (re.search(':', arg) and re.search('/', arg)):
416 self.check_arg_path(os.path.abspath(arg)) 417 self.check_arg_path(os.path.abspath(arg))
417 elif re.search(r'-image-|-image$', arg): 418 elif re.search(r'-image-|-image$', arg):
@@ -1091,7 +1092,9 @@ class BaseConfig(object):
1091 1092
1092 def start_qemu(self): 1093 def start_qemu(self):
1093 if self.kernel: 1094 if self.kernel:
1094 kernel_opts = "-kernel %s -append '%s %s %s'" % (self.kernel, self.kernel_cmdline, self.kernel_cmdline_script, self.get('QB_KERNEL_CMDLINE_APPEND')) 1095 kernel_opts = "-kernel %s -append '%s %s %s %s'" % (self.kernel, self.kernel_cmdline,
1096 self.kernel_cmdline_script, self.get('QB_KERNEL_CMDLINE_APPEND'),
1097 self.bootparams)
1095 if self.dtb: 1098 if self.dtb:
1096 kernel_opts += " -dtb %s" % self.dtb 1099 kernel_opts += " -dtb %s" % self.dtb
1097 else: 1100 else: