qemu: Launch qemu without x2apic support. Fiasco uses xapic, jailhouse is not needed...

diff --git a/qemu-launch-scripts/start-qemu-amd.sh b/qemu-launch-scripts/start-qemu-amd.sh
index 9a8420bcf96da7d09aa57cf694c61218922ba2f8..f51185f8f3f69ab42c65d9e71756a5645823cbe7 100755 (executable)
--- a/qemu-launch-scripts/start-qemu-amd.sh
+++ b/qemu-launch-scripts/start-qemu-amd.sh
@@ -14,7 +14,7 @@ fi
 echo RFSIMG="$RFSIMG"
 qemu-system-x86_64 -machine q35 -m 1G -enable-kvm -smp 4 \
        -usbdevice keyboard \
-       -cpu host,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+svm,+x2apic \
+       -cpu host,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+svm,-x2apic \
        -kernel "$KIMG" -append "root=/dev/sda memmap=66M$0x3b000000 nohpet" \
        -drive file="$RFSIMG",format=raw,id=disk,if=none \
         -device ide-hd,drive=disk -serial stdio -serial vc \

diff --git a/qemu-launch-scripts/start-qemu-intel.sh b/qemu-launch-scripts/start-qemu-intel.sh
index 063c325e5de152629174c6745a667ab243f7d43a..d3df6cb412550715c302a315c598b0a3402f6a58 100755 (executable)
--- a/qemu-launch-scripts/start-qemu-intel.sh
+++ b/qemu-launch-scripts/start-qemu-intel.sh
@@ -15,7 +15,7 @@ echo RFSIMG="$RFSIMG"
 
 qemu-system-x86_64 -machine q35 -m 1G -enable-kvm -smp 4 \
         -usbdevice keyboard \
-       -cpu kvm64,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+vmx,+x2apic \
+       -cpu kvm64,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+vmx,-x2apic \
        -kernel "$KIMG" -append "root=/dev/sda memmap=66M$0x3b000000 nohpet" \
        -drive file="$RFSIMG",format=raw,id=disk,if=none \
         -device ide-hd,drive=disk -serial stdio -serial vc \