diff --git a/quickemu b/quickemu
index a9f4e84..f80804c 100755
--- a/quickemu
+++ b/quickemu
@@ -290,12 +290,10 @@ function vm_boot() {
   # Make any OS specific adjustments
   case ${guest_os} in
     linux)
-      case ${HOST_CPU_VENDOR} in
-        AuthenticIntel)
-          CPU="-cpu host,kvm=on";;
-        AuthenticAMD|*)
-          CPU="-cpu host,kvm=on,topoext";;
-      esac
+      CPU="-cpu host,kvm=on"
+      if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then
+        CPU="${CPU},topoext"
+      fi
       disk_size="16G"
       ;;
     macos)
@@ -349,13 +347,10 @@ function vm_boot() {
       disk_size="64G"
       ;;
     windows)
-      case ${HOST_CPU_VENDOR} in
-        AuthenticIntel)
-          CPU="-cpu host,kvm=on,+hypervisor,+invtsc,l3-cache=on,migratable=no,hv_frequencies,kvm_pv_unhalt,hv_reenlightenment,hv_relaxed,hv_spinlocks=8191,hv_stimer,hv_synic,hv_time,hv_vapic,hv_vendor_id=1234567890ab,hv_vpindex";;
-        AuthenticAMD|*)
-          CPU="-cpu host,kvm=on,+hypervisor,+invtsc,l3-cache=on,migratable=no,hv_frequencies,kvm_pv_unhalt,hv_reenlightenment,hv_relaxed,hv_spinlocks=8191,hv_stimer,hv_synic,hv_time,hv_vapic,hv_vendor_id=1234567890ab,hv_vpindex,topoext";;
-      esac
-
+      CPU="-cpu host,kvm=on,+hypervisor,+invtsc,l3-cache=on,migratable=no,hv_frequencies,kvm_pv_unhalt,hv_reenlightenment,hv_relaxed,hv_spinlocks=8191,hv_stimer,hv_synic,hv_time,hv_vapic,hv_vendor_id=1234567890ab,hv_vpindex"
+      if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then
+        CPU="${CPU},topoext"
+      fi
       GUEST_TWEAKS="-no-hpet -global kvm-pit.lost_tick_policy=discard"
       disk_size="64G"
       ;;