diff --git a/.github/workflows/kernel_test.yml b/.github/workflows/kernel_test.yml index abe47ecee..c02320a6f 100644 --- a/.github/workflows/kernel_test.yml +++ b/.github/workflows/kernel_test.yml @@ -80,6 +80,6 @@ jobs: id: syscall_test_at_exfat_linux run: make run AUTO_TEST=syscall SYSCALL_TEST_DIR=/exfat EXTRA_BLOCKLISTS_DIRS=blocklists.exfat ENABLE_KVM=0 BOOT_PROTOCOL=linux-efi-handover64 RELEASE=1 - - name: Regression Test (Multiboot2) + - name: Regression Test (Linux EFI Handover Boot Protocol) id: regression_test_linux - run: make run AUTO_TEST=regression ENABLE_KVM=0 BOOT_PROTOCOL=multiboot2 RELEASE=1 + run: make run AUTO_TEST=regression ENABLE_KVM=0 BOOT_PROTOCOL=linux-efi-handover64 RELEASE=1 diff --git a/osdk/src/commands/new/kernel.OSDK.toml.template b/osdk/src/commands/new/kernel.OSDK.toml.template index 7a6505184..ba5647eb7 100644 --- a/osdk/src/commands/new/kernel.OSDK.toml.template +++ b/osdk/src/commands/new/kernel.OSDK.toml.template @@ -8,7 +8,7 @@ args = """\ -machine q35,kernel-irqchip=split \ -cpu Icelake-Server,+x2apic \ --no-reboot \ - -m 2G \ + -m 8G \ -smp 1 \ -nographic \ -serial chardev:mux \ diff --git a/osdk/src/commands/new/lib.OSDK.toml.template b/osdk/src/commands/new/lib.OSDK.toml.template index ca86949b5..cc809d37b 100644 --- a/osdk/src/commands/new/lib.OSDK.toml.template +++ b/osdk/src/commands/new/lib.OSDK.toml.template @@ -8,7 +8,7 @@ args = """\ -machine q35,kernel-irqchip=split \ -cpu Icelake-Server,+x2apic \ --no-reboot \ - -m 2G \ + -m 8G \ -smp 1 \ -nographic \ -serial chardev:mux \ diff --git a/osdk/src/config/unix_args.rs b/osdk/src/config/unix_args.rs index 38b65bafb..85b3a0381 100644 --- a/osdk/src/config/unix_args.rs +++ b/osdk/src/config/unix_args.rs @@ -154,7 +154,7 @@ pub mod test { let key = get_key(string1, "=").unwrap(); assert_eq!(key.as_str(), "init"); - let string2 = "-m 2G"; + let string2 = "-m 8G"; let key = get_key(string2, " ").unwrap(); assert_eq!(key.as_str(), "-m"); @@ -170,7 +170,7 @@ pub mod test { fn test_apply_kv_array() { let qemu_args = &[ "-enable-kvm", - "-m 2G", + "-m 8G", "-device virtio-blk-pci,bus=pcie.0,addr=0x6,drive=x0,disable-legacy=on,disable-modern=off", "-device virtio-keyboard-pci,disable-legacy=on,disable-modern=off", ]; diff --git a/tools/qemu_args.sh b/tools/qemu_args.sh index c519e6ec6..e940b0f41 100755 --- a/tools/qemu_args.sh +++ b/tools/qemu_args.sh @@ -14,7 +14,7 @@ echo "[$1] Forwarded QEMU guest port: $RAND_PORT_NUM1->22; $RAND_PORT_NUM2->8080 COMMON_QEMU_ARGS="\ -cpu Icelake-Server,+x2apic \ -smp ${SMP:-1} \ - -m ${MEM:-2G} \ + -m ${MEM:-8G} \ --no-reboot \ -nographic \ -display none \