summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-xscripts/runqemu7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 1df6875111..6748cb258a 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -167,6 +167,7 @@ class BaseConfig(object):
167 self.kernel = '' 167 self.kernel = ''
168 self.kernel_cmdline = '' 168 self.kernel_cmdline = ''
169 self.kernel_cmdline_script = '' 169 self.kernel_cmdline_script = ''
170 self.bootparams = ''
170 self.dtb = '' 171 self.dtb = ''
171 self.fstype = '' 172 self.fstype = ''
172 self.kvm_enabled = False 173 self.kvm_enabled = False
@@ -368,7 +369,7 @@ class BaseConfig(object):
368 elif arg.startswith('qemuparams='): 369 elif arg.startswith('qemuparams='):
369 self.qemu_opt_script += ' %s' % arg[len('qemuparams='):] 370 self.qemu_opt_script += ' %s' % arg[len('qemuparams='):]
370 elif arg.startswith('bootparams='): 371 elif arg.startswith('bootparams='):
371 self.kernel_cmdline_script += ' %s' % arg[len('bootparams='):] 372 self.bootparams = arg[len('bootparams='):]
372 elif os.path.exists(arg) or (re.search(':', arg) and re.search('/', arg)): 373 elif os.path.exists(arg) or (re.search(':', arg) and re.search('/', arg)):
373 self.check_arg_path(os.path.abspath(arg)) 374 self.check_arg_path(os.path.abspath(arg))
374 elif re.search('-image-', arg): 375 elif re.search('-image-', arg):
@@ -954,7 +955,9 @@ class BaseConfig(object):
954 955
955 def start_qemu(self): 956 def start_qemu(self):
956 if self.kernel: 957 if self.kernel:
957 kernel_opts = "-kernel %s -append '%s %s %s'" % (self.kernel, self.kernel_cmdline, self.kernel_cmdline_script, self.get('QB_KERNEL_CMDLINE_APPEND')) 958 kernel_opts = "-kernel %s -append '%s %s %s %s'" % (self.kernel, self.kernel_cmdline,
959 self.kernel_cmdline_script, self.get('QB_KERNEL_CMDLINE_APPEND'),
960 self.bootparams)
958 if self.dtb: 961 if self.dtb:
959 kernel_opts += " -dtb %s" % self.dtb 962 kernel_opts += " -dtb %s" % self.dtb
960 else: 963 else: