Skip to content

Commit 455618a

Browse files
committed
fancify default qemu VM
Signed-off-by: Conor Dooley <[email protected]>
1 parent eff501b commit 455618a

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ qemu-icicle:
285285
.PHONY: qemu-alex
286286
qemu-alex:
287287
$(qemu) -M virt \
288-
-cpu rv64,h=true,sscofpmf=true \
288+
-cpu rv64,v=true,h=true,sscofpmf=true \
289289
-m 8G -smp 16 \
290290
-nographic \
291291
-kernel $(vmlinux_bin) \
@@ -305,11 +305,12 @@ qemu-arm:
305305
.PHONY: qemu-xen
306306
qemu-xen:
307307
$(qemu) -M virt \
308-
-cpu rv64 \
308+
-cpu rv64,h=true \
309309
-smp 1 -m 2G \
310310
-nographic \
311311
-kernel $(xen) \
312312
-device 'guest-loader,kernel=$(vmlinux_bin),addr=0x80400000,bootargs=console=hvc0 earlycon=sbi keep_bootcon' \
313+
-device 'guest-loader,initrd=$(initramfs),addr=0x84000000' \
313314
-D qemu.log -d unimp
314315

315316

qemu.exp

+15-6
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,22 @@ set timeout -1
1212
# -display none -serial null \
1313
# -serial stdio
1414

15+
#spawn /stuff/qemu/build/qemu-system-riscv64 -M virt \
16+
# -M virt -nographic \
17+
# -kernel ./work/vmlinux.bin \
18+
# -append earlycon \
19+
# -initrd ./work/initramfs.cpio.gz \
20+
# -m 512m -nodefaults -no-reboot \
21+
# -serial mon:stdio
22+
1523
spawn /stuff/qemu/build/qemu-system-riscv64 -M virt \
16-
-M virt -nographic \
17-
-kernel ./work/vmlinux.bin \
18-
-append earlycon \
19-
-initrd ./work/initramfs.cpio.gz \
20-
-m 512m -nodefaults -no-reboot \
21-
-serial mon:stdio
24+
-M virt \
25+
-cpu rv64,h=true \
26+
-smp 1 -m 2G \
27+
-nographic \
28+
-kernel work/xen/xen \
29+
-device "guest-loader,kernel=work/vmlinux.bin,addr=0x80400000,bootargs=console=hvc0 earlycon=sbi keep_bootcon" \
30+
-device "guest-loader,initrd=work/initramfs.cpio.gz,addr=0x84000000"
2231

2332
expect "buildroot login: "
2433
send "root\n"

0 commit comments

Comments
 (0)