support/qemu-guest: Enable X2APIC for TCG mode

Enables X2APIC when TCG mode is selected. As soon as QEMU is available,
this should enable running a recent x86_64 version of Unikraft on devices
without x86 hardware virtualization support (e.g., Arm).

Signed-off-by: Simon Kuenzer <simon@unikraft.io>
Reviewed-by: Alexander Jung <alex@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #1034

diff --git a/support/scripts/qemu-guest b/support/scripts/qemu-guest
index 0697d769bc5640b6f6321434b1849480f386595f..ec43cc55776dc039274f8bb189afee9c037c459f 100755 (executable)
--- a/support/scripts/qemu-guest
+++ b/support/scripts/qemu-guest
@@ -1,9 +1,10 @@
 #!/bin/bash
 #
-# Authors: Simon Kuenzer <simon.kuenzer@neclab.eu>
+# Authors: Simon Kuenzer <simon@unikraft.io>
 #
 # Copyright (c) 2019, NEC Laboratories Europe GmbH,
 #                     NEC Corporation All rights reserved.
+# Copyright (c) 2022, Unikraft GmbH
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -760,7 +761,7 @@ case "$ARG_MACHINETYPE" in
                        QEMU_BASE_ARGS+=("pc")
 
                        QEMU_BASE_ARGS+=("-cpu")
-                       QEMU_BASE_ARGS+=("qemu64,-vmx,-svm,+pdpe1gb")
+                       QEMU_BASE_ARGS+=("qemu64,-vmx,-svm,+x2apic,+pdpe1gb")
                fi
 
                # BIOS also on serial
@@ -781,7 +782,7 @@ case "$ARG_MACHINETYPE" in
                        QEMU_BASE_ARGS+=("q35")
 
                        QEMU_BASE_ARGS+=("-cpu")
-                       QEMU_BASE_ARGS+=("qemu64,-vmx,-svm")
+                       QEMU_BASE_ARGS+=("qemu64,-vmx,-svm,+x2apic,+pdpe1gb")
                fi
 
                # BIOS also on serial