justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 00:14:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

wscript change to dynamically detect KVM support for QEMU

Browse Source
This commit is contained in:
Justin C. Miller
2018-08-31 09:25:39 -07:00
parent 647801f096
commit 28a90e550e
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
wscript
View File

@@ -142,6 +142,20 @@ def configure(ctx):
'-nostartfiles',
])
ctx.env.append_value('QEMUOPTS', [
'-smp', '1',
'-m', '512',
'-d', 'mmu,int,guest_errors',
'-D', 'popcorn.log',
'-cpu', 'Broadwell',
'-M', 'q35',
'-no-reboot',
'-nographic',
])
if os.path.exists('/dev/kvm'):
ctx.env.append_value('QEMUOPTS', ['--enable-kvm'])
env = ctx.env
ctx.setenv('boot', env=env)
ctx.recurse(join("src", "boot"))
@@ -269,6 +283,14 @@ def build(bld):
bld.recurse(join("src", "tests"))
class QemuContext(BuildContext):
cmd = 'qemu'
fun = 'qemu'
class DebugQemuContext(QemuContext):
cmd = 'debug'
fun = 'qemu'
def qemu(ctx):
import subprocess
subprocess.call("rm popcorn.log", shell=True)
@@ -276,16 +298,7 @@ def qemu(ctx):
'qemu-system-x86_64',
'-drive', 'if=pflash,format=raw,file={}/flash.img'.format(out),
'-drive', 'format=raw,file={}/popcorn.img'.format(out),
'-smp', '1',
'-m', '512',
'-d', 'mmu,int,guest_errors',
'-D', 'popcorn.log',
'-cpu', 'Broadwell',
'-M', 'q35',
'-no-reboot',
'-nographic',
'-enable-kvm',
])
] + ctx.env.QEMUOPTS)
def debug(ctx):
import subprocess
@@ -294,17 +307,8 @@ def debug(ctx):
'qemu-system-x86_64',
'-drive', 'if=pflash,format=raw,file={}/flash.img'.format(out),
'-drive', 'format=raw,file={}/popcorn.img'.format(out),
'-smp', '1',
'-m', '512',
'-d', 'mmu,int,guest_errors',
'-D', 'popcorn.log',
'-cpu', 'Broadwell',
'-M', 'q35',
'-no-reboot',
'-nographic',
'-enable-kvm',
'-s',
])
] + ctx.env.QEMUOPTS)
def vbox(ctx):