Change maximum number of addresable IDs according to the number of

virtual CPUs in cpuid 4

Signed-off-by: Alexey Romko <[email protected]>

core/vcpu.c

@@ -2673,8 +2673,23 @@ static void handle_cpuid_virtual(struct vcpu_t *vcpu, uint32_t a, uint32_t c)
             return;
         }
         case 4: {                       // Deterministic Cache Parameters
-            // [31:26] cores per package - 1
-            // Use host cache values.
+            // Use host cache values, but change maximum number of addresable
+            // IDs according to the number of virtual CPUs (bits [31:26]).
+            state->_eax &= ~0xFC000000;
+            if (state->_eax & 31) {
+                struct vm_t *vm = vcpu->vm;
+                hax_list_head *list;
+                int count = 0;
+
+                hax_mutex_lock(vm->vm_lock);
+                hax_list_for_each(list, (hax_list_head *)(&vm->vcpu_list)) {
+                    count++;
+                }
+                hax_mutex_unlock(vm->vm_lock);
+
+                if (count > 1)
+                    state->_eax |= (count - 1) << 26;
+            }
             return;
         }
         case 5:                         // MONITOR/MWAIT