rum: --qemu-which host now works for user mode as well as system

Don't fall back on host QEMU automatically, too much insanity.
This commit is contained in:
Ciro Santilli 六四事件 法轮功
2019-05-05 00:00:00 +00:00
parent ccf1ea2420
commit 8661d68d71
2 changed files with 22 additions and 19 deletions

View File

@@ -658,10 +658,27 @@ Incompatible archs are skipped.
# QEMU
env['qemu_build_dir'] = join(env['out_dir'], 'qemu', env['qemu_build_id'])
env['qemu_executable_basename'] = 'qemu-system-{}'.format(env['arch'])
env['qemu_executable'] = join(env['qemu_build_dir'], '{}-softmmu'.format(env['arch']), env['qemu_executable_basename'])
env['qemu_img_basename'] = 'qemu-img'
env['qemu_img_executable'] = join(env['qemu_build_dir'], env['qemu_img_basename'])
if env['userland'] is None:
env['qemu_executable_basename'] = 'qemu-system-{}'.format(env['arch'])
else:
env['qemu_executable_basename'] = 'qemu-{}'.format(env['arch'])
if env['qemu_which'] == 'host':
env['qemu_executable'] = env['qemu_executable_basename']
else:
if env['userland'] is None:
env['qemu_executable'] = join(
env['qemu_build_dir'],
'{}-softmmu'.format(env['arch']),
env['qemu_executable_basename']
)
else:
env['qemu_executable'] = join(
self.env['qemu_build_dir'],
'{}-linux-user'.format(self.env['arch']),
env['qemu_executable_basename']
)
# gem5
if not env['_args_given']['gem5_build_dir']: